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

[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-serv15910/internal

Modified Files:
	pgsql 
Log Message:
various pgsql and multidb fixes


Index: pgsql
===================================================================
RCS file: /cvsroot/dbconfig-common/dbconfig-common/internal/pgsql,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- pgsql	27 Sep 2005 17:26:14 -0000	1.12
+++ pgsql	10 Oct 2005 18:53:18 -0000	1.13
@@ -38,19 +38,21 @@
 }
 
 _dbc_psql_cmd_setup(){
-	local localuser remoteuser remotepass
+	local localuser method remoteuser remotepass
 	localuser=`_dbc_psql_local_username`
 	remoteuser=`_dbc_psql_remote_username`
 	_dbc_pgsql_tmpdir=`mktemp -dt dbconfig-common.psql_home.XXXXXX`
 	if [ $? -ne 0 ]; then return 1; fi
-	if [ "$dbc_authmethod_admin" = "password" ]; then
+	if [ "$remoteuser" = "$dbc_dbadmin" ]; then
+		method="$dbc_authmethod_admin"
+		remotepass="$dbc_dbadmpass"
+	else
+		method="$dbc_authmethod_user"
+		remotepass="$dbc_dbpass"
+	fi
+	if [ "$method" = "password" ]; then
 		touch "${_dbc_pgsql_tmpdir}/.pgpass"
 		chmod 600 ${_dbc_pgsql_tmpdir}/.pgpass
-		if [ "$remoteuser" = "$dbc_dbadmin" ]; then
-			remotepass="$dbc_dbadmpass"
-		else
-			remotepass="$dbc_dbpass"
-		fi
 		cat << EOF > ${_dbc_pgsql_tmpdir}/.pgpass
 *:*:*:$remoteuser:$remotepass
 EOF
@@ -68,10 +70,9 @@
 }
 
 _dbc_psql(){
-	local extra retval PGSSLMODE localuser
+	local extra retval PGSSLMODE localuser remoteuser
 	localuser=`_dbc_psql_local_username`
 	remoteuser=`_dbc_psql_remote_username`
-	_dbc_pgsql_tmpdir=`mktemp -dt dbconfig-common.psql_home.XXXXXX`
 	PGSSLMODE="prefer"
 	retval=0
 	_dbc_psql_cmd_setup
@@ -187,15 +188,12 @@
 	local l_sqlfile retval
 	l_sqlfile=$1
 
-	# do dbc_asuser check here XXX
-
 	if [ ! "$l_sqlfile" ]; then
 		dbc_error="no file supplied to execute"
 		dbc_log="no file supplied to execute"
 		return 1
 	fi
 
-	#_dbc_psql $extra $dbc_dbname < "$l_sqlfile"
 	_dbc_psql $dbc_dbname < "$l_sqlfile"
 	retval=$?
 	return $retval