[Dbconfig-common-changes] [dbconfig-common] r424 - in trunk: debian dpkg

[Sean Finney]

tags 443985 pending
thanks

Author: seanius
Date: 2008-03-06 23:12:55 +0000 (Thu, 06 Mar 2008)
New Revision: 424

Modified:
   trunk/debian/changelog
   trunk/dpkg/common
Log:
#455018

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-03-06 23:02:59 UTC (rev 423)
+++ trunk/debian/changelog	2008-03-06 23:12:55 UTC (rev 424)
@@ -5,6 +5,8 @@
     admin password.  Thanks! (closes: #439081).
   * Fix from Niko Tyni for problems with opting out in preconfiguration
     scenarios (closes: #469728).
+  * Fix from Niko Tyni for choosing a more sane default for authmethod
+    with remote questions in pgsql installations (closes: #443985).
   * Remove default logfile path/dir on purge (closes: #455018).
 
  -- Sean Finney <seanius at debian.org>  Thu, 06 Mar 2008 23:37:03 +0100

Modified: trunk/dpkg/common
===================================================================
--- trunk/dpkg/common	2008-03-06 23:02:59 UTC (rev 423)
+++ trunk/dpkg/common	2008-03-06 23:12:55 UTC (rev 424)
@@ -65,8 +65,10 @@
 	# the database types that support it
 	if [ "$dbc_remote_questions_default" = "true" ]; then
 		dbc_remote_questions_priority="high"
+		dbc_default_pgsql_authmethod_admin="password"
 	else
 		dbc_remote_questions_priority="low"
+		dbc_default_pgsql_authmethod_admin="ident"
 	fi
 
 	dbc_set_dbtype_defaults $dbc_dbtype
@@ -244,6 +246,8 @@
 	if [ -z "$dbc_dbtype" ] || [ "$dbc_dbtype" = "pgsql" ]; then
 		if [ "$dbc_authmethod_admin" ]; then
 			db_set $dbc_package/pgsql/authmethod-admin "$dbc_authmethod_admin"
+		elif [ "$dbc_default_pgsql_authmethod_admin" ]; then
+			db_set $dbc_package/pgsql/authmethod-admin "$dbc_default_pgsql_authmethod_admin"
 		fi
 		if [ "$dbc_authmethod_user" ]; then
 			db_set $dbc_package/pgsql/authmethod-user "$dbc_authmethod_user"