Date: Thu, 12 Dec 2002 08:07:21 -0800 (PST) From: Dag-Erling Smorgrav <des@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 22203 for review Message-ID: <200212121607.gBCG7LP2000567@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=22203 Change 22203 by des@des.at.des.thinksec.com on 2002/12/12 08:06:29 Instrument entry and exit points. Affected files ... .. //depot/projects/openpam/lib/openpam_borrow_cred.c#3 edit .. //depot/projects/openpam/lib/openpam_findenv.c#9 edit .. //depot/projects/openpam/lib/openpam_free_data.c#3 edit .. //depot/projects/openpam/lib/openpam_get_option.c#5 edit .. //depot/projects/openpam/lib/openpam_log.c#17 edit .. //depot/projects/openpam/lib/openpam_nullconv.c#4 edit .. //depot/projects/openpam/lib/openpam_restore_cred.c#3 edit .. //depot/projects/openpam/lib/openpam_set_option.c#6 edit .. //depot/projects/openpam/lib/openpam_ttyconv.c#14 edit .. //depot/projects/openpam/lib/pam_acct_mgmt.c#10 edit .. //depot/projects/openpam/lib/pam_authenticate.c#12 edit .. //depot/projects/openpam/lib/pam_authenticate_secondary.c#7 edit .. //depot/projects/openpam/lib/pam_chauthtok.c#13 edit .. //depot/projects/openpam/lib/pam_close_session.c#10 edit .. //depot/projects/openpam/lib/pam_end.c#11 edit .. //depot/projects/openpam/lib/pam_get_authtok.c#20 edit .. //depot/projects/openpam/lib/pam_get_data.c#9 edit .. //depot/projects/openpam/lib/pam_get_item.c#14 edit .. //depot/projects/openpam/lib/pam_get_mapped_authtok.c#7 edit .. //depot/projects/openpam/lib/pam_get_mapped_username.c#7 edit .. //depot/projects/openpam/lib/pam_get_user.c#13 edit .. //depot/projects/openpam/lib/pam_getenv.c#8 edit .. //depot/projects/openpam/lib/pam_getenvlist.c#10 edit .. //depot/projects/openpam/lib/pam_open_session.c#10 edit .. //depot/projects/openpam/lib/pam_putenv.c#9 edit .. //depot/projects/openpam/lib/pam_set_data.c#11 edit .. //depot/projects/openpam/lib/pam_set_item.c#16 edit .. //depot/projects/openpam/lib/pam_set_mapped_authtok.c#7 edit .. //depot/projects/openpam/lib/pam_set_mapped_username.c#7 edit .. //depot/projects/openpam/lib/pam_setcred.c#11 edit .. //depot/projects/openpam/lib/pam_setenv.c#8 edit .. //depot/projects/openpam/lib/pam_sm_acct_mgmt.c#5 edit .. //depot/projects/openpam/lib/pam_sm_authenticate.c#5 edit .. //depot/projects/openpam/lib/pam_sm_authenticate_secondary.c#5 edit .. //depot/projects/openpam/lib/pam_sm_chauthtok.c#6 edit .. //depot/projects/openpam/lib/pam_sm_close_session.c#5 edit .. //depot/projects/openpam/lib/pam_sm_get_mapped_authtok.c#5 edit .. //depot/projects/openpam/lib/pam_sm_get_mapped_username.c#5 edit .. //depot/projects/openpam/lib/pam_sm_open_session.c#5 edit .. //depot/projects/openpam/lib/pam_sm_set_mapped_authtok.c#5 edit .. //depot/projects/openpam/lib/pam_sm_set_mapped_username.c#5 edit .. //depot/projects/openpam/lib/pam_sm_setcred.c#5 edit .. //depot/projects/openpam/lib/pam_start.c#17 edit .. //depot/projects/openpam/lib/pam_vprompt.c#8 edit Differences ... ==== //depot/projects/openpam/lib/openpam_borrow_cred.c#3 (text+ko) ==== @@ -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 <sys/param.h> @@ -57,30 +57,31 @@ 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); } /* ==== //depot/projects/openpam/lib/openpam_findenv.c#9 (text+ko) ==== @@ -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 <string.h> @@ -53,14 +53,14 @@ { 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); } /* ==== //depot/projects/openpam/lib/openpam_free_data.c#3 (text+ko) ==== @@ -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 <stdlib.h> @@ -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(); } /* ==== //depot/projects/openpam/lib/openpam_get_option.c#5 (text+ko) ==== @@ -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 <sys/param.h> @@ -57,19 +57,20 @@ 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); } /* ==== //depot/projects/openpam/lib/openpam_log.c#17 (text+ko) ==== @@ -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 <ctype.h> @@ -64,9 +64,10 @@ 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 @@ case PAM_LOG_DEBUG: #ifndef DEBUG return; -#endif +#else priority = LOG_DEBUG; break; +#endif case PAM_LOG_VERBOSE: priority = LOG_INFO; break; ==== //depot/projects/openpam/lib/openpam_nullconv.c#4 (text+ko) ==== @@ -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 <sys/types.h> #include <security/pam_appl.h> -#include <security/openpam.h> + +#include "openpam_impl.h" /* * OpenPAM extension @@ -52,11 +53,12 @@ void *data) { + ENTER(); (void)n; (void)msg; (void)resp; (void)data; - return (PAM_CONV_ERR); + RETURNC(PAM_CONV_ERR); } /* ==== //depot/projects/openpam/lib/openpam_restore_cred.c#3 (text+ko) ==== @@ -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 <sys/param.h> @@ -56,17 +56,18 @@ 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); } /* ==== //depot/projects/openpam/lib/openpam_set_option.c#6 (text+ko) ==== @@ -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 <sys/param.h> @@ -61,8 +61,9 @@ 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 @@ 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 @@ free(cur->optv[i]); cur->optv[i] = opt; } - return (PAM_SUCCESS); + RETURNC(PAM_SUCCESS); } /* ==== //depot/projects/openpam/lib/openpam_ttyconv.c#14 (text+ko) ==== @@ -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 <sys/types.h> @@ -46,7 +46,8 @@ #include <unistd.h> #include <security/pam_appl.h> -#include <security/openpam.h> + +#include "openpam_impl.h" int openpam_ttyconv_timeout = 0; static jmp_buf jmpenv; @@ -139,11 +140,12 @@ { 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 @@ 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); } /* ==== //depot/projects/openpam/lib/pam_acct_mgmt.c#10 (text+ko) ==== @@ -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 <sys/param.h> @@ -51,8 +51,11 @@ 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); } /* ==== //depot/projects/openpam/lib/pam_authenticate.c#12 (text+ko) ==== @@ -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 <sys/param.h> @@ -53,11 +53,12 @@ { 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); } /* ==== //depot/projects/openpam/lib/pam_authenticate_secondary.c#7 (text+ko) ==== @@ -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 <security/pam_appl.h> @@ -53,7 +53,8 @@ int flags) { - return (PAM_SYSTEM_ERR); + ENTER(); + RETURNC(PAM_SYSTEM_ERR); } /* ==== //depot/projects/openpam/lib/pam_chauthtok.c#13 (text+ko) ==== @@ -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 <sys/param.h> @@ -53,8 +53,9 @@ { 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 @@ flags | PAM_UPDATE_AUTHTOK); pam_set_item(pamh, PAM_OLDAUTHTOK, NULL); pam_set_item(pamh, PAM_AUTHTOK, NULL); - return (pam_err); + RETURNC(pam_err); } /* ==== //depot/projects/openpam/lib/pam_close_session.c#10 (text+ko) ==== @@ -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 <sys/param.h> @@ -52,9 +52,10 @@ 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)); } /* ==== //depot/projects/openpam/lib/pam_end.c#11 (text+ko) ==== @@ -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 <stdlib.h> @@ -54,8 +54,9 @@ 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 @@ free(pamh); - return (PAM_SUCCESS); + RETURNC(PAM_SUCCESS); } /* ==== //depot/projects/openpam/lib/pam_get_authtok.c#20 (text+ko) ==== @@ -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 <sys/param.h> @@ -65,9 +65,9 @@ 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 @@ 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_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 @@ 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)); } /* ==== //depot/projects/openpam/lib/pam_get_data.c#9 (text+ko) ==== @@ -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 <string.h> @@ -54,16 +54,15 @@ { 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); } /* ==== //depot/projects/openpam/lib/pam_get_item.c#14 (text+ko) ==== @@ -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 <sys/param.h> @@ -52,9 +52,10 @@ int item_type, const void **item) { + + ENTER(); if (pamh == NULL) - return (PAM_SYSTEM_ERR); - + RETURNC(PAM_SYSTEM_ERR); switch (item_type) { case PAM_SERVICE: case PAM_USER: @@ -69,9 +70,9 @@ 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); } } ==== //depot/projects/openpam/lib/pam_get_mapped_authtok.c#7 (text+ko) ==== @@ -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 <security/pam_appl.h> @@ -52,7 +52,8 @@ unsigned char **target_module_authtok) { - return (PAM_SYSTEM_ERR); + ENTER(); + RETURNC(PAM_SYSTEM_ERR); } /* ==== //depot/projects/openpam/lib/pam_get_mapped_username.c#7 (text+ko) ==== @@ -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 <security/pam_appl.h> @@ -53,7 +53,8 @@ char **target_module_username) { - return (PAM_SYSTEM_ERR); + ENTER(); + RETURNC(PAM_SYSTEM_ERR); } /* ==== //depot/projects/openpam/lib/pam_get_user.c#13 (text+ko) ==== @@ -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 <sys/param.h> @@ -60,12 +60,12 @@ 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 @@ } 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)); } /* ==== //depot/projects/openpam/lib/pam_getenv.c#8 (text+ko) ==== @@ -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 <stdlib.h> @@ -54,16 +54,14 @@ { 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])); } /** ==== //depot/projects/openpam/lib/pam_getenvlist.c#10 (text+ko) ==== @@ -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 <stdlib.h> @@ -54,14 +54,14 @@ 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 @@ 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); } /** ==== //depot/projects/openpam/lib/pam_open_session.c#10 (text+ko) ==== @@ -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 <sys/param.h> @@ -52,9 +52,10 @@ 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)); } /* ==== //depot/projects/openpam/lib/pam_putenv.c#9 (text+ko) ==== @@ -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 <stdlib.h> @@ -55,20 +55,21 @@ 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 @@ 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); } /* ==== //depot/projects/openpam/lib/pam_set_data.c#11 (text+ko) ==== @@ -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 <stdlib.h> @@ -58,30 +58,29 @@ { 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; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200212121607.gBCG7LP2000567>