Changeset 24 in openpam
- Timestamp:
- Feb 4, 2002, 2:53:46 PM (19 years ago)
- Location:
- trunk/lib
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/lib/pam_get_authtok.c
r16 r24 52 52 const char *prompt) 53 53 { 54 char *p; 54 55 int r; 55 56 … … 60 61 if (r == PAM_SUCCESS) 61 62 return (PAM_SUCCESS); 62 if (prompt == NULL) 63 pam_get_item(pamh, PAM_AUTHTOK_PROMPT, (void **)&prompt); 64 if (prompt == NULL) 65 prompt = "Password:"; 66 if ((r = pam_prompt(pamh, authtok, 0, "%s", prompt)) != PAM_SUCCESS) 63 if (prompt == NULL) { 64 if (pam_get_item(pamh, PAM_AUTHTOK_PROMPT, (void **)&p) != 65 PAM_SUCCESS || p == NULL) 66 prompt = "Password:"; 67 } 68 r = pam_prompt(pamh, authtok, 0, "%s", prompt ? prompt : p); 69 if (r != PAM_SUCCESS) 67 70 return (r); 68 71 return (pam_set_item(pamh, PAM_AUTHTOK, *authtok)); -
trunk/lib/pam_get_user.c
r16 r24 53 53 const char *prompt) 54 54 { 55 char *p; 55 56 int r; 56 57 … … 58 59 return (PAM_SYSTEM_ERR); 59 60 60 if ((r = pam_get_item(pamh, PAM_USER, (void **)user)) == PAM_SUCCESS) 61 r = pam_get_item(pamh, PAM_USER, (void **)user); 62 if (r == PAM_SUCCESS) 61 63 return (PAM_SUCCESS); 62 if (prompt == NULL) 63 pam_get_item(pamh, PAM_USER_PROMPT, (void **)&prompt); 64 if (prompt == NULL) 65 prompt = "Login: "; 66 if ((r = pam_prompt(pamh, user, 0, "%s", prompt)) != PAM_SUCCESS) 64 if (prompt == NULL) { 65 if (pam_get_item(pamh, PAM_USER_PROMPT, (void **)&p) != 66 PAM_SUCCESS || p == NULL) 67 prompt = "Login: "; 68 } 69 r = pam_prompt(pamh, user, 0, "%s", prompt ? prompt : p); 70 if (r != PAM_SUCCESS) 67 71 return (r); 68 72 return (pam_set_item(pamh, PAM_USER, *user));
Note: See TracChangeset
for help on using the changeset viewer.