@@ -261,7 +261,7 @@ CREATE TABLE herd ( -- -- Goats belong to zero or more herds. In most cases, they will --- belong to a single her if they are being replicated. +-- belong to a single herd if they are being replicated. -- CREATE TABLE herdmap ( herd TEXT NOT NULL, @@ -630,27 +630,8 @@ if (!defined $row->{dbpass}) { } } -if (defined $row->{pgpass} and length $row->{pgpass}) { - my $pfile = $row->{pgpass}; - if (! -e $pfile) { - elog(WARNING, qq{Password file "$pfile" does not exist, falling back to default method.}); - } - else { - open my $pw, "<", $pfile or elog(ERROR, qq{Could not open password file "$pfile": $!\n}); - while(<$pw>) { - next unless /^([^:]*):([^:]*):([^:]+):([^:]+):([^:]*)$/o; - ($db{host},$db{port},$db{name},$db{user},$db{pw}) = ($1,$2,$3,$4,$5); - last; - } - close $pw; - exists $db{name} or elog(ERROR, qq{The password file "$pfile" did not contain any valid information\n}); - } -} - -if (! exists $db{name}) { - for (qw(host port name user pass conn)) { - $db{$_} = exists $row->{"db$_"} ? $row->{"db$_"} : ''; - } +for (qw(host port name user pass conn)) { + $db{$_} = exists $row->{"db$_"} ? $row->{"db$_"} : ''; } ## Check that the port is numeric bucardo.schema bd67f1cf5c82a4f49f5c552c70331c3bc2c31f99 Ben Allen ben@sysadminschronicles.com http://github.com/unilogic/bucardo/commit/2920d0767638503e69f3c7bc46c6f348f311e5fb 2920d0767638503e69f3c7bc46c6f348f311e5fb 2009-05-11T09:16:00-07:00 2009-05-11T09:16:00-07:00 Fix that makes reading a pgpass file work when the pgpass file has more than one entry. The db_getconn function used to open the pgpass file for a second time and uses the attributes (more than just password) from the file instead of what is in the db table. This is after the password is read in from the file. The problem with the code before was that it takes the first entry in the pgpass file that has the correct format. Where as the pervious password related code matches the correct line. So the solution is to simply delete this large block of code as its seems redundant unless we want attributes to override those in the database ( I sure don't want that ). cf329425d87b57c2c711916f373056eba82203e6 Ben Allen ben@sysadminschronicles.com