Masato Taruishi
taru****@users*****
2004年 10月 21日 (木) 00:09:08 JST
===================================================================
RCS file: ultrapossum/module/server/createdb.sh,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ultrapossum/module/server/createdb.sh 2004/10/20 13:25:31 1.30
+++ ultrapossum/module/server/createdb.sh 2004/10/20 15:09:08 1.31
@@ -116,8 +116,12 @@
fi
fi
-if test "x$HOST" = "x$MASTER" && include "$HOST" "$SYNCBACKUPS"; then
- SLAPADD_EXTRA_ARGS="$SLAPADD_EXTRA_ARGS -p -w"
+if test "x$HOST" = "x$MASTER"; then
+ case "$SLAPD_MAJOR_VERSION" in
+ 2.2)
+ SLAPADD_EXTRA_ARGS="$SLAPADD_EXTRA_ARGS -p -w"
+ ;;
+ esac
fi
echo -n "Creating Initial Directory in $CHROOTDIRECTORY$DIRECTORY... " 1>&2
===================================================================
RCS file: ultrapossum/module/server/update-server,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- ultrapossum/module/server/update-server 2004/10/20 13:25:31 1.56
+++ ultrapossum/module/server/update-server 2004/10/20 15:09:08 1.57
@@ -241,10 +241,15 @@
echo "E: can't detect slapd supports syncbackup." 1>&2
exit 1
fi
- if test "x$SYNCREPLS" != "x" && test "x$SLAPD_MAJOR_VERSION" != "x2.2"
- then
- echo "E: slapd doesn't support syncrepl." 1>&2
- exit 1
+ if test "x$SYNCREPLS" != "x"; then
+ case "$SLAPD_MAJOR_VERSION" in
+ 2.2)
+ ;;
+ *)
+ echo "E: slapd doesn't support syncrepl." 1>&2
+ exit 1
+ ;;
+ esac
fi
if test "x$CHROOTDIRECTORY" != "x"; then
egrep "^directory" $SLAPDCONF | awk -F' ' '{print $2;}' | while read d