Updated move and create checks

[gosa.git] / gosa-si / gosa-si-client

diff --git a/gosa-si/gosa-si-client b/gosa-si/gosa-si-client
index 6b7a3e3940d1d1824098ebb8d4f923ac039fd169..05632d3167ead89f416e6eca35a599e2dc314f0f 100755 (executable)
--- a/gosa-si/gosa-si-client
+++ b/gosa-si/gosa-si-client
@@ -34,14 +34,17 @@ use GOSA::GosaSupportDaemon;
 use Digest::MD5  qw(md5_hex md5 md5_base64);
 use MIME::Base64;
 use XML::Simple;
-use Net::DNS;
+#use Net::DNS;    # no longer used because function moved to GosaSupportDaemon.pm : rettenbe : 16.05.2008
 use File::Basename;
 use File::Spec;
 
 # Workaround: need pure perl to make it work with UTF-8 :-(
 $XML::Simple::PREFERRED_PARSER= "XML::SAX::PurePerl";
 
-my $client_version = "$HeadURL$:$Rev$";
+my $client_version = '$HeadURL$:$Rev$';
+my $client_headURL;
+my $client_revision;
+my $client_status;
 my $event_dir = "/usr/lib/gosa-si/client/events";
 use lib "/usr/lib/gosa-si/client/events";
 
@@ -242,6 +245,7 @@ sub daemon_log {
     if(not defined $level) { $level = 1 }
     if(defined $log_file){
         open(LOG_HANDLE, ">>$log_file");
+        chmod 0600, $log_file;
         if(not defined open( LOG_HANDLE, ">>$log_file" )) {
             print STDERR "cannot open $log_file: $!";
             return }
@@ -497,14 +501,15 @@ sub generate_hw_digest {
 }
 
 
-sub create_passwd {
-    my $new_passwd = "";
-    for(my $i=0; $i<31; $i++) {
-        $new_passwd .= ("a".."z","A".."Z",0..9)[int(rand(62))]
-    }
-
-    return $new_passwd;
-}
+# moved to GosaSupportDaemon: rettenbe, 19.05.2008
+#sub create_passwd {
+#    my $new_passwd = "";
+#    for(my $i=0; $i<31; $i++) {
+#        $new_passwd .= ("a".."z","A".."Z",0..9)[int(rand(62))]
+#    }
+#
+#    return $new_passwd;
+#}
 
 
 sub create_ciphering {
@@ -548,42 +553,43 @@ sub decrypt_msg {
 }
 
 
-sub get_server_addresses {
-    my $domain= shift;
-    my @result;
- 
-    my $error = 0;
-    my $res   = Net::DNS::Resolver->new;
-    my $query = $res->send("_gosa-si._tcp.".$domain, "SRV");
-    my @hits;
-
-    if ($query) {
-        foreach my $rr ($query->answer) {
-            push(@hits, $rr->target.":".$rr->port);
-        }
-    }
-    else {
-        #warn "query failed: ", $res->errorstring, "\n";
-        $error++;
-    }
-
-    if( $error == 0 ) {
-        foreach my $hit (@hits) {
-            my ($hit_name, $hit_port) = split(/:/, $hit);
-                       chomp($hit_name);
-                       chomp($hit_port);
-
-            my $address_query = $res->send($hit_name);
-            if( 1 == length($address_query->answer) ) {
-                foreach my $rr ($address_query->answer) {
-                    push(@result, $rr->address.":".$hit_port);
-                }
-            }
-        }
-    }
-
-    return @result;
-}
+# moved to GosaSupportDaemon: rettenbe: 16.05.2008
+#sub get_server_addresses {
+#    my $domain= shift;
+#    my @result;
+# 
+#    my $error = 0;
+#    my $res   = Net::DNS::Resolver->new;
+#    my $query = $res->send("_gosa-si._tcp.".$domain, "SRV");
+#    my @hits;
+#
+#    if ($query) {
+#        foreach my $rr ($query->answer) {
+#            push(@hits, $rr->target.":".$rr->port);
+#        }
+#    }
+#    else {
+#        #warn "query failed: ", $res->errorstring, "\n";
+#        $error++;
+#    }
+#
+#    if( $error == 0 ) {
+#        foreach my $hit (@hits) {
+#            my ($hit_name, $hit_port) = split(/:/, $hit);
+#                      chomp($hit_name);
+#                      chomp($hit_port);
+#
+#            my $address_query = $res->send($hit_name);
+#            if( 1 == length($address_query->answer) ) {
+#                foreach my $rr ($address_query->answer) {
+#                    push(@result, $rr->address.":".$hit_port);
+#                }
+#            }
+#        }
+#    }
+#
+#    return @result;
+#}
 
 
 #===  FUNCTION  ================================================================
@@ -733,7 +739,10 @@ sub register_at_gosa_si_server {
                        &add_content2xml_hash($register_hash, "new_passwd", $server_key);
                        &add_content2xml_hash($register_hash, "mac_address", $local_mac);
                        &add_content2xml_hash($register_hash, "events", $events);
+            &add_content2xml_hash($register_hash, "client_status", $client_status);
+            &add_content2xml_hash($register_hash, "client_revision", $client_revision);
                        &add_content2xml_hash($register_hash, "gotoHardwareChecksum", $gotoHardwareChecksum);
+            &add_content2xml_hash($register_hash, "key_lifetime", $server_key_lifetime);
 
                        # Add $HOSTNAME from ENV if force-hostname is set
                        if( defined($client_force_hostname) && $client_force_hostname eq "true") {
@@ -1207,8 +1216,7 @@ if( ! $foreground ) {
     $pid = fork;
     setsid                    or die "Can't start a new session: $!";
     umask 0;
-} 
-else { 
+} else { 
     $pid = $$; 
 }
 
@@ -1222,8 +1230,22 @@ if( 0 != $pid ) {
     };
 }
 
+# parse head url and revision from svn
+my $client_status_hash = { 'developmental'=>'revision', 'stable'=>'release'};
+$client_version =~ /^\$HeadURL: (\S+) \$:\$Rev: (\d+) \$$/;
+$client_headURL = defined $1 ? $1 : 'unknown' ;
+$client_revision = defined $2 ? $2 : 'unknown' ;
+if ($client_headURL =~ /\/tag\// || 
+        $client_headURL =~ /\/branches\// ) {
+    $client_status = "stable"; 
+} else {
+    $client_status = "developmental" ;
+}
+
 daemon_log(" ", 1);
 daemon_log("$prg started!", 1);
+daemon_log("status: $client_status", 1);
+daemon_log($client_status_hash->{$client_status}.": $client_revision", 1); 
 
 # delete old DBsqlite lock files
 system('rm -f /tmp/gosa_si_lock*gosa-si-client*');
@@ -1258,7 +1280,7 @@ daemon_log("start socket for incoming xml messages at port '$client_port' ", 1);
 if( inet_aton($server_ip) ){ $server_ip = inet_ntoa(inet_aton($server_ip)); }
 ############################################################
 # to change
-if( $server_ip eq "127.0.1.1" ) { $server_ip = "127.0.0.1" } 
+#if( $server_ip eq "127.0.1.1" ) { $server_ip = "127.0.0.1" } 
 ############################################################
 if (defined $server_ip && defined $server_port) {
     $server_address = $server_ip.":".$server_port;