gunnar: server/kolabd/kolabd kolab_bootstrap.in,1.29,1.30

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv30973

Modified Files:
	kolab_bootstrap.in 
Log Message:
Fix bootstrap issues.

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- kolab_bootstrap.in	28 Nov 2007 12:45:32 -0000	1.29
+++ kolab_bootstrap.in	30 Nov 2007 11:41:48 -0000	1.30
@@ -275,6 +275,7 @@
 my $slurpd_addr = $kolab_config{'slurpd_addr'} || die "could not read slurpd_addr from $kolab_config";
 my $slurpd_port = $kolab_config{'slurpd_port'} || die "could not read slurpd_port from $kolab_config";
 my @kolabhosts;
+my $domain;
 
 if (!$bind_dn || !$bind_pw || !$ldap_uri || !$base_dn) {
    print "Please check $kolab_config (seems to be incomplete)\n";
@@ -312,7 +313,7 @@
   ##### Master server setup
   getopt('f');
 
-  (my $dummy, my $domain) = split(/\./, $fqdn, 2);
+  (my $dummy, $domain) = split(/\./, $fqdn, 2);
   if (!$domain) {
     $domain = $fqdn;
   }
@@ -776,7 +777,7 @@
   #my $entry = $mesg->entry(0);
   #$php_pw = $entry->get_value( 'userPassword' );
 
-  $calendar_dn = "cn=$calendar_id@$domain,cn=internal,$base_dn";
+  my $calendar_dn = "cn=$calendar_id@$domain,cn=internal,$base_dn";
   $mesg = $ldap->search(base=> $php_dn, scope=> 'exact', filter=> "(objectclass=*)");
   if ($mesg && $mesg->count != 1) {
     print "Calendar object not found, please check your input\n";