[Dbconfig-common-changes] [dbconfig-common] r286 - trunk/dpkg

[Sean Finney]

Author: seanius
Date: 2006-08-05 20:08:06 +0000 (Sat, 05 Aug 2006)
New Revision: 286

Modified:
   trunk/dpkg/config
Log:
more frontend fixes

Modified: trunk/dpkg/config
===================================================================
--- trunk/dpkg/config	2006-08-05 06:01:43 UTC (rev 285)
+++ trunk/dpkg/config	2006-08-05 20:08:06 UTC (rev 286)
@@ -37,6 +37,7 @@
 	userdb_prio="low"
 	if [ "$dbc_frontend" ]; then
 		userdb_prio="medium"
+		need_adminpw="false"
 	else
 		userdb_prio="low"
 	fi
@@ -312,7 +313,7 @@
 	;;
 	# state 7 - pgsql specific auth stuff, part 1
 	7)
-		if [ "$dbc_dbtype" = "pgsql" ]; then
+		if [ "$dbc_dbtype" = "pgsql" ] && [ ! "$dbc_frontend" ]; then
 			# postgresql provides multiple auth types, and ssl
 			# get the admin auth method
 			db_input low $dbc_package/pgsql/authmethod-admin || true
@@ -320,7 +321,7 @@
 	;;
 	# state 8 - pgsql auth stuff, part 2
 	8)
-		if [ "$dbc_dbtype" = "pgsql" ]; then
+		if [ "$dbc_dbtype" = "pgsql" ] && [ ! "$dbc_frontend" ]; then
 			db_get $dbc_package/pgsql/authmethod-admin && authmethod_admin="$RET"
 			# if we are using ident, we don't need passwords
 			if [ "$authmethod_admin" = "ident" ]; then
@@ -339,9 +340,11 @@
 		if echo "$dbc_authenticated_dbtypes" | grep -q "$dbc_dbtype"; then
 
 			# who's the admin user
-			db_input $userdb_prio $dbc_package/$dbc_dbtype/admin-user || true
-			if [ "$need_adminpw" != "false" ]; then
-				dbc_get_admin_pass
+			if [ ! "$dbc_frontend" ]; then
+				db_input $userdb_prio $dbc_package/$dbc_dbtype/admin-user || true
+				if [ "$need_adminpw" != "false" ]; then
+					dbc_get_admin_pass
+				fi
 			fi
 			db_input $userdb_prio $dbc_package/db/app-user || true
 			dbc_get_app_pass