Masato Taruishi
taru****@users*****
2004年 10月 26日 (火) 22:31:44 JST
=================================================================== RCS file: ultrapossum/module/startTLS/11startTLS,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ultrapossum/module/startTLS/11startTLS 2004/10/13 06:21:36 1.5 +++ ultrapossum/module/startTLS/11startTLS 2004/10/26 13:31:44 1.6 @@ -73,15 +73,44 @@ LDAPSURILIST=$(ultrapossum_getconf LDAPSURILIST "ldaps:///") fi +LDAPS_PROVIDER=$(ultrapossum_getconf LDAPS_PROVIDER "") + fi #cache eval "`ultrapossum_parse_config startTLS`" if test "x$ULTRAPOSSUM_MODULE_STARTTLS" = "xinstalled"; then - if test "x$LDAPSURILIST" != "x"; then - SLAPDURILIST="$SLAPDURILIST $LDAPSURILIST" + if test "x$cache" = "x"; then + if test "x$LDAPSURILIST" != "x"; then + SLAPDURILIST="$SLAPDURILIST $LDAPSURILIST" + if test "x$LDAPS_PROVIDER" = "x"; then + LDAPS_PROVIDER="ldaps://$HOST/" + if test "x$REPLICASTARTTLS" != "xno"; then + for h in $SLAVES; do + if test "x$LDAPS_PROVIDER" = "x"; then + LDAPS_PROVIDER="ldaps://$h/" + else + LDAPS_PROVIDER="$LDAPS_PROVIDER ldaps://$h/" + fi + done + fi + fi + else + if test "x$LDAPS_PROVIDER" != "x" && + test "x$REPLICASTARTTLS" != "xno" + then + for h in $SLAVES; do + if test "x$LDAPS_PROVIDER" = "x"; then + LDAPS_PROVIDER="ldaps://$h/" + else + LDAPS_PROVIDER="$LDAPS_PROVIDER ldaps://$h/" + fi + done + fi + fi + CHROOTFILES="$CHROOTFILES $TLSCERTIFICATEFILE $TLSCERTIFICATEKEYFILE" fi - CHROOTFILES="$CHROOTFILES $TLSCERTIFICATEFILE $TLSCERTIFICATEKEYFILE" + fi ;;
