|
8 | 8 | *
|
9 | 9 | *
|
10 | 10 | * 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 $ |
12 | 12 | *
|
13 | 13 | *-------------------------------------------------------------------------
|
14 | 14 | */
|
@@ -119,10 +119,10 @@ pg_krb4_recvauth(Port *port)
|
119 | 119 | version,PG_KRB4_VERSION);
|
120 | 120 | returnSTATUS_ERROR;
|
121 | 121 | }
|
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) |
123 | 123 | {
|
124 | 124 | elog(LOG,"pg_krb4_recvauth: name \"%s\" != \"%s\"",
|
125 |
| -port->user,auth_data.pname); |
| 125 | +port->user_name,auth_data.pname); |
126 | 126 | returnSTATUS_ERROR;
|
127 | 127 | }
|
128 | 128 | returnSTATUS_OK;
|
@@ -291,10 +291,10 @@ pg_krb5_recvauth(Port *port)
|
291 | 291 | }
|
292 | 292 |
|
293 | 293 | 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)) |
295 | 295 | {
|
296 | 296 | elog(LOG,"pg_krb5_recvauth: user name \"%s\" != krb5 name \"%s\"",
|
297 |
| -port->user,kusername); |
| 297 | +port->user_name,kusername); |
298 | 298 | ret=STATUS_ERROR;
|
299 | 299 | }
|
300 | 300 | else
|
@@ -488,7 +488,7 @@ ClientAuthentication(Port *port)
|
488 | 488 | #ifdefUSE_PAM
|
489 | 489 | caseuaPAM:
|
490 | 490 | pam_port_cludge=port;
|
491 |
| -status=CheckPAMAuth(port,port->user,""); |
| 491 | +status=CheckPAMAuth(port,port->user_name,""); |
492 | 492 | break;
|
493 | 493 | #endif/* USE_PAM */
|
494 | 494 |
|
|