steffen: server/kolab/kolab kolab_bootstrap,1.64,1.65

cvs at intevation.de cvs at intevation.de
Wed Sep 22 17:38:56 CEST 2004


Author: steffen

Update of /kolabrepository/server/kolab/kolab
In directory doto:/tmp/cvs-serv11441/kolab

Modified Files:
	kolab_bootstrap 
Log Message:
fix for issue423

Index: kolab_bootstrap
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/kolab_bootstrap,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- kolab_bootstrap	10 Sep 2004 14:35:32 -0000	1.64
+++ kolab_bootstrap	22 Sep 2004 15:38:54 -0000	1.65
@@ -528,7 +528,7 @@
     print "Creating RSA keypair for resource password encryption\n";
     kolab_system("/kolab/bin/openssl genrsa -out $privreskey 1024");
     kolab_system("/kolab/bin/openssl rsa -in $privreskey -pubout -out $pubreskey");
-    kolab_system("chown kolab:kolab-n $pubreskey $privreskey");
+    kolab_system("chown @l_musr@:@l_ngrp@ $pubreskey $privreskey");
     chmod 0660, $privreskey, $pubreskey;
     #unlink( "dsa-params" );
     umask $oldmask;
@@ -594,7 +594,7 @@
   # For now we just connect to the remote slapd
  SLAVESTART:
   print "Now some information about the master LDAP server is required:\n\n";
-  do { $ldap_uri = getUserInput("URI of master LDAP server"); } until $ldap_uri;
+  do { $ldap_uri = getUserInput("URI of master LDAP server (for example ldaps://host.example.com)"); } until $ldap_uri;
   my $ldapuri = URI->new($ldap_uri) || warn "error: could not parse given uri";
   if( $ldapuri ) {
     $base_dn = join( ',', map { "dc=$_" } split /\./, $ldapuri->host() );
@@ -737,10 +737,13 @@
 To be able to encrypt and decrypt passwords for group and resource accounts
 we need to copy the RSA keypair used for that purpose from the master server.
 EOS
-  kolab_system("scp $master_host:$kolab_prefix/etc/kolab/res_priv.pem "
-	       ."$master_host:$kolab_prefix/etc/kolab/res_pub.pem "
+  my $privreskey = "$kolab_prefix/etc/kolab/res_priv.pem";
+  my $pubreskey  = "$kolab_prefix/etc/kolab/res_pub.pem";
+  kolab_system("scp $master_host:$privreskey "
+	       ."$master_host:$pubreskey "
 	       ."$kolab_prefix/etc/kolab/");
-  kolab_system("chgrp @l_ngrp@ $kolab_prefix/etc/kolab/res_priv.pem $kolab_prefix/etc/kolab/res_priv.pem;");
+  kolab_system("chown @l_musr@:@l_ngrp@ $pubreskey $privreskey");
+  chmod 0660, $privreskey, $pubreskey;
   kolab_system("$kolab_prefix/sbin/kolabconf -n");
 
   $fd = IO::File->new($kolab_config, "w+") || die "could not open $kolab_config";





More information about the commits mailing list