diff options
| author | Bruce Momjian <bruce@momjian.us> | 2006-05-18 16:26:44 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2006-05-18 16:26:44 +0000 |
| commit | d0f9ca34bd303c82eb1a45ff41969ff9ef58f22d (patch) | |
| tree | eb854d49fc92eb79490bbbc4bf22810cdd76eae0 | |
| parent | 0622821853f948bf99365874a73c1802a4bf0627 (diff) | |
| download | postgresql-d0f9ca34bd303c82eb1a45ff41969ff9ef58f22d.tar.gz postgresql-d0f9ca34bd303c82eb1a45ff41969ff9ef58f22d.zip | |
Remove canonicalize_path() call for .pgpass socket directory comparison;
not worth adding path.c to libpq.
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index 45dae727286..5e76fc0c728 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; |