diff options
| -rw-r--r-- | src/backend/libpq/auth.c | 14 | ||||
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 8 |
2 files changed, 12 insertions, 10 deletions
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index 7b4437736f4..ae02dfb6328 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.1.1.1 1996/07/09 06:21:30 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.2 1996/08/14 04:51:02 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -403,11 +403,8 @@ hba_recvauth(struct sockaddr_in *addr, PacketBuf *pbuf, StartupInfo *sp) char *conf_file; /* put together the full pathname to the config file */ - conf_file = (char *) malloc((strlen(GetPGData())+strlen(CONF_FILE)+2)*sizeof(char)); - strcpy(conf_file, GetPGData()); - strcat(conf_file, "/"); - strcat(conf_file, CONF_FILE); - + conf_file = (char *) malloc((strlen(DataDir)+strlen(CONF_FILE)+2)*sizeof(char)); + sprintf(conf_file, "%s/%s", DataDir, CONF_FILE); /* Open the config file. */ file = fopen(conf_file, "r"); @@ -463,7 +460,10 @@ hba_recvauth(struct sockaddr_in *addr, PacketBuf *pbuf, StartupInfo *sp) } else { (void) sprintf(PQerrormsg, - "hba_recvauth: config file does not exist or permissions are not setup correctly!\n"); + "hba_recvauth: Host-based authentication config file " + "does not exist or permissions are not setup correctly! " + "Unable to open file \"%s\".\n", + conf_file); fputs(PQerrormsg, stderr); pqdebug("%s", PQerrormsg); free(conf_file); diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 74d0792e2aa..bda76dd2185 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -10,7 +10,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.4 1996/08/06 16:43:24 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.5 1996/08/14 04:51:34 scrappy Exp $ * * NOTES * @@ -1110,8 +1110,10 @@ checkDataDir() sprintf(path, "%s%cbase%ctemplate1%cpg_class", DataDir, SEP_CHAR, SEP_CHAR, SEP_CHAR); if ((fp=fopen(path, "r")) == NULL) { - fprintf(stderr, "%s: data base not found in directory \"%s\"\n", - progname, DataDir); + fprintf(stderr, "%s does not find the database. Expected to find it " + "in the PGDATA directory \"%s\", but unable to open directory " + "with pathname \"%s\".\n", + progname, DataDir, path); exit(2); } fclose(fp); |