|
8 | 8 | * |
9 | 9 | * |
10 | 10 | * IDENTIFICATION |
11 | | - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.329 2006/05/17 21:50:54 momjian Exp $ |
| 11 | + * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.330 2006/05/18 16:26:44 momjian Exp $ |
12 | 12 | * |
13 | 13 | *------------------------------------------------------------------------- |
14 | 14 | */ |
@@ -3110,19 +3110,13 @@ PasswordFromFile(char *hostname, char *port, char *dbname, char *username) |
3110 | 3110 | if (hostname==NULL) |
3111 | 3111 | hostname=DefaultHost; |
3112 | 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); |
3119 | | - |
3120 | | -canonicalize_path(canon_host); |
3121 | | -canonicalize_path(canon_def_socket); |
3122 | | - |
3123 | | -if (strcmp(canon_host,canon_def_socket)==0) |
| 3113 | +/* |
| 3114 | + *We should probably use canonicalize_path(), but then |
| 3115 | + *we have to bring path.c into libpq, and it doesn't |
| 3116 | + *seem worth it. |
| 3117 | + */ |
| 3118 | +if (strcmp(hostname,DEFAULT_PGSOCKET_DIR)==0) |
3124 | 3119 | hostname=DefaultHost; |
3125 | | -} |
3126 | 3120 |
|
3127 | 3121 | if (port==NULL) |
3128 | 3122 | port=DEF_PGPORT_STR; |
|