Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv25918/scripts/scripts
Modified Files:
Tag: rel-1-2-patches
slapd
Log Message:
- added TLS support to openldap
- updated openldap to 2.3.37
- updated Mail-SpamAssassin to 3.2.3
- updated cdrtools to 2.01.01a32
- updated clamav to 0.91.1
- updated curl to 7.16.4
- updated dovecot to 1.0.3
- updated 2fsprogs to 1.40.2
- updated ethtool to 6
- updated freetype to 2.3.5
- updated gd to 2.0.35
- updated glib to 2.12.13
- updated grsecurity to 2.1.11-2.4.35-200708101800
- updated gradm to 2.1.11-200708011700
- updated l7-protocols to 2007-07-27
- updated lftp to 3.5.12
- updated libpcap to 0.9.7
- updated linux to 2.4.35
- updated lm_sensors to 2.10.4
- updated memtest86 to 3.3
- updated motion to 3.2.8
- updated netfilter-layer7 to v2.13
- updated ntp to 4.2.4p3
- removed openswan
- updated patch-o-matic-ng to 20070806
- updated pcre to 7.2
- updated postfix to 2.4.5
- updated quota to 3.15
- updated shorewall to 3.4.5
- updated strace to 4.5.16
- added strongswan 2.8.6
- updated sudo to 1.6.9p3
- updated sysstat to 7.1.6
- updated tar to 1.18
- updated tcpdump to 3.9.7
- updated vobcopy to 1.0.2
Index: slapd
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/slapd,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- slapd 25 Jul 2005 17:15:51 -0000 1.1.2.1
+++ slapd 19 Aug 2007 14:02:50 -0000 1.1.2.2
@@ -23,7 +23,12 @@
NAME="Stand-alone LDAP Daemon"
CONFIGNAME=SLAPD
DAEMON=/usr/sbin/slapd
-PARAMETER=
+eval TLS=\$${CONFIGNAME}_USE_TLS
+if [ "$TLS" = "yes" ]; then
+ PARAMETER="-h \"ldap:/// ldaps:///\""
+else
+ PARAMETER="-h ldap:///"
+fi
# source function library
source /etc/init.d/functions
@@ -47,7 +52,8 @@
case "$1" in
start)
echo -n "Starting $NAME: "
- loadproc $DAEMON $PARAMETER
+ eval $DAEMON $PARAMETER
+ evaluate_retval
;;
stop)
echo -n "Shutting down $NAME: "
|
