martin: server/kolabd/kolabd kolab_bootstrap.in,1.21,1.22

cvs at intevation.de cvs at intevation.de
Thu Mar 9 22:40:07 CET 2006


Author: martin

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

Modified Files:
	kolab_bootstrap.in 
Log Message:
Martin Konold: Apply patch from Gunnar Wrobel (make user setting for running ldap server explicit)


Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- kolab_bootstrap.in	2 Mar 2006 20:40:37 -0000	1.21
+++ kolab_bootstrap.in	9 Mar 2006 21:40:05 -0000	1.22
@@ -436,6 +436,7 @@
       }
       undef $slpd;
       undef $tmpl;
+      kolab_chown "@ldapserver_usr@","@ldapserver_grp@","@ldapserver_confdir@/slapd.conf";
       
       my $tmplname = "@sysconfdir@/kolab/templates/slapd.replicas.template";
       $confname = "@ldapserver_confdir@/slapd.replicas";
@@ -456,6 +457,7 @@
       }
       undef $slpd;
       undef $tmpl;
+      kolab_chown "@ldapserver_usr@","@ldapserver_grp@",$confname;
 		
       $tmplname = "@sysconfdir@/kolab/templates/slapd.access.template";
       $confname = "@ldapserver_confdir@/slapd.access";
@@ -476,11 +478,14 @@
       }
       undef $slpd;
       undef $tmpl;
+      kolab_chown "@ldapserver_usr@","@ldapserver_grp@",$confname;
 		
       # now we must startup slapd
       print "temporarily starting slapd\n";
       $ldap_uri = "ldap://127.0.0.1:389/";
-      (system("@libexecdir@/openldap/slapd -h ldap://127.0.0.1:389/ -f @ldapserver_confdir@/slapd.conf") == 0 ) || die( "Could not start temporary slapd: $!" );
+      # ensure that the database has correct permissions
+      system("chown @ldapserver_rusr@:@ldapserver_grp@ @ldapserver_dir@/*");
+      (system("@libexecdir@/openldap/slapd -h ldap://127.0.0.1:389/ -f @ldapserver_confdir@/slapd.conf -u @ldapserver_rusr@ -g @ldapserver_grp@") == 0 ) || die( "Could not start temporary slapd: $!" );
       print ("Waiting for OpenLDAP to start\n");
       sleep 10;
 





More information about the commits mailing list