[Pkg-citadel-commit] r375 - citadel/trunk/debian
Michael Meskes
meskes at alioth.debian.org
Wed Aug 12 12:12:04 UTC 2009
Author: meskes
Date: 2009-08-12 12:12:03 +0000 (Wed, 12 Aug 2009)
New Revision: 375
Modified:
citadel/trunk/debian/citadel-server.config
Log:
Changed order of states
Modified: citadel/trunk/debian/citadel-server.config
===================================================================
--- citadel/trunk/debian/citadel-server.config 2009-08-12 11:48:12 UTC (rev 374)
+++ citadel/trunk/debian/citadel-server.config 2009-08-12 12:12:03 UTC (rev 375)
@@ -8,7 +8,7 @@
db_capb backup
DO_CONFIGURE=no
-LASTSTATE=3
+LASTSTATE=8
if test -n "$2"; then
# do we want to reconfigure?
@@ -39,25 +39,25 @@
db_input high citadel/Administrator || true
;;
4)
- db_input high citadel/Password || true
+ db_input high citadel/LDAPServer || true
;;
5)
- db_input high citadel/Password_again || true
+ db_input high citadel/LDAPServerPort || true
;;
6)
- db_input high citadel/LDAPServer || true
+ db_input high citadel/LDAPBaseDN || true
;;
7)
- db_input high citadel/LDAPServerPort || true
+ db_input high citadel/LDAPBindDN || true
;;
8)
- db_input high citadel/LDAPBaseDN || true
+ db_input high citadel/LDAPBindDNPassword || true
;;
9)
- db_input high citadel/LDAPBindDN || true
+ db_input high citadel/Password || true
;;
10)
- db_input high citadel/LDAPBindDNPassword || true
+ db_input high citadel/Password_again || true
;;
esac
@@ -68,34 +68,33 @@
2)
db_get citadel/LoginType
LoginType=$RET
- case "$LoginType" in
+ ;;
+ 3)
+ case "$LoginType" in
Host)
- # external authentication, user has to exist
+ # external authentication => user has to exist
# and of course LDAP information is not needed
- LASTSTATE=3
+ LASTSTATE=3
+ db_get citadel/Administrator
+ if ! getent passwd $RET >/dev/null; then
+ # user doesn't exist
+ db_fset citadel/BadUser seen false
+ db_input critical citadel/BadUser || true
+ db_go
+ STATE=$(($STATE - 1))
+ fi
;;
Internal)
- # Don't ask LDAP stuff
- LASTSTATE=5
+ # no need to ask for LDAP stuff
+ STATE=8
;;
*)
- STATE=5
+ # user can only be created in Internal mode
+ LASTSTATE=8
;;
esac
;;
- 3)
- if [ "$LoginType" = "Host" ]; then
- db_get citadel/Administrator
- if ! getent passwd $RET >/dev/null; then
- # user doesn't exist
- db_fset citadel/BadUser seen false
- db_input critical citadel/BadUser || true
- db_go
- STATE=$(($STATE - 1))
- fi
- fi
- ;;
- 4)
+ 9)
db_get citadel/Password
PW=$RET
if [ -z "$PW" ]; then
@@ -103,7 +102,7 @@
LASTSTATE=4
fi
;;
- 5)
+ 10)
db_get citadel/Password_again
# check if passwords match
if [ "$RET" != "$PW" ]; then
More information about the Pkg-citadel-commit
mailing list