Masato Taruishi
taru****@users*****
2004年 9月 16日 (木) 20:35:25 JST
===================================================================
RCS file: ultrapossum/debian/ultrapossum-common.config,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ultrapossum/debian/ultrapossum-common.config 2004/09/16 11:14:58 1.4
+++ ultrapossum/debian/ultrapossum-common.config 2004/09/16 11:35:24 1.5
@@ -23,7 +23,6 @@
fi
}
-SUFFIX="o=ultrapossum"
if test -x "/usr/bin/ultrapossum-config"; then
eval `/usr/bin/ultrapossum-config init`
trap "eval `ultrapossum-config term`" 0
@@ -32,29 +31,33 @@
fi
if test "$1" = "reconfigure"; then
- db_set ultrapossum-common/suffix $SUFFIX
+ db_set ultrapossum-common/suffix "$SUFFIX"
db_set ultrapossum-common/config_backend_ldap_uri "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_URI"
db_set ultrapossum-common/config_backend_ldap_basedn "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BASEDN"
db_set ultrapossum-common/config_backend_ldap_binddn "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDDN"
db_set ultrapossum-common/config_backend_ldap_bindpw "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDPW"
db_set ultrapossum-common/config_backend_ldap_bindpw2 "$ULTRAPOSSUM_CONFIG_BACKEND_LDAP_BINDPW"
-fi
-case "$ULTRAPOSSUM_CONFIG_BACKEND" in
- ldap)
- backend=ldap
- ;;
- *)
- backend=file
- ;;
-esac
+ case "$ULTRAPOSSUM_CONFIG_BACKEND" in
+ ldap)
+ backend=ldap
+ ;;
+ *)
+ backend=file
+ ;;
+ esac
-db_set ultrapossum-common/config_backend "$backend"
+ db_set ultrapossum-common/config_backend "$backend"
+fi
STATE=start
while test "$STATE" != "end"; do
case "$STATE" in
start)
+ db_input low ultrapossum-common/suffix
+ STATE=backend
+ ;;
+ backend)
db_input low ultrapossum-common/config_backend || true
db_go
db_get ultrapossum-common/config_backend
@@ -98,7 +101,7 @@
db_fset ultrapossum-common/config_backend_ldap_binddn seen false
db_fset ultrapossum-common/config_backend_ldap_bindpw seen false
db_fset ultrapossum-common/config_backend_ldap_bindpw2 seen false
- STATE=start
+ STATE=backend
fi
fi
;;