Masato Taruishi
taru****@users*****
2004年 10月 26日 (火) 21:59:23 JST
===================================================================
RCS file: ultrapossum/module/server/10server,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ultrapossum/module/server/10server 2004/10/20 16:09:24 1.27
+++ ultrapossum/module/server/10server 2004/10/26 12:59:23 1.28
@@ -88,6 +88,8 @@
CHROOTFILES=`ultrapossum_getconf CHROOTFILES "$SLAPDMASTERCONF $ULTRAPOSSUM_MASTER_SLAPD_CONF $ULTRAPOSSUM_SLAPD_CONF $(egrep '^include' $SLAPDMASTERCONF 2> /dev/null | awk -F' ' '{print $2;}') $UCDATA_PATH $ldaplibdir"`
CHROOTEXTRAFILES=`ultrapossum_getconf CHROOTEXTRAFILES ""`
+LDAP_PROVIDER=`ultrapossum_getconf LDAP_PROVIDER ""`
+
LDAPLISTENPORT=`ultrapossum_getconf LDAPLISTENPORT "$ldaplistenport"`
if test "x$LDAPLISTENPORT" != "x"; then
LDAPURILIST=`ultrapossum_getconf LDAPURILIST ldap://:$LDAPLISTENPORT/`
@@ -207,6 +209,24 @@
SLAVES="$s $SLAVES"
fi
done
+fi
+
+if test "x$LDAP_PROVIDER" = "x"; then
+ for h in $SLAVES
+ do
+ if test "x$LDAP_PROVIDER" = "x"; then
+ LDAP_PROVIDER="ldap://$h/"
+ else
+ LDAP_PROVIDER="$LDAP_PROVIDER ldap://$h/"
+ fi
+ done
+ if ! include "$MASTER" "$SYNCBACKUPS"; then
+ if test "x$LDAP_PROVIDER" = "x"; then
+ LDAP_PROVIDER="ldap://$MASTER/"
+ else
+ LDAP_PROVIDER="$LDAP_PROVIDER ldap://$MASTER/"
+ fi
+ fi
fi
if test "x$SECRETCF" = "x"; then
===================================================================
RCS file: ultrapossum/module/server/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ultrapossum/module/server/Makefile.am 2004/10/26 11:52:12 1.17
+++ ultrapossum/module/server/Makefile.am 2004/10/26 12:59:23 1.18
@@ -64,6 +64,5 @@
mkpasswd \
db/dbdump \
db/dbload \
- db/dbtransition \
- service-server
+ db/dbtransition