diff options
| author | Tom Lane | 2005-08-15 02:40:36 +0000 |
|---|---|---|
| committer | Tom Lane | 2005-08-15 02:40:36 +0000 |
| commit | 2498d8296eebd6706d5a00886a4f5ba02a1fe261 (patch) | |
| tree | c07de46683136e441e7f3fef937f540161761d61 /src/backend/libpq | |
| parent | f590ed12f67620ac018491739c8bc5b13de9495c (diff) | |
Clean up some stray remaining references to pg_shadow, pg_user, pg_group.
Diffstat (limited to 'src/backend/libpq')
| -rw-r--r-- | src/backend/libpq/crypt.c | 13 | ||||
| -rw-r--r-- | src/backend/libpq/pg_hba.conf.sample | 4 |
2 files changed, 7 insertions, 10 deletions
diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c index 297db1eea91..4e91b1a36f0 100644 --- a/src/backend/libpq/crypt.c +++ b/src/backend/libpq/crypt.c @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/libpq/crypt.c,v 1.64 2005/06/29 22:51:54 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/libpq/crypt.c,v 1.65 2005/08/15 02:40:25 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -57,7 +57,7 @@ md5_crypt_verify(const Port *port, const char *role, char *client_pass) if (shadow_pass == NULL || *shadow_pass == '\0') return STATUS_ERROR; - /* We can't do crypt with pg_shadow MD5 passwords */ + /* We can't do crypt with MD5 passwords */ if (isMD5(shadow_pass) && port->auth_method == uaCrypt) { ereport(LOG, @@ -75,7 +75,7 @@ md5_crypt_verify(const Port *port, const char *role, char *client_pass) crypt_pwd = palloc(MD5_PASSWD_LEN + 1); if (isMD5(shadow_pass)) { - /* pg_shadow already encrypted, only do salt */ + /* stored password already encrypted, only do salt */ if (!EncryptMD5(shadow_pass + strlen("md5"), (char *) port->md5Salt, sizeof(port->md5Salt), crypt_pwd)) @@ -86,7 +86,7 @@ md5_crypt_verify(const Port *port, const char *role, char *client_pass) } else { - /* pg_shadow plain, double-encrypt */ + /* stored password is plain, double-encrypt */ char *crypt_pwd2 = palloc(MD5_PASSWD_LEN + 1); if (!EncryptMD5(shadow_pass, @@ -121,10 +121,7 @@ md5_crypt_verify(const Port *port, const char *role, char *client_pass) default: if (isMD5(shadow_pass)) { - /* - * Encrypt user-supplied password to match MD5 in - * pg_shadow - */ + /* Encrypt user-supplied password to match stored MD5 */ crypt_client_pass = palloc(MD5_PASSWD_LEN + 1); if (!EncryptMD5(client_pass, port->user_name, diff --git a/src/backend/libpq/pg_hba.conf.sample b/src/backend/libpq/pg_hba.conf.sample index b47ca578ae1..7e1dde784bf 100644 --- a/src/backend/libpq/pg_hba.conf.sample +++ b/src/backend/libpq/pg_hba.conf.sample @@ -20,7 +20,7 @@ # "host" is either a plain or SSL-encrypted TCP/IP socket, "hostssl" is an # SSL-encrypted TCP/IP socket, and "hostnossl" is a plain TCP/IP socket. # -# DATABASE can be "all", "sameuser", "samegroup", a database name, or +# DATABASE can be "all", "sameuser", "samerole", a database name, or # a comma-separated list thereof. # # USER can be "all", a user name, a group name prefixed with "+", or @@ -42,7 +42,7 @@ # # Database and user names containing spaces, commas, quotes and other special # characters must be quoted. Quoting one of the keywords "all", "sameuser" or -# "samegroup" makes the name lose its special character, and just match a +# "samerole" makes the name lose its special character, and just match a # database or username with that name. # # This file is read on server startup and when the postmaster receives |