martin: server/kolabd/kolabd kolab_bootstrap.in,1.10,1.11

[cvs at intevation.de]

Author: martin

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

Modified Files:
	kolab_bootstrap.in 
Log Message:
Martin Konold: Cleanup from issue#1046 plus further cleanups. I still think that "killall" is not portable and needs fixing


Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- kolab_bootstrap.in	21 Dec 2005 14:31:01 -0000	1.10
+++ kolab_bootstrap.in	28 Dec 2005 14:21:30 -0000	1.11
@@ -384,11 +384,6 @@
   if ($opt_b) {
     print "prepare LDAP database...\n";
     if ($ldap_uri =~ /127\.0\.0\.1/ || $ldap_uri =~ /localhost/) {
-#      This cannot happen anymore
-#      print "stop running slapd (if any)\n";
-#      system("@bindir@/openpkg rc openldap stop");
-#      sleep 5;
-
       # Make sure that no rogue daemons are running
       tryConnect( '127.0.0.1', 389 ) && die "A process is already listening to port 389 (ldap)\n"
         ."Please stop any running ldap server and bootstrap again\n";
@@ -631,8 +626,8 @@
 
    if ($ldap_uri =~ /127\.0\.0\.1/ || $ldap_uri =~ /localhost/) {
       print "\nkill temporary slapd\n\n";
-      system("@sysconfdir@/rc openldap stop");
-      sleep 5;
+      system("@bindir@/openpkg rc openldap stop");
+      sleep 1; # actually race should be impossible
       system("killall -9 slapd >/dev/null 2>&1");
    }
   }
@@ -699,9 +694,6 @@
 
   print "stop running slapd (if any)\n";
   kolab_system("@bindir@/openpkg rc openldap stop");
-  sleep 1;
-  kolab_system("@bindir@/openpkg rc openldap stop");
-  sleep 1;
 
   # Make sure that no rogue demons are running
   tryConnect( '127.0.0.1', 389 ) && die "A process is already listening to port 389 (ldap)\n"