OpenPAM/OpenPAM
OpenPAM
/
OpenPAM
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Constify. 

Sponsored by:	DARPA, NAI Labs


git-svn-id: svn+ssh://svn.openpam.org/svn/openpam/trunk@38 185d5e19-27fe-0310-9dcf-9bff6b9f3609
This commit is contained in:
Dag-Erling Smørgrav 2002-02-06 16:03:39 +00:00
parent d5943da7f6
commit aada9aaafe
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/security/pam_appl.h
View File

@ -72,11 +72,11 @@ pam_get_data(pam_handle_t *_pamh,
int int
pam_get_item(pam_handle_t *_pamh, pam_get_item(pam_handle_t *_pamh,
int _item_type, int _item_type,
void **_item); const void **_item);
int int
pam_get_user(pam_handle_t *_pamh, pam_get_user(pam_handle_t *_pamh,
char **_user, const char **_user,
const char *_prompt); const char *_prompt);
char * char *
@ -131,7 +131,7 @@ pam_error(pam_handle_t *_pamh,
int int
pam_get_authtok(pam_handle_t *_pamh, pam_get_authtok(pam_handle_t *_pamh,
char **_authtok, const char **_authtok,
const char *_prompt); const char *_prompt);
int int

13
lib/pam_get_authtok.c
View File

@ -48,25 +48,26 @@
int int
pam_get_authtok(pam_handle_t *pamh, pam_get_authtok(pam_handle_t *pamh,
char **authtok, const char **authtok,
const char *prompt) const char *prompt)
{ {
char *p; char *p, *resp;
int r; int r;
if (pamh == NULL || authtok == NULL) if (pamh == NULL || authtok == NULL)
return (PAM_SYSTEM_ERR); return (PAM_SYSTEM_ERR);
r = pam_get_item(pamh, PAM_AUTHTOK, (void **)authtok); r = pam_get_item(pamh, PAM_AUTHTOK, (const void **)authtok);
if (r == PAM_SUCCESS) if (r == PAM_SUCCESS)
return (PAM_SUCCESS); return (PAM_SUCCESS);
if (prompt == NULL) { if (prompt == NULL) {
if (pam_get_item(pamh, PAM_AUTHTOK_PROMPT, (void **)&p) != if (pam_get_item(pamh, PAM_AUTHTOK_PROMPT,
PAM_SUCCESS || p == NULL) (const void **)&p) != PAM_SUCCESS || p == NULL)
prompt = "Password:"; prompt = "Password:";
} }
r = pam_prompt(pamh, authtok, 0, "%s", prompt ? prompt : p); r = pam_prompt(pamh, &resp, 0, "%s", prompt ? prompt : p);
if (r != PAM_SUCCESS) if (r != PAM_SUCCESS)
return (r); return (r);
*authtok = resp;
return (pam_set_item(pamh, PAM_AUTHTOK, *authtok)); return (pam_set_item(pamh, PAM_AUTHTOK, *authtok));
} }

2
lib/pam_get_item.c
View File

@ -50,7 +50,7 @@
int int
pam_get_item(pam_handle_t *pamh, pam_get_item(pam_handle_t *pamh,
int item_type, int item_type,
void **item) const void **item)
{ {
if (pamh == NULL) if (pamh == NULL)
return (PAM_SYSTEM_ERR); return (PAM_SYSTEM_ERR);