From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 26 Oct 2011 15:08:01 +0000 (+0000)
Subject: Made config work
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6b824b6edf17262e9585b411d4321947a11c059a;p=gosa.git

Made config work


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@21037 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index 9d92dc997..093acd2a9 100755
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -165,7 +165,6 @@ our $server_mac_address;
 our $gosa_address;
 our $no_arp;
 our $forground;
-our $cfg_file;
 our ($ldap_uri, $ldap_base, $ldap_admin_dn, $ldap_admin_password, $ldap_server_dn, $ldap_version, $ldap_retry_sec);
 our ($mysql_username, $mysql_password, $mysql_database, $mysql_host);
 our $known_modules;
@@ -176,7 +175,7 @@ our $verbose= 0;
 our $global_kernel;
 
 # where is the config stored by default and his name
-our $config = '/etc/gosa-si/server.conf';
+our $cfg_file = '/etc/gosa-si/server.conf';
 
 # by default dumping of config is undefined
 our $dump_config = undef;
@@ -3603,7 +3602,7 @@ sub create_pid {
 Getopt::Long::Configure( 'bundling' );
 GetOptions( 'v|verbose+' => \$verbose,
             'h|help' => \&usage,
-            'c|config=s' => \$config,
+            'c|config=s' => \$cfg_file,
             'x|dump-config=i' => \$dump_config,
             'f|foreground' => \$foreground,
 						'd=s' => \$debug_parts)
@@ -3620,7 +3619,7 @@ if( defined $dump_config ) {
 }
 
 #  read and set config parameters
-&read_configfile($config, %cfg_defaults);
+&read_configfile($cfg_file, %cfg_defaults);
 
 # daemonize the program
 &start_daemon($pid, $foreground);
diff --git a/gosa-si/modules/ClientPackages.pm b/gosa-si/modules/ClientPackages.pm
index ad94ee2f0..0dc0da6e8 100644
--- a/gosa-si/modules/ClientPackages.pm
+++ b/gosa-si/modules/ClientPackages.pm
@@ -167,6 +167,7 @@ $main::server_address = $server_address;
       scope  => 'one',
       filter => "(&(ou=incoming)(objectClass=organizationalUnit))"
     );
+    print "---->".$ldap_base."\n";
     if(not defined($mesg->count) or $mesg->count == 0) {
             my $incomingou = Net::LDAP::Entry->new();
             $incomingou->dn('ou=incoming,'.$ldap_base);