Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit f779a34

Browse files
committed
Fix breakage induced by yours truly in Kerberos and PAM code.
1 parent 6687650 commit f779a34

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/backend/libpq/auth.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.100 2003/04/22 00:08:06 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.101 2003/04/25 03:28:55 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -119,10 +119,10 @@ pg_krb4_recvauth(Port *port)
119119
version, PG_KRB4_VERSION);
120120
return STATUS_ERROR;
121121
}
122-
if (strncmp(port->user, auth_data.pname, SM_DATABASE_USER) != 0)
122+
if (strncmp(port->user_name, auth_data.pname, SM_DATABASE_USER) != 0)
123123
{
124124
elog(LOG, "pg_krb4_recvauth: name \"%s\" != \"%s\"",
125-
port->user, auth_data.pname);
125+
port->user_name, auth_data.pname);
126126
return STATUS_ERROR;
127127
}
128128
return STATUS_OK;
@@ -291,10 +291,10 @@ pg_krb5_recvauth(Port *port)
291291
}
292292

293293
kusername = pg_an_to_ln(kusername);
294-
if (strncmp(port->user, kusername, SM_DATABASE_USER))
294+
if (strncmp(port->user_name, kusername, SM_DATABASE_USER))
295295
{
296296
elog(LOG, "pg_krb5_recvauth: user name \"%s\" != krb5 name \"%s\"",
297-
port->user, kusername);
297+
port->user_name, kusername);
298298
ret = STATUS_ERROR;
299299
}
300300
else
@@ -488,7 +488,7 @@ ClientAuthentication(Port *port)
488488
#ifdef USE_PAM
489489
case uaPAM:
490490
pam_port_cludge = port;
491-
status = CheckPAMAuth(port, port->user, "");
491+
status = CheckPAMAuth(port, port->user_name, "");
492492
break;
493493
#endif /* USE_PAM */
494494

0 commit comments

Comments
 (0)