Masato Taruishi
taru****@users*****
2004年 9月 23日 (木) 17:29:36 JST
===================================================================
RCS file: ultrapossum/module/server/10server,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ultrapossum/module/server/10server 2004/09/23 06:28:04 1.15
+++ ultrapossum/module/server/10server 2004/09/23 08:29:36 1.16
@@ -232,10 +232,6 @@
CREDENTIALS="XXXXXXXX"
fi
ROOTDN=`ultrapossum_getconf ROOTDN $ROOTRDN,$SUFFIX`
-SYNCDN=`ultrapossum_getconf SYNCDN $ROOTDN`
-if test "x$SYNCDN" = "x$ROOTDN"; then
- SYNCPW=`ultrapossum_getconf SYNCPW $ROOTPW`
-fi
if test "x$SECRETCF" != "x"; then
if $SLAPPASSWD -s $ROOTPW > /dev/null 2> /dev/null; then
===================================================================
RCS file: ultrapossum/module/server/server.cf,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ultrapossum/module/server/server.cf 2004/06/24 10:12:54 1.11
+++ ultrapossum/module/server/server.cf 2004/09/23 08:29:36 1.12
@@ -86,11 +86,5 @@
# List of syncbcakup servers
#SYNCBACKUPS=""
-# DN to allow startSYNC
-#SYNCDN=""
-
-# Password of SYNCDN
-#SYNCPW=""
-
# Enable weaksync mode
#WEAKSYNC=""
===================================================================
RCS file: ultrapossum/module/server/slapd.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ultrapossum/module/server/slapd.sh 2004/09/23 08:00:51 1.11
+++ ultrapossum/module/server/slapd.sh 2004/09/23 08:29:36 1.12
@@ -103,7 +103,7 @@
fi
fi
if test "x$SYNCBACKUPS" != "x"; then
- echo "syncdn $SYNCDN"
+ echo "syncdn $UPDATEDN"
if test "x$WEAKSYNC" != "x"; then
echo "weaksync on"
fi
@@ -146,16 +146,16 @@
echo " provider=$UPDATEREF"
case "x$APPDNMODE" in
xSASL/Digest-MD5)
- authcid="`echo $SYNCDN | cut -d, -f1 | cut -d= -f2`@$PACKAGE"
+ authcid="`echo $UPDATEDN | cut -d, -f1 | cut -d= -f2`@$PACKAGE"
echo " authcid=\"$authcid\""
echo " bindmethod=sasl"
echo " saslmech=DIGEST-MD5"
- echo " credentials=$SYNCPW"
+ echo " credentials=$CREDENTIALS"
;;
x*)
- echo " binddn=\"$SYNCDN\""
+ echo " binddn=\"$UPDATEDN\""
echo " bindmethod=simple"
- echo " credentials=$SYNCPW"
+ echo " credentials=$CREDENTIALS"
;;
esac
echo " checkinterval=10"