Masato Taruishi
taru****@users*****
2004年 9月 23日 (木) 15:28:04 JST
===================================================================
RCS file: ultrapossum/module/server/10server,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ultrapossum/module/server/10server 2004/09/22 12:31:11 1.14
+++ ultrapossum/module/server/10server 2004/09/23 06:28:04 1.15
@@ -261,7 +261,6 @@
fi
-ACLAPPDNREGEX=".*,$APPLICATION"
SLAPDURILIST="$LDAPURILIST"
;;
===================================================================
RCS file: ultrapossum/module/server/slapd-bdb.conf.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ultrapossum/module/server/slapd-bdb.conf.in 2004/05/23 11:59:56 1.5
+++ ultrapossum/module/server/slapd-bdb.conf.in 2004/09/23 06:28:04 1.6
@@ -31,7 +31,7 @@
access to attrs=userPassword
by dn="#UPDATEDN#" write
by group/organizationalRole/roleOccupant="#ROOTDN#" write
- by dn.regex="#ACLAPPDNREGEX#" write
+ by dn.regex=".*,#APPLICATION#" write
by anonymous auth
by self write
by * none
===================================================================
RCS file: ultrapossum/module/server/slapd-ldbm.conf.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ultrapossum/module/server/slapd-ldbm.conf.in 2004/05/19 16:32:23 1.3
+++ ultrapossum/module/server/slapd-ldbm.conf.in 2004/09/23 06:28:04 1.4
@@ -31,7 +31,7 @@
access to attribute=userPassword
by dn="#UPDATEDN#" write
by group/organizationalRole/roleOccupant="#ROOTDN#" write
- by dn.regex="#ACLAPPDNREGEX#" write
+ by dn.regex=".*,#APPLICATION#" write
by anonymous auth
by self write
by * none
===================================================================
RCS file: ultrapossum/module/server/slapd.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ultrapossum/module/server/slapd.sh 2004/09/22 12:31:11 1.9
+++ ultrapossum/module/server/slapd.sh 2004/09/23 06:28:04 1.10
@@ -71,17 +71,28 @@
-e "s/#SLAPROOTPW#/$SLAPROOTPW_ESCAPE/" -e "s!#DIRECTORY#!$DIRECTORY!" \
-e "s/#DBCACHESIZE#/$DBCACHESIZE/" -e "s/#APPLICATION#/$APPLICATION/" \
-e "s/#UPDATEDN#/$UPDATEDN/" -e "/#INDEXES#/ c\\" -e "$INDEXES" \
- -e "s!#REPLOGFILE#!$REPLOGFILE!" -e "s!#CACHESIZE#!$CACHESIZE!" \
- -e "s!#ACLAPPDNREGEX#!$ACLAPPDNREGEX!"
+ -e "s!#REPLOGFILE#!$REPLOGFILE!" -e "s!#CACHESIZE#!$CACHESIZE!"
}
master() {
common
for slave in $SLURPDSLAVES
do
- echo "replica host=$slave:$REPLICALISTENPORT binddn=\"$UPDATEDN\""
- echo " bindmethod=simple"
- echo " credentials=$CREDENTIALS"
+ echo "replica host=$slave:$REPLICALISTENPORT"
+ 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
@@ -100,10 +111,21 @@
do
if test "x$HOST" != "x$slave"; then
echo "replica host=$slave:$REPLICALISTENPORT"
- echo " binddn=\"$UPDATEDN\""
- echo " syncid=$slave"
- echo " bindmethod=simple"
- echo " credentials=$CREDENTIALS"
+ echo " syncid=$slave"
+ 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
done
@@ -122,10 +144,22 @@
if include "$HOST" "$SYNCBACKUPS"; then
echo "syncbackup syncid=$HOST"
echo " provider=$UPDATEREF"
- echo " binddn=$SYNCDN"
- echo " bindmethod=simple"
- echo " credentials=$SYNCPW"
+ case "x$APPDNMODE" in
+ sasl-digest-md5)
+ authcid="`echo $SYNCDN | cut -d, -f1 | cut -d= -f2`@$PACKAGE"
+ echo " authcid=\"$authcid\""
+ echo " bindmethod=sasl"
+ echo " saslmech=DIGEST-MD5"
+ echo " credentials=$SYNCPW"
+ ;;
+ *)
+ echo " binddn=\"$SYNCDN\""
+ echo " bindmethod=simple"
+ echo " credentials=$SYNCPW"
+ ;;
+ esac
echo " checkinterval=10"
+ echo ""
fi
}