[Dbconfig-common-changes] dbconfig-common/internal pgsql,1.11,1.12

[seanius at haydn.debian.org]

Update of /cvsroot/dbconfig-common/dbconfig-common/internal
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv15551/internal

Modified Files:
	pgsql 
Log Message:
fix for dbc_dbname leakage in internal/pgsql

Index: pgsql
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/internal/pgsql,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- pgsql	26 Sep 2005 07:20:44 -0000	1.11
+++ pgsql	27 Sep 2005 17:26:14 -0000	1.12
@@ -125,7 +125,8 @@
 	if [ "$dbc_dbport" ]; then extra="$extra -p '$dbc_dbport'"; fi
 	if [ "$dbc_dbadmin" ]; then extra="$extra -U '$dbc_dbadmin'"; fi
 	if [ "$dbc_authmethod_user" != "ident" ]; then 
-		extra="$extra" dbc_dbname="template1" _dbc_pgsql_exec_command "CREATE USER \"$dbc_dbuser\" WITH PASSWORD '$dbc_dbpass'"
+		dbc_dbname="template1"
+		extra="$extra" _dbc_pgsql_exec_command "CREATE USER \"$dbc_dbuser\" WITH PASSWORD '$dbc_dbpass'"
 		retval=$?
 	else
 		dbc_error=`su -s /bin/sh $localuser -c "env HOME='$_dbc_pgsql_tmpdir' PGSSLMODE='$PGSSLMODE' createuser -A -D -q $extra $dbc_dbuser" 2>&1` || retval=$?
@@ -237,8 +238,9 @@
 ##
 dbc_pgsql_check_user(){
 	local dbc_dbname l_retval _dbc_asuser
+	dbc_dbname="template1"
 	if [ "$dbc_dbadmin" ]; then extra="$extra -U '$dbc_dbadmin'"; fi
-	extra="$extra" dbc_dbname=template1 _dbc_pgsql_exec_command "ALTER USER \"$dbc_dbuser\""
+	extra="$extra" _dbc_pgsql_exec_command "ALTER USER \"$dbc_dbuser\""
 	l_retval=$?
 	return $l_retval
 }