Masato Taruishi
taru****@sourc*****
2004年 8月 5日 (木) 02:08:31 JST
===================================================================
RCS file: ultrapossum/module/server/2.0,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ultrapossum/module/server/2.0 2004/07/08 12:10:43 1.19
+++ ultrapossum/module/server/2.0 2004/08/04 17:08:31 1.20
@@ -59,20 +59,23 @@
}
ldapmaster_stop() {
- $MODULEDIR/server/pid stop $CHROOTDIRECTORY/$SLAPD_PIDFILE
- echo -n "`basename $SLAPD`"
+ if test `ldapmaster_status` = "running"; then
+ $MODULEDIR/server/pid stop $CHROOTDIRECTORY/$SLAPD_PIDFILE
+ echo -n "`basename $SLAPD`"
+ fi
if test "`ldapslurp_status`" = "running"; then
+ sleep 1
ldapslurp_stop
- /bin/rm -f $slurpdlog
fi
if test "`$MODULEDIR/server/pid status $slurpdlogpid`" = "running"; then
$MODULEDIR/server/pid stop $slurpdlogpid
+ /bin/rm -f $slurpdlog
fi
}
ldapmaster_service_stop()
{
- ldapmaster_stop > /dev/null
+ ldapmaster_stop
ldapslave_stop
}
@@ -99,8 +102,10 @@
}
ldapslave_stop() {
- $MODULEDIR/server/pid stop $CHROOTDIRECTORY$SLAPD_SLAVE_PIDFILE
- echo -n "`basename $SLAPD`"
+ if test `ldapslave_status` = "running"; then
+ $MODULEDIR/server/pid stop $CHROOTDIRECTORY$SLAPD_SLAVE_PIDFILE
+ echo -n "`basename $SLAPD`"
+ fi
}
ldapslave_start() {