thomas: server/perl-kolab/sbin kolab_bootstrap.in,1.7,1.7.2.1

cvs at kolab.org cvs at kolab.org
Fri Jul 17 16:44:29 CEST 2009


Author: thomas

Update of /kolabrepository/server/perl-kolab/sbin
In directory doto:/tmp/cvs-serv14735/perl-kolab/sbin

Modified Files:
      Tag: kolab_2_2_branch
	kolab_bootstrap.in 
Log Message:
kolab_bootstrap: Read bind_pw_hash from Kolab master server,
fixes kolab/issue3764 (kolab.conf: bind_pw_hash not set on slaves,
causes OpenLDAP restarts)


Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/perl-kolab/sbin/kolab_bootstrap.in,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- kolab_bootstrap.in	18 Feb 2009 11:44:12 -0000	1.7
+++ kolab_bootstrap.in	17 Jul 2009 14:44:27 -0000	1.7.2.1
@@ -746,13 +746,15 @@
 
   my $master_host = $ldapuri->host();
 
-  print "Reading nobody and calendar passwords from master, please type in master server's root password when asked\n";
+  print "Reading bind_pw_hash, php_pw and calendar_pw from master, please type in master server's root password when asked\n";
   my $get_master_conf = "ssh -C $master_host 'cat @CONFIG_DIR@/kolab.conf'";
   print "$get_master_conf\n";
   open( CONF, "$get_master_conf|");
   my $conf;
   $conf .= $_ while(<CONF>);
   close(CONF);
+  $conf =~ /bind_pw_hash : (.*)/;
+  $bind_pw_hash = $1;
   $conf =~ /php_pw : (.*)/;
   $php_pw = $1;
   $conf =~ /calendar_pw : (.*)/;
@@ -865,6 +867,7 @@
   print $fd "base_dn : $base_dn\n";
   print $fd "bind_dn : $bind_dn\n";
   print $fd "bind_pw : $bind_pw\n";
+  print $fd "bind_pw_hash : $bind_pw_hash\n";
   print $fd "ldap_uri : ldap://127.0.0.1\n";
   print $fd "ldap_master_uri : $ldap_uri\n";
   print $fd "php_dn : $php_dn\n";





More information about the commits mailing list