From d0f9ca34bd303c82eb1a45ff41969ff9ef58f22d Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Thu, 18 May 2006 16:26:44 +0000
Subject: [PATCH] Remove canonicalize_path() call for .pgpass socket directory
 comparison; not worth adding path.c to libpq.

---
 src/interfaces/libpq/fe-connect.c | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 45dae72728..5e76fc0c72 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.329 2006/05/17 21:50:54 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.330 2006/05/18 16:26:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -3110,19 +3110,13 @@ PasswordFromFile(char *hostname, char *port, char *dbname, char *username)
 	if (hostname == NULL)
 		hostname = DefaultHost;
 	else if (is_absolute_path(hostname))
-	{
-		char		canon_host[MAXPGPATH];
-		char		canon_def_socket[MAXPGPATH];
-
-		StrNCpy(canon_host, hostname, MAXPGPATH);
-		StrNCpy(canon_def_socket, DEFAULT_PGSOCKET_DIR, MAXPGPATH);
-
-		canonicalize_path(canon_host);
-		canonicalize_path(canon_def_socket);
-
-		if (strcmp(canon_host, canon_def_socket) == 0)
+		/*
+		 *	We should probably use canonicalize_path(), but then
+		 *	we have to bring path.c into libpq, and it doesn't
+		 *	seem worth it.
+		 */
+		if (strcmp(hostname, DEFAULT_PGSOCKET_DIR) == 0)
 			hostname = DefaultHost;
-	}
 	
 	if (port == NULL)
 		port = DEF_PGPORT_STR;
-- 
2.40.0