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

[Matt Brown]

Author: mattb-guest
Date: 2006-11-18 03:11:00 +0100 (Sat, 18 Nov 2006)
New Revision: 360

Modified:
   trunk/dpkg/postinst
Log:
Fix a minor bug in the upgrade path. The admin password should not be
requested unless the selected database type needs authentication.


Modified: trunk/dpkg/postinst
===================================================================
--- trunk/dpkg/postinst	2006-11-11 17:01:06 UTC (rev 359)
+++ trunk/dpkg/postinst	2006-11-18 02:11:00 UTC (rev 360)
@@ -149,9 +149,11 @@
 				if [ "$dbc_upgrade" != "true" ]; then return 0; fi
 
 				# get the admin password if it's needed
-				if [ ! "$dbc_frontend" ]; then
-					if [ ! "$dbc_dbtype" = "pgsql" ] || [ ! "$dbc_authmethod_admin" = "ident" ]; then
-						dbc_get_admin_pass
+				if echo "$dbc_authenticated_dbtypes" | grep -q "$dbc_dbtype"; then
+					if [ ! "$dbc_frontend" ]; then
+						if [ ! "$dbc_dbtype" = "pgsql" ] || [ ! "$dbc_authmethod_admin" = "ident" ]; then
+							dbc_get_admin_pass
+						fi
 					fi
 				fi