steffen: server/kolabd/kolabd kolab_bootstrap,1.4,1.5

cvs at intevation.de cvs at intevation.de
Mon Dec 13 23:35:08 CET 2004


Author: steffen

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

Modified Files:
	kolab_bootstrap 
Log Message:
rename rc.kolab ro rc.kolabd and hash password created by bootstrap

Index: kolab_bootstrap
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- kolab_bootstrap	12 Dec 2004 23:00:46 -0000	1.4
+++ kolab_bootstrap	13 Dec 2004 22:35:06 -0000	1.5
@@ -195,6 +195,7 @@
   system("mv ".$kolab_prefix."/etc/kolab/*.pem ".$backupdir);
   print "deleteing old kolab.conf\n";
   copy($kolab_config, $backupdir."/kolab.conf");
+  chmod(0600,$backupdir."/kolab.conf");
   system("rm -f ".$kolab_prefix."/var/openldap/openldap-data/*");
 } else {
   print "LDAP repository is empty - assuming fresh install\n";
@@ -291,7 +292,7 @@
       $bind_pw_hash = hashPassword($bind_pw);
     }
 
-    # PENDING(steffen) Generate better passwords!
+    # Generate passwords
     if ($php_dn =~ /\@\@\@/) {
       $php_dn =~ s/\@\@\@kolab_basedn\@\@\@/$base_dn/g;
     }
@@ -480,7 +481,7 @@
       # create manager user
       $ldapobject = newOrExistingLDAPEntry( $ldap, $bind_dn );
       $ldapobject->replace('cn' => 'manager', 'sn' => 'n/a', 'uid' => 'manager',
-                           'userPassword' => $bind_pw, 'objectclass' => ['top','inetorgperson','kolabinetorgperson']);
+                           'userPassword' => $bind_pw_hash, 'objectclass' => ['top','inetorgperson','kolabinetorgperson']);
       $ldapobject->dn($bind_dn);
       $mesg = $ldapobject->update($ldap);
       $mesg && $mesg->code && warn "failed to write entry: ", $mesg->error;
@@ -489,7 +490,8 @@
       # create php read-only user
       $ldapobject = newOrExistingLDAPEntry( $ldap, "cn=nobody,cn=internal,$base_dn" );
       $ldapobject->replace('cn' => 'nobody', 'sn' => 'n/a n/a', 'uid' => 'nobody',
-                           'userPassword' => $php_pw, 'objectclass' => ['top','inetorgperson','kolabinetorgperson']);
+                           'userPassword' => hashPassword($php_pw), 
+			   'objectclass' => ['top','inetorgperson','kolabinetorgperson']);
       $ldapobject->dn("cn=nobody,cn=internal,$base_dn");
       $mesg = $ldapobject->update($ldap);
       $mesg && $mesg->code && warn "failed to write entry: ", $mesg->error;
@@ -498,7 +500,8 @@
       # create calendar user
       $ldapobject = newOrExistingLDAPEntry( $ldap, "cn=calendar,cn=internal,$base_dn" );
       $ldapobject->replace('cn' => 'calendar', 'sn' => 'n/a n/a', 'uid' => 'calendar@'.$domain,
-                           'userPassword' => $calendar_pw, 'objectclass' => ['top','inetorgperson','kolabinetorgperson']);
+                           'userPassword' => hashPassword($calendar_pw), 
+			   'objectclass' => ['top','inetorgperson','kolabinetorgperson']);
       $ldapobject->dn("cn=calendar,cn=internal,$base_dn");
       $mesg = $ldapobject->update($ldap);
       $mesg && $mesg->code && warn "failed to write entry: ", $mesg->error;





More information about the commits mailing list