isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PAM prompt code was wrong, looks like we have to kludge it after all.

Browse Source
This commit is contained in:
Todd C. Miller
1999-07-05 20:53:54 +00:00
parent 3bdb3e41ca
commit 1b023dc9dd
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
auth.c
View File

@@ -601,11 +601,10 @@ pam_attempt_auth()
set_perms(PERM_ROOT, 0); set_perms(PERM_ROOT, 0);
/* Initial PAM setup + use our default prompt */ /* Initial PAM setup */
pam_conv.conv = sudo_conv; pam_conv.conv = sudo_conv;
pam_conv.appdata_ptr = &null_pw; pam_conv.appdata_ptr = &null_pw;
if (pam_start("sudo", user_name, &pam_conv, &pamh) != PAM_SUCCESS || if (pam_start("sudo", user_name, &pam_conv, &pamh) != PAM_SUCCESS) {
pam_set_item(pamh, PAM_USER_PROMPT, (void *) prompt) != PAM_SUCCESS) {
set_perms(PERM_USER, 0); set_perms(PERM_USER, 0);
log_error(BAD_AUTH_INIT); log_error(BAD_AUTH_INIT);
inform_user(BAD_AUTH_INIT); inform_user(BAD_AUTH_INIT);
@@ -656,6 +655,7 @@ sudo_conv(num_msg, msg, response, appdata_ptr)
{ {
struct pam_response *pr; struct pam_response *pr;
struct pam_message *pm; struct pam_message *pm;
char *p = prompt;
int echo = 0; int echo = 0;
if ((*response = malloc(num_msg * sizeof(struct pam_response))) == NULL) if ((*response = malloc(num_msg * sizeof(struct pam_response))) == NULL)
@@ -667,7 +667,10 @@ sudo_conv(num_msg, msg, response, appdata_ptr)
case PAM_PROMPT_ECHO_ON: case PAM_PROMPT_ECHO_ON:
echo = 1; echo = 1;
case PAM_PROMPT_ECHO_OFF: case PAM_PROMPT_ECHO_OFF:
pr->resp = estrdup((char *) GETPASS(pm->msg, /* Override default prompt for unix auth */
if (strcmp(p, "Password: ") && strcmp(p, "Password:"))
p = (char *) pm->msg;
pr->resp = estrdup((char *) GETPASS(p,
PASSWORD_TIMEOUT * 60, !echo)); PASSWORD_TIMEOUT * 60, !echo));
/* Solaris PAM does not pass through appdata_ptr! */ /* Solaris PAM does not pass through appdata_ptr! */
if (pr->resp[0] == '\0' && appdata_ptr != NULL) if (pr->resp[0] == '\0' && appdata_ptr != NULL)