From 20a7a7ae90610315a641cf25a5519b56e4b07770 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Thu, 12 Dec 2002 17:06:29 +0000 Subject: [PATCH] Instrument entry and exit points. git-svn-id: svn+ssh://svn.openpam.org/svn/openpam/trunk@187 185d5e19-27fe-0310-9dcf-9bff6b9f3609 --- lib/openpam_borrow_cred.c | 15 ++++++++------- lib/openpam_findenv.c | 10 +++++----- lib/openpam_free_data.c | 10 ++++++---- lib/openpam_get_option.c | 11 ++++++----- lib/openpam_log.c | 8 +++++--- lib/openpam_nullconv.c | 8 +++++--- lib/openpam_restore_cred.c | 11 ++++++----- lib/openpam_set_option.c | 15 ++++++++------- lib/openpam_ttyconv.c | 16 +++++++++------- lib/pam_acct_mgmt.c | 7 +++++-- lib/pam_authenticate.c | 7 ++++--- lib/pam_authenticate_secondary.c | 5 +++-- lib/pam_chauthtok.c | 7 ++++--- lib/pam_close_session.c | 7 ++++--- lib/pam_end.c | 7 ++++--- lib/pam_get_authtok.c | 23 +++++++++++------------ lib/pam_get_data.c | 11 +++++------ lib/pam_get_item.c | 11 ++++++----- lib/pam_get_mapped_authtok.c | 5 +++-- lib/pam_get_mapped_username.c | 5 +++-- lib/pam_get_user.c | 14 +++++++------- lib/pam_getenv.c | 14 ++++++-------- lib/pam_getenvlist.c | 13 ++++++------- lib/pam_open_session.c | 7 ++++--- lib/pam_putenv.c | 17 +++++++++-------- lib/pam_set_data.c | 15 +++++++-------- lib/pam_set_item.c | 12 ++++++------ lib/pam_set_mapped_authtok.c | 5 +++-- lib/pam_set_mapped_username.c | 5 +++-- lib/pam_setcred.c | 7 ++++--- lib/pam_setenv.c | 13 +++++++------ lib/pam_sm_acct_mgmt.c | 5 +++-- lib/pam_sm_authenticate.c | 5 +++-- lib/pam_sm_authenticate_secondary.c | 5 +++-- lib/pam_sm_chauthtok.c | 5 +++-- lib/pam_sm_close_session.c | 5 +++-- lib/pam_sm_get_mapped_authtok.c | 5 +++-- lib/pam_sm_get_mapped_username.c | 5 +++-- lib/pam_sm_open_session.c | 5 +++-- lib/pam_sm_set_mapped_authtok.c | 5 +++-- lib/pam_sm_set_mapped_username.c | 5 +++-- lib/pam_sm_setcred.c | 5 +++-- lib/pam_start.c | 9 +++++---- lib/pam_vprompt.c | 12 +++++++----- 44 files changed, 217 insertions(+), 180 deletions(-) diff --git a/lib/openpam_borrow_cred.c b/lib/openpam_borrow_cred.c index fa0ec58..ef1a850 100644 --- a/lib/openpam_borrow_cred.c +++ b/lib/openpam_borrow_cred.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_borrow_cred.c#2 $ + * $P4: //depot/projects/openpam/lib/openpam_borrow_cred.c#3 $ */ #include @@ -57,30 +57,31 @@ openpam_borrow_cred(pam_handle_t *pamh, struct pam_saved_cred *scred; int r; + ENTER(); if (geteuid() != 0) - return (PAM_PERM_DENIED); + RETURNC(PAM_PERM_DENIED); scred = calloc(1, sizeof *scred); if (scred == NULL) - return (PAM_BUF_ERR); + RETURNC(PAM_BUF_ERR); scred->euid = geteuid(); scred->egid = getegid(); r = getgroups(NGROUPS_MAX, scred->groups); if (r == -1) { free(scred); - return (PAM_SYSTEM_ERR); + RETURNC(PAM_SYSTEM_ERR); } scred->ngroups = r; r = pam_set_data(pamh, PAM_SAVED_CRED, scred, &openpam_free_data); if (r != PAM_SUCCESS) { free(scred); - return (r); + RETURNC(r); } if (initgroups(pwd->pw_name, pwd->pw_gid) == -1 || setegid(pwd->pw_gid) == -1 || seteuid(pwd->pw_uid) == -1) { openpam_restore_cred(pamh); - return (PAM_SYSTEM_ERR); + RETURNC(PAM_SYSTEM_ERR); } - return (PAM_SUCCESS); + RETURNC(PAM_SUCCESS); } /* diff --git a/lib/openpam_findenv.c b/lib/openpam_findenv.c index 06b5730..2dba88a 100644 --- a/lib/openpam_findenv.c +++ b/lib/openpam_findenv.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_findenv.c#8 $ + * $P4: //depot/projects/openpam/lib/openpam_findenv.c#9 $ */ #include @@ -53,14 +53,14 @@ openpam_findenv(pam_handle_t *pamh, { int i; + ENTER(); if (pamh == NULL) - return (-1); - + RETURNI(-1); for (i = 0; i < pamh->env_count; ++i) if (strncmp(pamh->env[i], name, len) == 0 && pamh->env[i][len] == '=') - return (i); - return (-1); + RETURNI(i); + RETURNI(-1); } /* diff --git a/lib/openpam_free_data.c b/lib/openpam_free_data.c index 11935f8..03766b9 100644 --- a/lib/openpam_free_data.c +++ b/lib/openpam_free_data.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_free_data.c#2 $ + * $P4: //depot/projects/openpam/lib/openpam_free_data.c#3 $ */ #include @@ -50,10 +50,12 @@ void openpam_free_data(pam_handle_t *pamh, void *data, int status) { - /* silence compiler warnings */ - pamh = pamh; - status = status; + + ENTER(); + (void)pamh; + (void)status; free(data); + RETURNV(); } /* diff --git a/lib/openpam_get_option.c b/lib/openpam_get_option.c index b70b945..d3993ea 100644 --- a/lib/openpam_get_option.c +++ b/lib/openpam_get_option.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_get_option.c#4 $ + * $P4: //depot/projects/openpam/lib/openpam_get_option.c#5 $ */ #include @@ -57,19 +57,20 @@ openpam_get_option(pam_handle_t *pamh, size_t len; int i; + ENTER(); if (pamh == NULL || pamh->current == NULL || option == NULL) - return (NULL); + RETURNS(NULL); cur = pamh->current; len = strlen(option); for (i = 0; i < cur->optc; ++i) { if (strncmp(cur->optv[i], option, len) == 0) { if (cur->optv[i][len] == '\0') - return (&cur->optv[i][len]); + RETURNS(&cur->optv[i][len]); else if (cur->optv[i][len] == '=') - return (&cur->optv[i][len + 1]); + RETURNS(&cur->optv[i][len + 1]); } } - return (NULL); + RETURNS(NULL); } /* diff --git a/lib/openpam_log.c b/lib/openpam_log.c index f512c62..23a51d5 100644 --- a/lib/openpam_log.c +++ b/lib/openpam_log.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_log.c#16 $ + * $P4: //depot/projects/openpam/lib/openpam_log.c#17 $ */ #include @@ -64,9 +64,10 @@ _openpam_log(int level, const char *func, const char *fmt, ...) case PAM_LOG_DEBUG: #ifndef DEBUG return; -#endif +#else priority = LOG_DEBUG; break; +#endif case PAM_LOG_VERBOSE: priority = LOG_INFO; break; @@ -109,9 +110,10 @@ openpam_log(int level, const char *fmt, ...) case PAM_LOG_DEBUG: #ifndef DEBUG return; -#endif +#else priority = LOG_DEBUG; break; +#endif case PAM_LOG_VERBOSE: priority = LOG_INFO; break; diff --git a/lib/openpam_nullconv.c b/lib/openpam_nullconv.c index 59811e9..94a9936 100644 --- a/lib/openpam_nullconv.c +++ b/lib/openpam_nullconv.c @@ -31,13 +31,14 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_nullconv.c#3 $ + * $P4: //depot/projects/openpam/lib/openpam_nullconv.c#4 $ */ #include #include -#include + +#include "openpam_impl.h" /* * OpenPAM extension @@ -52,11 +53,12 @@ openpam_nullconv(int n, void *data) { + ENTER(); (void)n; (void)msg; (void)resp; (void)data; - return (PAM_CONV_ERR); + RETURNC(PAM_CONV_ERR); } /* diff --git a/lib/openpam_restore_cred.c b/lib/openpam_restore_cred.c index f5acff8..75ebe5e 100644 --- a/lib/openpam_restore_cred.c +++ b/lib/openpam_restore_cred.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_restore_cred.c#2 $ + * $P4: //depot/projects/openpam/lib/openpam_restore_cred.c#3 $ */ #include @@ -56,17 +56,18 @@ openpam_restore_cred(pam_handle_t *pamh) struct pam_saved_cred *scred; int r; + ENTER(); r = pam_get_data(pamh, PAM_SAVED_CRED, (const void **)&scred); if (r != PAM_SUCCESS) - return (r); + RETURNC(r); if (scred == NULL) - return (PAM_SYSTEM_ERR); + RETURNC(PAM_SYSTEM_ERR); if (seteuid(scred->euid) == -1 || setgroups(scred->ngroups, scred->groups) == -1 || setegid(scred->egid) == -1) - return (PAM_SYSTEM_ERR); + RETURNC(PAM_SYSTEM_ERR); pam_set_data(pamh, PAM_SAVED_CRED, NULL, NULL); - return (PAM_SUCCESS); + RETURNC(PAM_SUCCESS); } /* diff --git a/lib/openpam_set_option.c b/lib/openpam_set_option.c index 2862b0b..f65733b 100644 --- a/lib/openpam_set_option.c +++ b/lib/openpam_set_option.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_set_option.c#5 $ + * $P4: //depot/projects/openpam/lib/openpam_set_option.c#6 $ */ #include @@ -61,8 +61,9 @@ openpam_set_option(pam_handle_t *pamh, size_t len; int i; + ENTER(); if (pamh == NULL || pamh->current == NULL || option == NULL) - return (PAM_SYSTEM_ERR); + RETURNC(PAM_SYSTEM_ERR); cur = pamh->current; for (len = 0; option[len] != '\0'; ++len) if (option[len] == '=') @@ -75,21 +76,21 @@ openpam_set_option(pam_handle_t *pamh, if (value == NULL) { /* remove */ if (i == cur->optc) - return (PAM_SUCCESS); + RETURNC(PAM_SUCCESS); for (free(cur->optv[i]); i < cur->optc; ++i) cur->optv[i] = cur->optv[i + 1]; cur->optv[i] = NULL; - return (PAM_SUCCESS); + RETURNC(PAM_SUCCESS); } if ((opt = malloc(len + strlen(value) + 2)) == NULL) - return (PAM_BUF_ERR); + RETURNC(PAM_BUF_ERR); sprintf(opt, "%.*s=%s", (int)len, option, value); if (i == cur->optc) { /* add */ optv = realloc(cur->optv, sizeof(char *) * (cur->optc + 2)); if (optv == NULL) { free(opt); - return (PAM_BUF_ERR); + RETURNC(PAM_BUF_ERR); } optv[i] = opt; optv[i + 1] = NULL; @@ -100,7 +101,7 @@ openpam_set_option(pam_handle_t *pamh, free(cur->optv[i]); cur->optv[i] = opt; } - return (PAM_SUCCESS); + RETURNC(PAM_SUCCESS); } /* diff --git a/lib/openpam_ttyconv.c b/lib/openpam_ttyconv.c index fc40618..d3fdde1 100644 --- a/lib/openpam_ttyconv.c +++ b/lib/openpam_ttyconv.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#13 $ + * $P4: //depot/projects/openpam/lib/openpam_ttyconv.c#14 $ */ #include @@ -46,7 +46,8 @@ #include #include -#include + +#include "openpam_impl.h" int openpam_ttyconv_timeout = 0; static jmp_buf jmpenv; @@ -139,11 +140,12 @@ openpam_ttyconv(int n, { int i; - data = data; + ENTER(); + (void)data; if (n <= 0 || n > PAM_MAX_NUM_MSG) - return (PAM_CONV_ERR); + RETURNC(PAM_CONV_ERR); if ((*resp = calloc(n, sizeof **resp)) == NULL) - return (PAM_BUF_ERR); + RETURNC(PAM_BUF_ERR); for (i = 0; i < n; ++i) { resp[i]->resp_retcode = 0; resp[i]->resp = NULL; @@ -174,13 +176,13 @@ openpam_ttyconv(int n, goto fail; } } - return (PAM_SUCCESS); + RETURNC(PAM_SUCCESS); fail: while (i) free(resp[--i]); free(*resp); *resp = NULL; - return (PAM_CONV_ERR); + RETURNC(PAM_CONV_ERR); } /* diff --git a/lib/pam_acct_mgmt.c b/lib/pam_acct_mgmt.c index 35e24d8..4adfe53 100644 --- a/lib/pam_acct_mgmt.c +++ b/lib/pam_acct_mgmt.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_acct_mgmt.c#9 $ + * $P4: //depot/projects/openpam/lib/pam_acct_mgmt.c#10 $ */ #include @@ -51,8 +51,11 @@ int pam_acct_mgmt(pam_handle_t *pamh, int flags) { + int pam_err; - return (openpam_dispatch(pamh, PAM_SM_ACCT_MGMT, flags)); + ENTER(); + pam_err = openpam_dispatch(pamh, PAM_SM_ACCT_MGMT, flags); + RETURNC(pam_err); } /* diff --git a/lib/pam_authenticate.c b/lib/pam_authenticate.c index 6cc2563..f2884f7 100644 --- a/lib/pam_authenticate.c +++ b/lib/pam_authenticate.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_authenticate.c#11 $ + * $P4: //depot/projects/openpam/lib/pam_authenticate.c#12 $ */ #include @@ -53,11 +53,12 @@ pam_authenticate(pam_handle_t *pamh, { int pam_err; + ENTER(); if (flags & ~(PAM_SILENT|PAM_DISALLOW_NULL_AUTHTOK)) - return (PAM_SYMBOL_ERR); + RETURNC(PAM_SYMBOL_ERR); pam_err = openpam_dispatch(pamh, PAM_SM_AUTHENTICATE, flags); pam_set_item(pamh, PAM_AUTHTOK, NULL); - return (pam_err); + RETURNC(pam_err); } /* diff --git a/lib/pam_authenticate_secondary.c b/lib/pam_authenticate_secondary.c index 363645e..b266f19 100644 --- a/lib/pam_authenticate_secondary.c +++ b/lib/pam_authenticate_secondary.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_authenticate_secondary.c#6 $ + * $P4: //depot/projects/openpam/lib/pam_authenticate_secondary.c#7 $ */ #include @@ -53,7 +53,8 @@ pam_authenticate_secondary(pam_handle_t *pamh, int flags) { - return (PAM_SYSTEM_ERR); + ENTER(); + RETURNC(PAM_SYSTEM_ERR); } /* diff --git a/lib/pam_chauthtok.c b/lib/pam_chauthtok.c index 774eee5..68fa483 100644 --- a/lib/pam_chauthtok.c +++ b/lib/pam_chauthtok.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_chauthtok.c#12 $ + * $P4: //depot/projects/openpam/lib/pam_chauthtok.c#13 $ */ #include @@ -53,8 +53,9 @@ pam_chauthtok(pam_handle_t *pamh, { int pam_err; + ENTER(); if (flags & ~(PAM_SILENT|PAM_CHANGE_EXPIRED_AUTHTOK)) - return (PAM_SYMBOL_ERR); + RETURNC(PAM_SYMBOL_ERR); pam_err = openpam_dispatch(pamh, PAM_SM_CHAUTHTOK, flags | PAM_PRELIM_CHECK); if (pam_err == PAM_SUCCESS) @@ -62,7 +63,7 @@ pam_chauthtok(pam_handle_t *pamh, flags | PAM_UPDATE_AUTHTOK); pam_set_item(pamh, PAM_OLDAUTHTOK, NULL); pam_set_item(pamh, PAM_AUTHTOK, NULL); - return (pam_err); + RETURNC(pam_err); } /* diff --git a/lib/pam_close_session.c b/lib/pam_close_session.c index 00bfb55..9c6276c 100644 --- a/lib/pam_close_session.c +++ b/lib/pam_close_session.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_close_session.c#9 $ + * $P4: //depot/projects/openpam/lib/pam_close_session.c#10 $ */ #include @@ -52,9 +52,10 @@ pam_close_session(pam_handle_t *pamh, int flags) { + ENTER(); if (flags & ~(PAM_SILENT)) - return (PAM_SYMBOL_ERR); - return (openpam_dispatch(pamh, PAM_SM_CLOSE_SESSION, flags)); + RETURNC(PAM_SYMBOL_ERR); + RETURNC(openpam_dispatch(pamh, PAM_SM_CLOSE_SESSION, flags)); } /* diff --git a/lib/pam_end.c b/lib/pam_end.c index 2c2b2a3..5fb1fb6 100644 --- a/lib/pam_end.c +++ b/lib/pam_end.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_end.c#10 $ + * $P4: //depot/projects/openpam/lib/pam_end.c#11 $ */ #include @@ -54,8 +54,9 @@ pam_end(pam_handle_t *pamh, pam_data_t *dp; int i; + ENTER(); if (pamh == NULL) - return (PAM_SYSTEM_ERR); + RETURNC(PAM_SYSTEM_ERR); /* clear module data */ while ((dp = pamh->module_data) != NULL) { @@ -80,7 +81,7 @@ pam_end(pam_handle_t *pamh, free(pamh); - return (PAM_SUCCESS); + RETURNC(PAM_SUCCESS); } /* diff --git a/lib/pam_get_authtok.c b/lib/pam_get_authtok.c index 7d41f91..896f059 100644 --- a/lib/pam_get_authtok.c +++ b/lib/pam_get_authtok.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_get_authtok.c#19 $ + * $P4: //depot/projects/openpam/lib/pam_get_authtok.c#20 $ */ #include @@ -65,9 +65,9 @@ pam_get_authtok(pam_handle_t *pamh, char *resp, *resp2; int pitem, r, style, twice; + ENTER(); if (pamh == NULL || authtok == NULL) - return (PAM_SYSTEM_ERR); - + RETURNC(PAM_SYSTEM_ERR); *authtok = NULL; twice = 0; switch (item) { @@ -86,16 +86,15 @@ pam_get_authtok(pam_handle_t *pamh, twice = 0; break; default: - return (PAM_SYMBOL_ERR); + RETURNC(PAM_SYMBOL_ERR); } - if (openpam_get_option(pamh, "try_first_pass") || openpam_get_option(pamh, "use_first_pass")) { r = pam_get_item(pamh, item, (const void **)authtok); if (r == PAM_SUCCESS && *authtok != NULL) - return (PAM_SUCCESS); + RETURNC(PAM_SUCCESS); else if (openpam_get_option(pamh, "use_first_pass")) - return (r == PAM_SUCCESS ? PAM_AUTH_ERR : r); + RETURNC(r == PAM_SUCCESS ? PAM_AUTH_ERR : r); } if (prompt == NULL) { r = pam_get_item(pamh, pitem, (const void **)&prompt); @@ -106,12 +105,12 @@ pam_get_authtok(pam_handle_t *pamh, PAM_PROMPT_ECHO_ON : PAM_PROMPT_ECHO_OFF; r = pam_prompt(pamh, style, &resp, "%s", prompt); if (r != PAM_SUCCESS) - return (r); + RETURNC(r); if (twice) { r = pam_prompt(pamh, style, &resp2, "Retype %s", prompt); if (r != PAM_SUCCESS) { free(resp); - return (r); + RETURNC(r); } if (strcmp(resp, resp2) != 0) { free(resp); @@ -120,12 +119,12 @@ pam_get_authtok(pam_handle_t *pamh, free(resp2); } if (resp == NULL) - return (PAM_TRY_AGAIN); + RETURNC(PAM_TRY_AGAIN); r = pam_set_item(pamh, item, resp); free(resp); if (r != PAM_SUCCESS) - return (r); - return (pam_get_item(pamh, item, (const void **)authtok)); + RETURNC(r); + RETURNC(pam_get_item(pamh, item, (const void **)authtok)); } /* diff --git a/lib/pam_get_data.c b/lib/pam_get_data.c index 8f1bc52..96038ca 100644 --- a/lib/pam_get_data.c +++ b/lib/pam_get_data.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_get_data.c#8 $ + * $P4: //depot/projects/openpam/lib/pam_get_data.c#9 $ */ #include @@ -54,16 +54,15 @@ pam_get_data(pam_handle_t *pamh, { pam_data_t *dp; + ENTER(); if (pamh == NULL) - return (PAM_SYSTEM_ERR); - + RETURNC(PAM_SYSTEM_ERR); for (dp = pamh->module_data; dp != NULL; dp = dp->next) if (strcmp(dp->name, module_data_name) == 0) { *data = dp->data; - return (PAM_SUCCESS); + RETURNC(PAM_SUCCESS); } - - return (PAM_NO_MODULE_DATA); + RETURNC(PAM_NO_MODULE_DATA); } /* diff --git a/lib/pam_get_item.c b/lib/pam_get_item.c index da2970e..f3e8c9b 100644 --- a/lib/pam_get_item.c +++ b/lib/pam_get_item.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_get_item.c#13 $ + * $P4: //depot/projects/openpam/lib/pam_get_item.c#14 $ */ #include @@ -52,9 +52,10 @@ pam_get_item(pam_handle_t *pamh, int item_type, const void **item) { - if (pamh == NULL) - return (PAM_SYSTEM_ERR); + ENTER(); + if (pamh == NULL) + RETURNC(PAM_SYSTEM_ERR); switch (item_type) { case PAM_SERVICE: case PAM_USER: @@ -69,9 +70,9 @@ pam_get_item(pam_handle_t *pamh, case PAM_OLDAUTHTOK_PROMPT: case PAM_REPOSITORY: *item = pamh->item[item_type]; - return (PAM_SUCCESS); + RETURNC(PAM_SUCCESS); default: - return (PAM_SYMBOL_ERR); + RETURNC(PAM_SYMBOL_ERR); } } diff --git a/lib/pam_get_mapped_authtok.c b/lib/pam_get_mapped_authtok.c index 0b22d8f..e42954f 100644 --- a/lib/pam_get_mapped_authtok.c +++ b/lib/pam_get_mapped_authtok.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_get_mapped_authtok.c#6 $ + * $P4: //depot/projects/openpam/lib/pam_get_mapped_authtok.c#7 $ */ #include @@ -52,7 +52,8 @@ pam_get_mapped_authtok(pam_handle_t *pamh, unsigned char **target_module_authtok) { - return (PAM_SYSTEM_ERR); + ENTER(); + RETURNC(PAM_SYSTEM_ERR); } /* diff --git a/lib/pam_get_mapped_username.c b/lib/pam_get_mapped_username.c index 644ada2..dc63aa0 100644 --- a/lib/pam_get_mapped_username.c +++ b/lib/pam_get_mapped_username.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_get_mapped_username.c#6 $ + * $P4: //depot/projects/openpam/lib/pam_get_mapped_username.c#7 $ */ #include @@ -53,7 +53,8 @@ pam_get_mapped_username(pam_handle_t *pamh, char **target_module_username) { - return (PAM_SYSTEM_ERR); + ENTER(); + RETURNC(PAM_SYSTEM_ERR); } /* diff --git a/lib/pam_get_user.c b/lib/pam_get_user.c index f0dc282..f35a887 100644 --- a/lib/pam_get_user.c +++ b/lib/pam_get_user.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_get_user.c#12 $ + * $P4: //depot/projects/openpam/lib/pam_get_user.c#13 $ */ #include @@ -60,12 +60,12 @@ pam_get_user(pam_handle_t *pamh, char *resp; int r; + ENTER(); if (pamh == NULL || user == NULL) - return (PAM_SYSTEM_ERR); - + RETURNC(PAM_SYSTEM_ERR); r = pam_get_item(pamh, PAM_USER, (const void **)user); if (r == PAM_SUCCESS) - return (PAM_SUCCESS); + RETURNC(PAM_SUCCESS); if (prompt == NULL) { r = pam_get_item(pamh, PAM_USER_PROMPT, (const void **)&prompt); if (r != PAM_SUCCESS || prompt == NULL) @@ -73,12 +73,12 @@ pam_get_user(pam_handle_t *pamh, } r = pam_prompt(pamh, PAM_PROMPT_ECHO_ON, &resp, "%s", prompt); if (r != PAM_SUCCESS) - return (r); + RETURNC(r); r = pam_set_item(pamh, PAM_USER, resp); free(resp); if (r != PAM_SUCCESS) - return (r); - return (pam_get_item(pamh, PAM_USER, (const void **)user)); + RETURNC(r); + RETURNC(pam_get_item(pamh, PAM_USER, (const void **)user)); } /* diff --git a/lib/pam_getenv.c b/lib/pam_getenv.c index e8f3635..1b4fd15 100644 --- a/lib/pam_getenv.c +++ b/lib/pam_getenv.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_getenv.c#7 $ + * $P4: //depot/projects/openpam/lib/pam_getenv.c#8 $ */ #include @@ -54,16 +54,14 @@ pam_getenv(pam_handle_t *pamh, { int i; + ENTER(); if (pamh == NULL) - return (NULL); - - /* sanity checks */ + RETURNC(NULL); if (name == NULL || strchr(name, '=') != NULL) - return (NULL); - + RETURNC(NULL); if ((i = openpam_findenv(pamh, name, strlen(name))) == -1) - return (NULL); - return (strdup(pamh->env[i])); + RETURNC(NULL); + RETURNC(strdup(pamh->env[i])); } /** diff --git a/lib/pam_getenvlist.c b/lib/pam_getenvlist.c index 37ec622..7c63bce 100644 --- a/lib/pam_getenvlist.c +++ b/lib/pam_getenvlist.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_getenvlist.c#9 $ + * $P4: //depot/projects/openpam/lib/pam_getenvlist.c#10 $ */ #include @@ -54,14 +54,14 @@ pam_getenvlist(pam_handle_t *pamh) char **envlist; int i; + ENTER(); if (pamh == NULL) - return (NULL); - + RETURNP(NULL); envlist = malloc(sizeof(char *) * (pamh->env_count + 1)); if (envlist == NULL) { openpam_log(PAM_LOG_ERROR, "%s", pam_strerror(pamh, PAM_BUF_ERR)); - return (NULL); + RETURNP(NULL); } for (i = 0; i < pamh->env_count; ++i) { if ((envlist[i] = strdup(pamh->env[i])) == NULL) { @@ -70,12 +70,11 @@ pam_getenvlist(pam_handle_t *pamh) free(envlist); openpam_log(PAM_LOG_ERROR, "%s", pam_strerror(pamh, PAM_BUF_ERR)); - return (NULL); + RETURNP(NULL); } } envlist[i] = NULL; - openpam_log(PAM_LOG_DEBUG, "returning %d variables\n", pamh->env_count); - return (envlist); + RETURNP(envlist); } /** diff --git a/lib/pam_open_session.c b/lib/pam_open_session.c index afae0dc..508ad5c 100644 --- a/lib/pam_open_session.c +++ b/lib/pam_open_session.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_open_session.c#9 $ + * $P4: //depot/projects/openpam/lib/pam_open_session.c#10 $ */ #include @@ -52,9 +52,10 @@ pam_open_session(pam_handle_t *pamh, int flags) { + ENTER(); if (flags & ~(PAM_SILENT)) - return (PAM_SYMBOL_ERR); - return (openpam_dispatch(pamh, PAM_SM_OPEN_SESSION, flags)); + RETURNC(PAM_SYMBOL_ERR); + RETURNC(openpam_dispatch(pamh, PAM_SM_OPEN_SESSION, flags)); } /* diff --git a/lib/pam_putenv.c b/lib/pam_putenv.c index 9c7df0e..d3c220f 100644 --- a/lib/pam_putenv.c +++ b/lib/pam_putenv.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_putenv.c#8 $ + * $P4: //depot/projects/openpam/lib/pam_putenv.c#9 $ */ #include @@ -55,20 +55,21 @@ pam_putenv(pam_handle_t *pamh, char **env, *p; int i; + ENTER(); if (pamh == NULL) - return (PAM_SYSTEM_ERR); + RETURNC(PAM_SYSTEM_ERR); /* sanity checks */ if (namevalue == NULL || (p = strchr(namevalue, '=')) == NULL) - return (PAM_SYSTEM_ERR); + RETURNC(PAM_SYSTEM_ERR); /* see if the variable is already in the environment */ if ((i = openpam_findenv(pamh, namevalue, p - namevalue)) != -1) { if ((p = strdup(namevalue)) == NULL) - return (PAM_BUF_ERR); + RETURNC(PAM_BUF_ERR); free(pamh->env[i]); pamh->env[i] = p; - return (PAM_SUCCESS); + RETURNC(PAM_SUCCESS); } /* grow the environment list if necessary */ @@ -76,16 +77,16 @@ pam_putenv(pam_handle_t *pamh, env = realloc(pamh->env, sizeof(char *) * (pamh->env_size * 2 + 1)); if (env == NULL) - return (PAM_BUF_ERR); + RETURNC(PAM_BUF_ERR); pamh->env = env; pamh->env_size = pamh->env_size * 2 + 1; } /* add the variable at the end */ if ((pamh->env[pamh->env_count] = strdup(namevalue)) == NULL) - return (PAM_BUF_ERR); + RETURNC(PAM_BUF_ERR); ++pamh->env_count; - return (PAM_SUCCESS); + RETURNC(PAM_SUCCESS); } /* diff --git a/lib/pam_set_data.c b/lib/pam_set_data.c index 371e8ef..c944e0f 100644 --- a/lib/pam_set_data.c +++ b/lib/pam_set_data.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_set_data.c#10 $ + * $P4: //depot/projects/openpam/lib/pam_set_data.c#11 $ */ #include @@ -58,30 +58,29 @@ pam_set_data(pam_handle_t *pamh, { pam_data_t *dp; + ENTER(); if (pamh == NULL) - return (PAM_SYSTEM_ERR); - + RETURNC(PAM_SYSTEM_ERR); for (dp = pamh->module_data; dp != NULL; dp = dp->next) { if (strcmp(dp->name, module_data_name) == 0) { if (dp->cleanup) (dp->cleanup)(pamh, dp->data, PAM_SUCCESS); dp->data = data; dp->cleanup = cleanup; - return (PAM_SUCCESS); + RETURNC(PAM_SUCCESS); } } - if ((dp = malloc(sizeof *dp)) == NULL) - return (PAM_BUF_ERR); + RETURNC(PAM_BUF_ERR); if ((dp->name = strdup(module_data_name)) == NULL) { free(dp); - return (PAM_BUF_ERR); + RETURNC(PAM_BUF_ERR); } dp->data = data; dp->cleanup = cleanup; dp->next = pamh->module_data; pamh->module_data = dp; - return (PAM_SUCCESS); + RETURNC(PAM_SUCCESS); } /* diff --git a/lib/pam_set_item.c b/lib/pam_set_item.c index b34bc78..42653b1 100644 --- a/lib/pam_set_item.c +++ b/lib/pam_set_item.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_set_item.c#15 $ + * $P4: //depot/projects/openpam/lib/pam_set_item.c#16 $ */ #include @@ -58,9 +58,9 @@ pam_set_item(pam_handle_t *pamh, void **slot, *tmp; size_t nsize, osize; + ENTER(); if (pamh == NULL) - return (PAM_SYSTEM_ERR); - + RETURNC(PAM_SYSTEM_ERR); slot = &pamh->item[item_type]; switch (item_type) { case PAM_SERVICE: @@ -85,7 +85,7 @@ pam_set_item(pam_handle_t *pamh, osize = nsize = sizeof(struct pam_conv); break; default: - return (PAM_SYMBOL_ERR); + RETURNC(PAM_SYMBOL_ERR); } if (*slot != NULL) { memset(*slot, 0xd0, osize); @@ -93,13 +93,13 @@ pam_set_item(pam_handle_t *pamh, } if (item != NULL) { if ((tmp = malloc(nsize)) == NULL) - return (PAM_BUF_ERR); + RETURNC(PAM_BUF_ERR); memcpy(tmp, item, nsize); } else { tmp = NULL; } *slot = tmp; - return (PAM_SUCCESS); + RETURNC(PAM_SUCCESS); } /* diff --git a/lib/pam_set_mapped_authtok.c b/lib/pam_set_mapped_authtok.c index ec18579..5ea3aa0 100644 --- a/lib/pam_set_mapped_authtok.c +++ b/lib/pam_set_mapped_authtok.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_set_mapped_authtok.c#6 $ + * $P4: //depot/projects/openpam/lib/pam_set_mapped_authtok.c#7 $ */ #include @@ -52,7 +52,8 @@ pam_set_mapped_authtok(pam_handle_t *pamh, const char *target_authn_domain) { - return (PAM_SYSTEM_ERR); + ENTER(); + RETURNC(PAM_SYSTEM_ERR); } /* diff --git a/lib/pam_set_mapped_username.c b/lib/pam_set_mapped_username.c index eedefe4..51394ac 100644 --- a/lib/pam_set_mapped_username.c +++ b/lib/pam_set_mapped_username.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_set_mapped_username.c#6 $ + * $P4: //depot/projects/openpam/lib/pam_set_mapped_username.c#7 $ */ #include @@ -53,7 +53,8 @@ pam_set_mapped_username(pam_handle_t *pamh, char *target_authn_domain) { - return (PAM_SYSTEM_ERR); + ENTER(); + RETURNC(PAM_SYSTEM_ERR); } /* diff --git a/lib/pam_setcred.c b/lib/pam_setcred.c index 1621baa..1684880 100644 --- a/lib/pam_setcred.c +++ b/lib/pam_setcred.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_setcred.c#10 $ + * $P4: //depot/projects/openpam/lib/pam_setcred.c#11 $ */ #include @@ -52,11 +52,12 @@ pam_setcred(pam_handle_t *pamh, int flags) { + ENTER(); if (flags & ~(PAM_SILENT|PAM_ESTABLISH_CRED|PAM_DELETE_CRED| PAM_REINITIALIZE_CRED|PAM_REFRESH_CRED)) - return (PAM_SYMBOL_ERR); + RETURNC(PAM_SYMBOL_ERR); /* XXX enforce exclusivity */ - return (openpam_dispatch(pamh, PAM_SM_SETCRED, flags)); + RETURNC(openpam_dispatch(pamh, PAM_SM_SETCRED, flags)); } /* diff --git a/lib/pam_setenv.c b/lib/pam_setenv.c index d1c865f..f516a1b 100644 --- a/lib/pam_setenv.c +++ b/lib/pam_setenv.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_setenv.c#7 $ + * $P4: //depot/projects/openpam/lib/pam_setenv.c#8 $ */ #include @@ -58,24 +58,25 @@ pam_setenv(pam_handle_t *pamh, char *env; int r; + ENTER(); if (pamh == NULL) - return (PAM_SYSTEM_ERR); + RETURNC(PAM_SYSTEM_ERR); /* sanity checks */ if (name == NULL || value == NULL || strchr(name, '=') != NULL) - return (PAM_SYSTEM_ERR); + RETURNC(PAM_SYSTEM_ERR); /* is it already there? */ if (!overwrite && openpam_findenv(pamh, name, strlen(name)) != -1) - return (PAM_SUCCESS); + RETURNC(PAM_SUCCESS); /* set it... */ if ((env = malloc(strlen(name) + strlen(value) + 2)) == NULL) - return (PAM_BUF_ERR); + RETURNC(PAM_BUF_ERR); sprintf(env, "%s=%s", name, value); r = pam_putenv(pamh, env); free(env); - return (r); + RETURNC(r); } /* diff --git a/lib/pam_sm_acct_mgmt.c b/lib/pam_sm_acct_mgmt.c index e70ab2c..8351fca 100644 --- a/lib/pam_sm_acct_mgmt.c +++ b/lib/pam_sm_acct_mgmt.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_sm_acct_mgmt.c#4 $ + * $P4: //depot/projects/openpam/lib/pam_sm_acct_mgmt.c#5 $ */ #include @@ -53,7 +53,8 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, const char **argv) { - return (PAM_SYSTEM_ERR); + ENTER(); + RETURNC(PAM_SYSTEM_ERR); } /* diff --git a/lib/pam_sm_authenticate.c b/lib/pam_sm_authenticate.c index 9d9c55d..50cceef 100644 --- a/lib/pam_sm_authenticate.c +++ b/lib/pam_sm_authenticate.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_sm_authenticate.c#4 $ + * $P4: //depot/projects/openpam/lib/pam_sm_authenticate.c#5 $ */ #include @@ -53,7 +53,8 @@ pam_sm_authenticate(pam_handle_t *pamh, const char **argv) { - return (PAM_SYSTEM_ERR); + ENTER(); + RETURNC(PAM_SYSTEM_ERR); } /* diff --git a/lib/pam_sm_authenticate_secondary.c b/lib/pam_sm_authenticate_secondary.c index e694de2..b25e028 100644 --- a/lib/pam_sm_authenticate_secondary.c +++ b/lib/pam_sm_authenticate_secondary.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_sm_authenticate_secondary.c#4 $ + * $P4: //depot/projects/openpam/lib/pam_sm_authenticate_secondary.c#5 $ */ #include @@ -58,7 +58,8 @@ pam_sm_authenticate_secondary(pam_handle_t *pamh, const char **argv) { - return (PAM_SYSTEM_ERR); + ENTER(); + RETURNC(PAM_SYSTEM_ERR); } /* diff --git a/lib/pam_sm_chauthtok.c b/lib/pam_sm_chauthtok.c index 34d652f..b4ede72 100644 --- a/lib/pam_sm_chauthtok.c +++ b/lib/pam_sm_chauthtok.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_sm_chauthtok.c#5 $ + * $P4: //depot/projects/openpam/lib/pam_sm_chauthtok.c#6 $ */ #include @@ -53,7 +53,8 @@ pam_sm_chauthtok(pam_handle_t *pamh, const char **argv) { - return (PAM_SYSTEM_ERR); + ENTER(); + RETURNC(PAM_SYSTEM_ERR); } /* diff --git a/lib/pam_sm_close_session.c b/lib/pam_sm_close_session.c index 1644ec8..e27274f 100644 --- a/lib/pam_sm_close_session.c +++ b/lib/pam_sm_close_session.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_sm_close_session.c#4 $ + * $P4: //depot/projects/openpam/lib/pam_sm_close_session.c#5 $ */ #include @@ -53,7 +53,8 @@ pam_sm_close_session(pam_handle_t *pamh, const char **argv) { - return (PAM_SYSTEM_ERR); + ENTER(); + RETURNC(PAM_SYSTEM_ERR); } /* diff --git a/lib/pam_sm_get_mapped_authtok.c b/lib/pam_sm_get_mapped_authtok.c index c4ae55f..2f35e54 100644 --- a/lib/pam_sm_get_mapped_authtok.c +++ b/lib/pam_sm_get_mapped_authtok.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_sm_get_mapped_authtok.c#4 $ + * $P4: //depot/projects/openpam/lib/pam_sm_get_mapped_authtok.c#5 $ */ #include @@ -57,7 +57,8 @@ pam_sm_get_mapped_authtok(pam_handle_t *pamh, char *argv) { - return (PAM_SYSTEM_ERR); + ENTER(); + RETURNC(PAM_SYSTEM_ERR); } /* diff --git a/lib/pam_sm_get_mapped_username.c b/lib/pam_sm_get_mapped_username.c index 6c3f86e..1956acf 100644 --- a/lib/pam_sm_get_mapped_username.c +++ b/lib/pam_sm_get_mapped_username.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_sm_get_mapped_username.c#4 $ + * $P4: //depot/projects/openpam/lib/pam_sm_get_mapped_username.c#5 $ */ #include @@ -58,7 +58,8 @@ pam_sm_get_mapped_username(pam_handle_t *pamh, const char **argv) { - return (PAM_SYSTEM_ERR); + ENTER(); + RETURNC(PAM_SYSTEM_ERR); } /* diff --git a/lib/pam_sm_open_session.c b/lib/pam_sm_open_session.c index d1092dc..161344f 100644 --- a/lib/pam_sm_open_session.c +++ b/lib/pam_sm_open_session.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_sm_open_session.c#4 $ + * $P4: //depot/projects/openpam/lib/pam_sm_open_session.c#5 $ */ #include @@ -53,7 +53,8 @@ pam_sm_open_session(pam_handle_t *pamh, const char **argv) { - return (PAM_SYSTEM_ERR); + ENTER(); + RETURNC(PAM_SYSTEM_ERR); } /* diff --git a/lib/pam_sm_set_mapped_authtok.c b/lib/pam_sm_set_mapped_authtok.c index cb4f113..a875e1a 100644 --- a/lib/pam_sm_set_mapped_authtok.c +++ b/lib/pam_sm_set_mapped_authtok.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_sm_set_mapped_authtok.c#4 $ + * $P4: //depot/projects/openpam/lib/pam_sm_set_mapped_authtok.c#5 $ */ #include @@ -57,7 +57,8 @@ pam_sm_set_mapped_authtok(pam_handle_t *pamh, const char *argv) { - return (PAM_SYSTEM_ERR); + ENTER(); + RETURNC(PAM_SYSTEM_ERR); } /* diff --git a/lib/pam_sm_set_mapped_username.c b/lib/pam_sm_set_mapped_username.c index b8b1f0a..8c0774d 100644 --- a/lib/pam_sm_set_mapped_username.c +++ b/lib/pam_sm_set_mapped_username.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_sm_set_mapped_username.c#4 $ + * $P4: //depot/projects/openpam/lib/pam_sm_set_mapped_username.c#5 $ */ #include @@ -55,7 +55,8 @@ pam_sm_set_mapped_username(pam_handle_t *pamh, const char **argv) { - return (PAM_SYSTEM_ERR); + ENTER(); + RETURNC(PAM_SYSTEM_ERR); } /* diff --git a/lib/pam_sm_setcred.c b/lib/pam_sm_setcred.c index b4940ad..90e571c 100644 --- a/lib/pam_sm_setcred.c +++ b/lib/pam_sm_setcred.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_sm_setcred.c#4 $ + * $P4: //depot/projects/openpam/lib/pam_sm_setcred.c#5 $ */ #include @@ -53,7 +53,8 @@ pam_sm_setcred(pam_handle_t *pamh, const char **argv) { - return (PAM_SYSTEM_ERR); + ENTER(); + RETURNC(PAM_SYSTEM_ERR); } diff --git a/lib/pam_start.c b/lib/pam_start.c index 1711759..c43b192 100644 --- a/lib/pam_start.c +++ b/lib/pam_start.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_start.c#16 $ + * $P4: //depot/projects/openpam/lib/pam_start.c#17 $ */ #include @@ -56,8 +56,9 @@ pam_start(const char *service, struct pam_handle *ph; int r; + ENTER(); if ((ph = calloc(1, sizeof *ph)) == NULL) - return (PAM_BUF_ERR); + RETURNC(PAM_BUF_ERR); if ((r = pam_set_item(ph, PAM_SERVICE, service)) != PAM_SUCCESS) goto fail; if ((r = pam_set_item(ph, PAM_USER, user)) != PAM_SUCCESS) @@ -71,11 +72,11 @@ pam_start(const char *service, *pamh = ph; openpam_log(PAM_LOG_DEBUG, "pam_start(\"%s\") succeeded", service); - return (PAM_SUCCESS); + RETURNC(PAM_SUCCESS); fail: pam_end(ph, r); - return (r); + RETURNC(r); } /* diff --git a/lib/pam_vprompt.c b/lib/pam_vprompt.c index d92768c..15fdc81 100644 --- a/lib/pam_vprompt.c +++ b/lib/pam_vprompt.c @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/pam_vprompt.c#7 $ + * $P4: //depot/projects/openpam/lib/pam_vprompt.c#8 $ */ #include @@ -39,7 +39,8 @@ #include #include -#include + +#include "openpam_impl.h" /* * OpenPAM extension @@ -61,12 +62,13 @@ pam_vprompt(pam_handle_t *pamh, struct pam_conv *conv; int r; + ENTER(); r = pam_get_item(pamh, PAM_CONV, (const void **)&conv); if (r != PAM_SUCCESS) - return (r); + RETURNC(r); if (conv == NULL) { openpam_log(PAM_LOG_ERROR, "no conversation function"); - return (PAM_SYSTEM_ERR); + RETURNC(PAM_SYSTEM_ERR); } vsnprintf(msgbuf, PAM_MAX_MSG_SIZE, fmt, ap); msg.msg_style = style; @@ -76,7 +78,7 @@ pam_vprompt(pam_handle_t *pamh, r = (conv->conv)(1, &msgp, &rsp, conv->appdata_ptr); *resp = rsp == NULL ? NULL : rsp->resp; free(rsp); - return (r); + RETURNC(r); } /*