diff options
author | Bruce Momjian <bruce@momjian.us> | 2001-08-17 15:40:07 +0000 |
---|---|---|
committer | Bruce Momjian <bruce@momjian.us> | 2001-08-17 15:40:07 +0000 |
commit | 0a3094b6f3feb920e5abaf8ae1b881cb025d0f99 (patch) | |
tree | 4cdebc5223a762e029c5e49aceb20ba9345cd7f4 /src/backend/libpq/crypt.c | |
parent | 2637f887e70afd04878f2ca997ba6808d5edef32 (diff) | |
download | postgresql-0a3094b6f3feb920e5abaf8ae1b881cb025d0f99.tar.gz postgresql-0a3094b6f3feb920e5abaf8ae1b881cb025d0f99.zip |
Reorder MD5/crypt so MD5 comes first in the code.
Diffstat (limited to 'src/backend/libpq/crypt.c')
-rw-r--r-- | src/backend/libpq/crypt.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c index 5a54bde4b6b..8f2a1f92439 100644 --- a/src/backend/libpq/crypt.c +++ b/src/backend/libpq/crypt.c @@ -9,7 +9,7 @@ * Dec 17, 1997 - Todd A. Brandys * Orignal Version Completed. * - * $Id: crypt.c,v 1.36 2001/08/17 03:09:31 momjian Exp $ + * $Id: crypt.c,v 1.37 2001/08/17 15:40:07 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -294,13 +294,6 @@ md5_crypt_verify(const Port *port, const char *user, const char *pgpass) */ switch (port->auth_method) { - case uaCrypt: - { - char salt[3]; - StrNCpy(salt, port->cryptSalt,3); - crypt_pwd = crypt(passwd, salt); - break; - } case uaMD5: crypt_pwd = palloc(MD5_PASSWD_LEN+1); if (isMD5(passwd)) @@ -334,6 +327,13 @@ md5_crypt_verify(const Port *port, const char *user, const char *pgpass) pfree(crypt_pwd2); } break; + case uaCrypt: + { + char salt[3]; + StrNCpy(salt, port->cryptSalt,3); + crypt_pwd = crypt(passwd, salt); + break; + } default: crypt_pwd = passwd; break; |