rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-09-28 06:11:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix for PAM error message display:

Browse Source 
> and that the right fix is to make each of the subsequent calls be in
> this same pattern, not to try to emulate their nonsensical style.

Dominic J. Eidson
This commit is contained in:
Bruce Momjian 2002-02-25 20:07:02 +00:00
parent 9694a41a57
commit f75e16d459
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/backend/libpq/auth.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.74 2002/02/23 04:17:46 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.75 2002/02/25 20:07:02 momjian Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -766,9 +766,9 @@ CheckPAMAuth(Port *port, char *user, char *password)
return STATUS_ERROR; return STATUS_ERROR;
} }
if (retval == PAM_SUCCESS) retval = pam_set_item(pamh, PAM_USER, user);
retval = pam_set_item(pamh, PAM_USER, user);
else if (retval != PAM_SUCCESS)
{ {
snprintf(PQerrormsg, PQERRORMSG_LENGTH, snprintf(PQerrormsg, PQERRORMSG_LENGTH,
"CheckPAMAuth: pam_set_item(PAM_USER) failed: '%s'\n", "CheckPAMAuth: pam_set_item(PAM_USER) failed: '%s'\n",
@ -778,9 +778,10 @@ CheckPAMAuth(Port *port, char *user, char *password)
pam_passwd = NULL; /* Unset pam_passwd */ pam_passwd = NULL; /* Unset pam_passwd */
return STATUS_ERROR; return STATUS_ERROR;
} }
if (retval == PAM_SUCCESS)
retval = pam_set_item(pamh, PAM_CONV, &pam_passw_conv); retval = pam_set_item(pamh, PAM_CONV, &pam_passw_conv);
else
if (retval != PAM_SUCCESS)
{ {
snprintf(PQerrormsg, PQERRORMSG_LENGTH, snprintf(PQerrormsg, PQERRORMSG_LENGTH,
"CheckPAMAuth: pam_set_item(PAM_CONV) failed: '%s'\n", "CheckPAMAuth: pam_set_item(PAM_CONV) failed: '%s'\n",
@ -790,9 +791,10 @@ CheckPAMAuth(Port *port, char *user, char *password)
pam_passwd = NULL; /* Unset pam_passwd */ pam_passwd = NULL; /* Unset pam_passwd */
return STATUS_ERROR; return STATUS_ERROR;
} }
if (retval == PAM_SUCCESS)
retval = pam_authenticate(pamh, 0); retval = pam_authenticate(pamh, 0);
else
if (retval != PAM_SUCCESS)
{ {
snprintf(PQerrormsg, PQERRORMSG_LENGTH, snprintf(PQerrormsg, PQERRORMSG_LENGTH,
"CheckPAMAuth: pam_authenticate failed: '%s'\n", "CheckPAMAuth: pam_authenticate failed: '%s'\n",
@ -802,9 +804,10 @@ CheckPAMAuth(Port *port, char *user, char *password)
pam_passwd = NULL; /* Unset pam_passwd */ pam_passwd = NULL; /* Unset pam_passwd */
return STATUS_ERROR; return STATUS_ERROR;
} }
if (retval == PAM_SUCCESS)
retval = pam_acct_mgmt(pamh, 0); retval = pam_acct_mgmt(pamh, 0);
else
if (retval != PAM_SUCCESS)
{ {
snprintf(PQerrormsg, PQERRORMSG_LENGTH, snprintf(PQerrormsg, PQERRORMSG_LENGTH,
"CheckPAMAuth: pam_acct_mgmt failed: '%s'\n", "CheckPAMAuth: pam_acct_mgmt failed: '%s'\n",
@ -814,24 +817,21 @@ CheckPAMAuth(Port *port, char *user, char *password)
pam_passwd = NULL; /* Unset pam_passwd */ pam_passwd = NULL; /* Unset pam_passwd */
return STATUS_ERROR; return STATUS_ERROR;
} }
if (retval == PAM_SUCCESS)
retval = pam_end(pamh, retval);
if (retval != PAM_SUCCESS)
{ {
retval = pam_end(pamh, retval); snprintf(PQerrormsg, PQERRORMSG_LENGTH,
if (retval != PAM_SUCCESS) "CheckPAMAuth: Failed to release PAM authenticator: '%s'\n",
{ pam_strerror(pamh, retval));
snprintf(PQerrormsg, PQERRORMSG_LENGTH, fputs(PQerrormsg, stderr);
"CheckPAMAuth: Failed to release PAM authenticator: '%s'\n", pqdebug("%s", PQerrormsg);
pam_strerror(pamh, retval));
fputs(PQerrormsg, stderr);
pqdebug("%s", PQerrormsg);
}
pam_passwd = NULL; /* Unset pam_passwd */
return (retval == PAM_SUCCESS ? STATUS_OK : STATUS_ERROR);
} }
else
return STATUS_ERROR; pam_passwd = NULL; /* Unset pam_passwd */
return (retval == PAM_SUCCESS ? STATUS_OK : STATUS_ERROR);
} }
#endif /* USE_PAM */ #endif /* USE_PAM */