diff options
| author | Bruce Momjian | 1997-12-12 16:26:36 +0000 |
|---|---|---|
| committer | Bruce Momjian | 1997-12-12 16:26:36 +0000 |
| commit | ab179d6940ad9241fe0887b4c5e4664448ca3eb0 (patch) | |
| tree | 0064a06e0567c5dcfe1987644c0f9fc6dfc08c93 /src/backend/libpq | |
| parent | c60f70b53f26dafe50a3814086d0ff37b40ee71c (diff) | |
Make password null on startup.
Diffstat (limited to 'src/backend/libpq')
| -rw-r--r-- | src/backend/libpq/be-pqexec.c | 6 | ||||
| -rw-r--r-- | src/backend/libpq/crypt.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/backend/libpq/be-pqexec.c b/src/backend/libpq/be-pqexec.c index d0f133f47a4..d895f7a031d 100644 --- a/src/backend/libpq/be-pqexec.c +++ b/src/backend/libpq/be-pqexec.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.10 1997/12/06 22:56:35 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/Attic/be-pqexec.c,v 1.11 1997/12/12 16:26:14 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -143,11 +143,11 @@ PQexec(char *query) be_portalpush(entry); /* ---------------- - * pg_eval_dest will put the query results in a portal which will + * pg_exec_query_dest will put the query results in a portal which will * end up on the top of the portal stack. * ---------------- */ - pg_eval_dest(query, (char **) NULL, (Oid *) NULL, 0, Local); + pg_exec_query_dest(query, (char **) NULL, (Oid *) NULL, 0, Local); /* ---------------- * pop the portal off the portal stack and return the diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c index a91ec8b161e..1386ff74acc 100644 --- a/src/backend/libpq/crypt.c +++ b/src/backend/libpq/crypt.c @@ -17,6 +17,7 @@ #endif #include "postgres.h" +#include "miscadmin.h" #include "libpq/crypt.h" #include "utils/nabstime.h" #include "utils/palloc.h" @@ -129,7 +130,7 @@ MsgType crypt_salt(const char* user) { crypt_getloginfo(user, &passwd, &valuntil); - if (passwd == NULL || *passwd == '\0') { + if (passwd == NULL || *passwd == '\0' || !strcmp(passwd, "\\N")) { if (passwd) pfree((void*)passwd); if (valuntil) pfree((void*)valuntil); return STARTUP_UNSALT_MSG; |