X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fgosa-si-client;h=2252d5960b9e50ef380d149d6b8f1dc8c01e8c12;hb=868da18e0cedcfa12adc928744c2027f947a0fa3;hp=95f056863805553170924b5fef81eb7219574f78;hpb=57f3b6e8184433ec834a4123b5896e00a797e83c;p=gosa.git

diff --git a/gosa-si/gosa-si-client b/gosa-si/gosa-si-client
index 95f056863..2252d5960 100755
--- a/gosa-si/gosa-si-client
+++ b/gosa-si/gosa-si-client
@@ -20,6 +20,7 @@
 
 use strict;
 use warnings;
+use utf8;
 use Getopt::Long;
 use Config::IniFiles;
 use POSIX;
@@ -201,6 +202,15 @@ sub check_pid {
 }
 
 
+sub sig_int_handler {
+    my ($signal) = @_;
+
+    daemon_log("shutting down gosa-si-server", 1);
+    exit(1);
+}
+$SIG{INT} = \&sig_int_handler;
+
+
 #===  FUNCTION  ================================================================
 #         NAME:  logging
 #   PARAMETERS:  level - string - default 'info' 
@@ -470,156 +480,6 @@ sub get_local_ip_for_remote_ip {
 	return $result;
 }
 
-sub new_ldap_config {
-    my ($msg_hash) = @_ ;
-    my $element;
-    my @ldap_uris;
-    my $ldap_base;
-    my @ldap_options;
-    my @pam_options;
-    my @nss_options;
-    my $goto_admin;
-    my $goto_secret;
-    my $admin_base= "";
-    my $department= "";
-    my $release= "";
-    my $unit_tag;
-
-    # Transform input into array
-    while ( my ($key, $value) = each(%$msg_hash) ) {
-	if ($key =~ /^(source|target|header)$/) {
-		next;
-	}
-
-	foreach $element (@$value) {
-		if ($key =~ /^ldap_uri$/) {
-			push (@ldap_uris, $element);
-			next;
-		}
-		if ($key =~ /^ldap_base$/) {
-			$ldap_base= $element;
-			next;
-		}
-		if ($key =~ /^goto_admin$/) {
-			$goto_admin= $element;
-			next;
-		}
-		if ($key =~ /^goto_secret$/) {
-			$goto_secret= $element;
-			next;
-		}
-		if ($key =~ /^ldap_cfg$/) {
-			push (@ldap_options, "$element");
-			next;
-		}
-		if ($key =~ /^pam_cfg$/) {
-			push (@pam_options, "$element");
-			next;
-		}
-		if ($key =~ /^nss_cfg$/) {
-			push (@nss_options, "$element");
-			next;
-		}
-		if ($key =~ /^admin_base$/) {
-			$admin_base= $element;
-			next;
-		}
-		if ($key =~ /^department$/) {
-			$department= $element;
-			next;
-		}
-		if ($key =~ /^unit_tag$/) {
-			$unit_tag= $element;
-			next;
-		}
-		if ($key =~ /^release$/) {
-			$release= $element;
-			next;
-		}
-	}
-    }
-
-    # Unit tagging enabled?
-    if (defined $unit_tag){
-	    push (@pam_options, "pam_filter gosaUnitTag=$unit_tag");
-	    push (@nss_options, "nss_base_passwd  $admin_base?sub?gosaUnitTag=$unit_tag");
-	    push (@nss_options, "nss_base_group   $admin_base?sub?gosaUnitTag=$unit_tag");
-    }
-
-    # Setup ldap.conf
-    my $file1;
-    my $file2;
-    open(file1, "> $ldap_config");
-    print file1 "# This file was automatically generated by gosa-si-client. Do not change.\n";
-    print file1 "URI";
-    foreach $element (@ldap_uris) {
-    	print file1 " $element";
-    }
-    print file1 "\nBASE $ldap_base\n";
-    foreach $element (@ldap_options) {
-    	print file1 "$element\n";
-    }
-    close (file1);
-    daemon_log("wrote $ldap_config", 5);
-
-    # Setup pam_ldap.conf / libnss_ldap.conf
-    open(file1, "> $pam_config");
-    open(file2, "> $nss_config");
-    print file1 "# This file was automatically generated by gosa-si-client. Do not change.\n";
-    print file2 "# This file was automatically generated by gosa-si-client. Do not change.\n";
-    print file1 "uri";
-    print file2 "uri";
-    foreach $element (@ldap_uris) {
-    	print file1 " $element";
-    	print file2 " $element";
-    }
-    print file1 "\nbase $ldap_base\n";
-    print file2 "\nbase $ldap_base\n";
-    foreach $element (@pam_options) {
-    	print file1 "$element\n";
-    }
-    foreach $element (@nss_options) {
-    	print file2 "$element\n";
-    }
-    close (file2);
-    daemon_log("wrote $nss_config", 5);
-    close (file1);
-    daemon_log("wrote $pam_config", 5);
-
-    # Create goto.secrets if told so - for compatibility reasons
-    if (defined $goto_admin){
-	    open(file1, "> /etc/goto/secret");
-	    close(file1);
-	    chown(0,0, "/etc/goto/secret");
-	    chmod(0600, "/etc/goto/secret");
-	    open(file1, "> /etc/goto/secret");
-	    print file1 "GOTOADMIN=\"$goto_admin\"\nGOTOSECRET=\"$goto_secret\"\n";
-	    close(file1);
-	    daemon_log("wrote /etc/goto/secret", 5);
-    }
-
-    # Write shell based config
-    my $cfg_name= dirname($ldap_config)."/ldap-shell.conf";
-
-    # Get first LDAP server
-    my $ldap_server= $ldap_uris[0];
-    $ldap_server=~ s/^ldap:\/\/([^:]+).*$/\1/;
-
-    open(file1, "> $cfg_name");
-    print file1 "LDAP_BASE=\"$ldap_base\"\n";
-    print file1 "LDAP_SERVER=\"$ldap_server\"\n";
-    print file1 "ADMIN_BASE=\"$admin_base\"\n";
-    print file1 "DEPARTMENT=\"$department\"\n";
-    print file1 "RELEASE=\"$release\"\n";
-    print file1 "UNIT_TAG=\"".(defined $unit_tag ? "$unit_tag" : "")."\"\n";
-    print file1 "UNIT_TAG_FILTER=\"".(defined $unit_tag ? "(gosaUnitTag=$unit_tag)" : "")."\"\n";
-    close(file1);
-    daemon_log("wrote $cfg_name", 5);
-
-    return;
-
-}
-
 
 sub generate_hw_digest {
 	my $hw_data;
@@ -1381,7 +1241,9 @@ $default_server_key = $server_key;
 
 
 # add gosa-si-server address from config file at first position of server list
-if (defined $server_address) {
+my $server_check_cfg = Config::IniFiles->new( -file => $cfg_file );
+my $server_check = $server_check_cfg->val( "server", "ip");
+if( defined $server_check ) {
     unshift(@servers, $server_address);
     my $servers_string = join(", ", @servers);
     daemon_log("found servers in configuration file: $servers_string", 5);
@@ -1389,9 +1251,15 @@ if (defined $server_address) {
 else {
     if ( !$server_domain) {
         daemon_log("ERROR: please specify a gosa-si-server address or a domain in config file", 1);
-        exit( 1 );
+        kill 2, $$;
     }
     my @tmp_servers = &get_server_addresses($server_domain);
+    if( 0 == @tmp_servers ) {
+        daemon_log("ERROR: no gosa-si-server found in DNS for domain '$server_domain'",1);
+        daemon_log("ERROR: please specify a gosa-si-server address or a domain in config file", 1);
+        kill 2, $$;
+    } 
+
     foreach my $server (@tmp_servers) { 
         unshift(@servers, $server); 
     }