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

In struct sudo_auth, turn need_root and configured into flags and

Browse Source 
add a flag to specify an auth method is running alone (the only
one).  Pass auth methods their sudo_auth pointer, not the data
pointer.  This allows us to get at the flags and tell if we are the
only auth method.  That, in turn, allows the method to be able to
decide what should/should not be a fatal error.  Currently only
rfc1938 uses it this way, which allows us to kill the OTP_ONLY
define and te hackery that went with it.  With access to the
sudo_auth struct, methods can also get at a string holding their
cannonical name (useful in error messages).
This commit is contained in:
Todd C. Miller
1999-08-14 15:36:47 +00:00
parent 3a8b0be635
commit d40947c0b0
15 changed files with 215 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
auth/pam.c
View File

@@ -61,14 +61,14 @@ static const char rcsid[] = "$Sudo$";
#endif /* lint */
static int sudo_conv __P((int, PAM_CONST struct pam_message **,
struct pam_response **, void *));
struct pam_response **, VOID *));
static char *def_prompt;
int
pam_init(pw, promptp, data)
pam_init(pw, promptp, auth)
struct passwd *pw;
char **promptp;
void **data;
sudo_auth *auth;
{
static struct pam_conv pam_conv;
pam_handle_t *pamh;
@@ -80,17 +80,17 @@ pam_init(pw, promptp, data)
"unable to initialize PAM");
return(AUTH_FATAL);
}
*data = pamh;
auth->data = (VOID *) pamh;
return(AUTH_SUCCESS);
}
int
pam_verify(pw, prompt, data)
pam_verify(pw, prompt, auth)
struct passwd *pw;
char *prompt;
void **data;
sudo_auth *auth;
{
pam_handle_t *pamh = (pam_handle_t *)(*data);
pam_handle_t *pamh = (pam_handle_t *) auth->data;
def_prompt = prompt; /* for sudo_conv */
@@ -102,22 +102,19 @@ pam_verify(pw, prompt, data)
}
int
pam_cleanup(pw, status, data)
pam_cleanup(pw, auth)
struct passwd *pw;
int status;
void **data;
sudo_auth *auth;
{
pam_handle_t *pamh = (pam_handle_t *)(*data);
pam_handle_t *pamh = (pam_handle_t *) auth->data;
if (pam_end(pamh, (status == AUTH_SUCCESS)) == PAM_SUCCESS)
if (pam_end(pamh, (auth->status == AUTH_SUCCESS)) == PAM_SUCCESS)
return(AUTH_SUCCESS);
else
return(AUTH_FAILURE);
}
/*
* sudo_conv()
*
* ``Conversation function'' for PAM.
*/
static int
@@ -125,7 +122,7 @@ sudo_conv(num_msg, msg, response, appdata_ptr)
int num_msg;
PAM_CONST struct pam_message **msg;
struct pam_response **response;
void *appdata_ptr;
VOID *appdata_ptr;
{
struct pam_response *pr;
struct pam_message *pm;