diff options
author | Marc G. Fournier <scrappy@hub.org> | 1997-03-25 00:54:15 +0000 |
---|---|---|
committer | Marc G. Fournier <scrappy@hub.org> | 1997-03-25 00:54:15 +0000 |
commit | 424e43326bd581386d5b48ee84a2eb6816e28f88 (patch) | |
tree | 8c4082f954b9b0fece9f52b93231dbe34472d60d /src/backend/libpq/auth.c | |
parent | 7fae43654b8926b433605aee6ff46f435f55c83c (diff) | |
download | postgresql-424e43326bd581386d5b48ee84a2eb6816e28f88.tar.gz postgresql-424e43326bd581386d5b48ee84a2eb6816e28f88.zip |
I don't know whether this breaks what the previous person tried to
fix, but figure I"ll know soon enough, eh?
Patch submitted by Dan McGuirk
Diffstat (limited to 'src/backend/libpq/auth.c')
-rw-r--r-- | src/backend/libpq/auth.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index 8864f8233e8..b191c03cbff 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.10 1997/03/18 21:46:31 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.11 1997/03/25 00:54:15 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -438,14 +438,13 @@ be_recvauth(MsgType msgtype_arg, Port *port, char *username, StartupInfo* sp) what used to be the only choice, but installation may choose "hba" instead. */ - if (msgtype_arg != STARTUP_KRB4_MSG && msgtype_arg != STARTUP_KRB5_MSG) { - if (msgtype_arg == STARTUP_MSG && useHostBasedAuth) - msgtype = STARTUP_HBA_MSG; - else - msgtype = STARTUP_UNAUTH_MSG; - } else { - msgtype = msgtype_arg; - } + if (msgtype_arg == STARTUP_MSG) { + if(useHostBasedAuth) + msgtype = STARTUP_HBA_MSG; + else + msgtype = STARTUP_UNAUTH_MSG; + } else + msgtype = msgtype_arg; if (!username) { |