[arch-commits] Commit in openldap/trunk (slapd slapd.default)

[Andrea Scarpino]

    Date: Sunday, January 23, 2011 @ 05:29:57
  Author: andrea
Revision: 107301

remove obsolete slurpd daemon (FS#22565)

Modified:
  openldap/trunk/slapd
  openldap/trunk/slapd.default

---------------+
 slapd         |   41 ++++++-----------------------------------
 slapd.default |    3 ---
 2 files changed, 6 insertions(+), 38 deletions(-)

Modified: slapd
===================================================================
--- slapd	2011-01-23 10:19:10 UTC (rev 107300)
+++ slapd	2011-01-23 10:29:57 UTC (rev 107301)
@@ -5,40 +5,21 @@
 
 [ -f "/etc/default/slapd" ] && . /etc/default/slapd
 
-if [ -z "$SLURPD_START" ] || [ "$SLURPD_START" = "auto" ]; then
-  if grep -q '^replica' /etc/openldap/slapd.conf > /dev/null 2>&1 ; then
-    SLURPD_START=yes
-  else
-    SLURPD_START=no
-  fi
-fi
-
 PID=`pidof -o %PPID /usr/sbin/slapd`
-SLURPD_PID=`pidof -o %PPID /usr/sbin/slurpd`
 case "$1" in
   start)
     stat_busy "Starting OpenLDAP"
-    if [ -z "$PID" ] && [ -z "$SLURPD_PID" ]; then
+    if [ -z "$PID" ]; then
       SLAPD_OPTIONS="-f /etc/openldap/slapd.conf $SLAPD_OPTIONS"
-      SLURPD_OPTIONS="-f /etc/openldap/slapd.conf $SLURPD_OPTIONS"
       if [ -z "$SLAPD_SERVICES" ]; then
-	/usr/sbin/slapd $SLAPD_OPTIONS
+        /usr/sbin/slapd $SLAPD_OPTIONS
       else
-	/usr/sbin/slapd -h "$SLAPD_SERVICES" $SLAPD_OPTIONS
+        /usr/sbin/slapd -h "$SLAPD_SERVICES" $SLAPD_OPTIONS
       fi
       if [ $? -gt 0 ]; then
-	stat_fail
+        stat_fail
       else
-	stat_done
-        if [ "$SLURPD_START" != no ]; then
-          stat_busy "Starting OpenLDAP Replication service"
-	  /usr/sbin/slurpd $SLURPD_OPTIONS
-	  if [ $? -gt 0 ]; then
-	    stat_fail
-	  else
-            stat_done
-	  fi
-	fi
+        stat_done
       fi
       add_daemon slapd
     else
@@ -46,16 +27,6 @@
     fi
     ;;
   stop)
-    if [ "$SLURPD_START" != no ]; then
-      stat_busy "Stopping OpenLDAP Replication Service"
-      [ ! -z "$SLURPD_PID" ] && kill "$SLURPD_PID" &> /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-	stat_done
-      fi
-    fi
-    
     stat_busy "Stopping OpenLDAP"
     [ ! -z "$PID" ] && kill $PID &> /dev/null
     if [ $? -gt 0 ]; then
@@ -69,7 +40,7 @@
     ;;
   restart)
     $0 stop
-    sleep 1
+    sleep 3
     $0 start
     ;;
   *)

Modified: slapd.default
===================================================================
--- slapd.default	2011-01-23 10:19:10 UTC (rev 107300)
+++ slapd.default	2011-01-23 10:29:57 UTC (rev 107301)
@@ -4,6 +4,3 @@
 # Example usage:
 #SLAPD_SERVICES="ldap://127.0.0.1:389/ ldaps:/// ldapi:///"
 SLAPD_OPTIONS=""
-
-SLURPD_START="auto"
-SLURPD_OPTIONS=""