Commit18627c5

committed

Allow the .pgpass hostname to match the default socket directory, as

well as a blank pghost.

1 parent7123349 commit18627c5Copy full SHA for 18627c5

File tree

+20

-5

lines changed

+20

-5

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<!-- $PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.208 2006/05/06 16:25:11 momjian Exp $ -->`
	`1`	`+<!-- $PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.209 2006/05/17 21:50:54 momjian Exp $ -->`
`2`	`2`
`3`	`3`	`<chapter id="libpq">`
`4`	`4`	`<title><application>libpq</application> - C Library</title>`
`@@ -4000,9 +4000,9 @@ current connection parameters will be used. (Therefore, put more-specific`
`4000`	`4000`	`entries first when you are using wildcards.)`
`4001`	`4001`	`If an entry needs to contain <literal>:</literal> or`
`4002`	`4002`	`<literal>\</literal>, escape this character with <literal>\</literal>.`
`4003`		`-A hostname of <literal>localhost</> matches both <literal>host</> (TCP)`
`4004`		`-and <literal>local</> (Unix domain socket) connections coming from the`
`4005`		`-local machine.`
	`4003`	`+A hostname of <literal>localhost</> matches bothTCP<literal>host</> (hostname <literal>localhost</>)`
	`4004`	`+andUnix domain socket<literal>local</> (<literal>pghost</> empty or the default socket directory)`
	`4005`	`+connections coming from thelocal machine.`
`4006`	`4006`	`</para>`
`4007`	`4007`
`4008`	`4008`	`<para>`

Lines changed: 16 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.328 2006/03/14 22:48:23 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.329 2006/05/17 21:50:54 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -3106,9 +3106,24 @@ PasswordFromFile(char hostname, char port, char dbname, char username)`
`3106`	`3106`	`if (username==NULL\|\|strlen(username)==0)`
`3107`	`3107`	`returnNULL;`
`3108`	`3108`
	`3109`	`+/* 'localhost' matches pghost of '' or the default socket directory */`
`3109`	`3110`	`if (hostname==NULL)`
`3110`	`3111`	`hostname=DefaultHost;`
	`3112`	`+elseif (is_absolute_path(hostname))`
	`3113`	`+{`
	`3114`	`+charcanon_host[MAXPGPATH];`
	`3115`	`+charcanon_def_socket[MAXPGPATH];`
	`3116`	`+`
	`3117`	`+StrNCpy(canon_host,hostname,MAXPGPATH);`
	`3118`	`+StrNCpy(canon_def_socket,DEFAULT_PGSOCKET_DIR,MAXPGPATH);`
`3111`	`3119`
	`3120`	`+canonicalize_path(canon_host);`
	`3121`	`+canonicalize_path(canon_def_socket);`
	`3122`	`+`
	`3123`	`+if (strcmp(canon_host,canon_def_socket)==0)`
	`3124`	`+hostname=DefaultHost;`
	`3125`	`+}`
	`3126`	`+`
`3112`	`3127`	`if (port==NULL)`
`3113`	`3128`	`port=DEF_PGPORT_STR;`
`3114`	`3129`

Comments

(0)