diff --git a/gosa-si/gosa-si-client b/gosa-si/gosa-si-client
index 7330d128d4263c6fee1d3876f6a7651c02675705..05632d3167ead89f416e6eca35a599e2dc314f0f 100755 (executable)
--- a/gosa-si/gosa-si-client
+++ b/gosa-si/gosa-si-client
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;
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 }
}
-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 {
}
-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 ================================================================
&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") {
@@ -1276,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;