aboutsummaryrefslogtreecommitdiff
path: root/src/backend/libpq/crypt.c
diff options
context:
space:
mode:
authorMarc G. Fournier <scrappy@hub.org>1997-12-07 20:57:45 +0000
committerMarc G. Fournier <scrappy@hub.org>1997-12-07 20:57:45 +0000
commitbec35da8bfac1c1c905a0d8a6f35d4b3f9962b31 (patch)
tree846d7a359b0c67670dc8177b0ae3537652ccada0 /src/backend/libpq/crypt.c
parenta68a132a6c0f90e5d03e8409e843e6117d5412a2 (diff)
downloadpostgresql-bec35da8bfac1c1c905a0d8a6f35d4b3f9962b31.tar.gz
postgresql-bec35da8bfac1c1c905a0d8a6f35d4b3f9962b31.zip
Add error check on getenv("DATADIR")
Add code to set DATADIR in postmaster.c if -D is used
Diffstat (limited to 'src/backend/libpq/crypt.c')
-rw-r--r--src/backend/libpq/crypt.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c
index c75d8ac4590..4e4cb15f81b 100644
--- a/src/backend/libpq/crypt.c
+++ b/src/backend/libpq/crypt.c
@@ -25,9 +25,13 @@ char* crypt_getpwdfilename() {
static char* filename = NULL;
if (!filename) {
- char* env;
+ char* env = NULL;
env = getenv("PGDATA");
+ if(env == NULL) {
+ elog(FATAL, "crypt.c: PGDATA is not defined");
+ exit(-1);
+ }
filename = (char*)malloc(strlen(env) + strlen(CRYPT_PWD_FILE) + 2);
sprintf(filename, "%s/%s", env, CRYPT_PWD_FILE);
}