From f779a34c163a31339b881b58d34485f98df014ea Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Fri, 25 Apr 2003 03:28:55 +0000
Subject: [PATCH] Fix breakage induced by yours truly in Kerberos and PAM code.
---
src/backend/libpq/auth.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 2edc919c6d2..2b0d2d65a8b 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.100 2003/04/22 00:08:06 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.101 2003/04/25 03:28:55 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -119,10 +119,10 @@ pg_krb4_recvauth(Port *port)
version, PG_KRB4_VERSION);
return STATUS_ERROR;
}
- if (strncmp(port->user, auth_data.pname, SM_DATABASE_USER) != 0)
+ if (strncmp(port->user_name, auth_data.pname, SM_DATABASE_USER) != 0)
{
elog(LOG, "pg_krb4_recvauth: name \"%s\" != \"%s\"",
- port->user, auth_data.pname);
+ port->user_name, auth_data.pname);
return STATUS_ERROR;
}
return STATUS_OK;
@@ -291,10 +291,10 @@ pg_krb5_recvauth(Port *port)
}
kusername = pg_an_to_ln(kusername);
- if (strncmp(port->user, kusername, SM_DATABASE_USER))
+ if (strncmp(port->user_name, kusername, SM_DATABASE_USER))
{
elog(LOG, "pg_krb5_recvauth: user name \"%s\" != krb5 name \"%s\"",
- port->user, kusername);
+ port->user_name, kusername);
ret = STATUS_ERROR;
}
else
@@ -488,7 +488,7 @@ ClientAuthentication(Port *port)
#ifdef USE_PAM
case uaPAM:
pam_port_cludge = port;
- status = CheckPAMAuth(port, port->user, "");
+ status = CheckPAMAuth(port, port->user_name, "");
break;
#endif /* USE_PAM */
--
GitLab