thomas: server/kolabd/kolabd ChangeLog, 1.177, 1.178 kolab_bootstrap.in, 1.37, 1.38

cvs at kolab.org cvs at kolab.org
Sat Jul 19 09:21:54 CEST 2008


Author: thomas

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

Modified Files:
	ChangeLog kolab_bootstrap.in 
Log Message:
kolab_bootstrap: Quote s[l]urpd to prevent shell expansion.

Reported on kolab-users by Uwe Galle


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -d -r1.177 -r1.178
--- ChangeLog	9 Jul 2008 15:57:44 -0000	1.177
+++ ChangeLog	19 Jul 2008 07:21:52 -0000	1.178
@@ -1,3 +1,8 @@
+2008-07-19  Thomas Arendsen Hein <thomas at intevation.de>
+
+	* kolab_bootstrap.in: Quote s[l]urpd to prevent being expanded by the
+	shell.
+
 2008-07-09  Thomas Arendsen Hein <thomas at intevation.de>
 
 	* templates/imapd.conf.template.in: kolab/issue2855 (Can create folder

Index: kolab_bootstrap.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab_bootstrap.in,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- kolab_bootstrap.in	9 Jul 2008 15:57:44 -0000	1.37
+++ kolab_bootstrap.in	19 Jul 2008 07:21:52 -0000	1.38
@@ -387,8 +387,7 @@
         ."Please stop any running ldap server and bootstrap again\n";
       tryConnect( '127.0.0.1', 9999 ) && die "A process is already listening to port 9999 (kolabd)\n"
         ."Please stop any running kolabd and bootstrap again\n";
-      # 051210: the check below used to be: if( `ps -elf|grep slurpd|grep -v grep` ) \rbos
-      if( `ps -elf|grep s[l]urpd` ) {
+      if( `ps -elf|grep 's[l]urpd'` ) {
         print "Error: Detected running slurpd processes.\n";
         print "Please make sure the OpenLDAP server is stopped properly!\n";
         exit 1;





More information about the commits mailing list