Masato Taruishi
taru****@users*****
2004年 10月 14日 (木) 10:57:20 JST
===================================================================
RCS file: ultrapossum/module/server/slapd.sh,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ultrapossum/module/server/slapd.sh 2004/10/10 12:05:45 1.13
+++ ultrapossum/module/server/slapd.sh 2004/10/14 01:57:20 1.14
@@ -76,27 +76,34 @@
master() {
common
- for slave in $SLURPDSLAVES
+ # FIXME: little ad-hoc
+ slurpds="$SLURPDSLAVES"
+ if test "x$SYNCBACKUPS" = "x"; then
+ slurpds="$SLURPDSLAVES $MASTER"
+ fi
+ for slave in $slurpds
do
- echo "replica host=$slave:$REPLICALISTENPORT"
- if test "x$REPLICASTARTTLS" != "x"; then
- echo " starttls=$REPLICASTARTTLS"
+ if test "x$HOST" != "x$slave"; then
+ echo "replica host=$slave:$REPLICALISTENPORT"
+ if test "x$REPLICASTARTTLS" != "x"; then
+ echo " starttls=$REPLICASTARTTLS"
+ fi
+ case "x$APPDNMODE" in
+ xSASL/Digest-MD5)
+ authcid="`echo $UPDATEDN | cut -d, -f1 | cut -d= -f2`@$PACKAGE"
+ echo " authcid=\"$authcid\""
+ echo " bindmethod=sasl"
+ echo " saslmech=DIGEST-MD5"
+ echo " credentials=$CREDENTIALS"
+ ;;
+ x*)
+ echo " binddn=\"$UPDATEDN\""
+ echo " bindmethod=simple"
+ echo " credentials=$CREDENTIALS"
+ ;;
+ esac
+ echo ""
fi
- case "x$APPDNMODE" in
- xSASL/Digest-MD5)
- authcid="`echo $UPDATEDN | cut -d, -f1 | cut -d= -f2`@$PACKAGE"
- echo " authcid=\"$authcid\""
- echo " bindmethod=sasl"
- echo " saslmech=DIGEST-MD5"
- echo " credentials=$CREDENTIALS"
- ;;
- x*)
- echo " binddn=\"$UPDATEDN\""
- echo " bindmethod=simple"
- echo " credentials=$CREDENTIALS"
- ;;
- esac
- echo ""
done
if test "x$ROOTDN" = "x$UPDATEDN"; then
echo "# Replication"