Date: Sat, 8 Feb 2003 07:41:55 -0800 (PST) From: Dag-Erling Smorgrav <des@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 24823 for review Message-ID: <200302081541.h18FftK8060746@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=24823 Change 24823 by des@des.at.des.thinksec.com on 2003/02/08 07:41:53 Nothing beats being an idiot! Avoid passing expressions with side effects as arguments to macros. Also impose some sort of consistency in the naming of variables that hold error codes. Affected files ... .. //depot/projects/openpam/lib/pam_acct_mgmt.c#11 edit .. //depot/projects/openpam/lib/pam_authenticate.c#13 edit .. //depot/projects/openpam/lib/pam_chauthtok.c#14 edit .. //depot/projects/openpam/lib/pam_close_session.c#11 edit .. //depot/projects/openpam/lib/pam_get_authtok.c#21 edit .. //depot/projects/openpam/lib/pam_get_user.c#14 edit .. //depot/projects/openpam/lib/pam_getenv.c#11 edit .. //depot/projects/openpam/lib/pam_open_session.c#11 edit .. //depot/projects/openpam/lib/pam_setcred.c#12 edit Differences ... ==== //depot/projects/openpam/lib/pam_acct_mgmt.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_acct_mgmt.c#10 $ + * $P4: //depot/projects/openpam/lib/pam_acct_mgmt.c#11 $ */ #include <sys/param.h> @@ -51,11 +51,11 @@ pam_acct_mgmt(pam_handle_t *pamh, int flags) { - int pam_err; + int r; ENTER(); - pam_err = openpam_dispatch(pamh, PAM_SM_ACCT_MGMT, flags); - RETURNC(pam_err); + r = openpam_dispatch(pamh, PAM_SM_ACCT_MGMT, flags); + RETURNC(r); } /* ==== //depot/projects/openpam/lib/pam_authenticate.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_authenticate.c#12 $ + * $P4: //depot/projects/openpam/lib/pam_authenticate.c#13 $ */ #include <sys/param.h> @@ -51,14 +51,14 @@ pam_authenticate(pam_handle_t *pamh, int flags) { - int pam_err; + int r; ENTER(); if (flags & ~(PAM_SILENT|PAM_DISALLOW_NULL_AUTHTOK)) RETURNC(PAM_SYMBOL_ERR); - pam_err = openpam_dispatch(pamh, PAM_SM_AUTHENTICATE, flags); + r = openpam_dispatch(pamh, PAM_SM_AUTHENTICATE, flags); pam_set_item(pamh, PAM_AUTHTOK, NULL); - RETURNC(pam_err); + RETURNC(r); } /* ==== //depot/projects/openpam/lib/pam_chauthtok.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_chauthtok.c#13 $ + * $P4: //depot/projects/openpam/lib/pam_chauthtok.c#14 $ */ #include <sys/param.h> @@ -51,19 +51,19 @@ pam_chauthtok(pam_handle_t *pamh, int flags) { - int pam_err; + int r; ENTER(); if (flags & ~(PAM_SILENT|PAM_CHANGE_EXPIRED_AUTHTOK)) RETURNC(PAM_SYMBOL_ERR); - pam_err = openpam_dispatch(pamh, PAM_SM_CHAUTHTOK, + r = openpam_dispatch(pamh, PAM_SM_CHAUTHTOK, flags | PAM_PRELIM_CHECK); - if (pam_err == PAM_SUCCESS) - pam_err = openpam_dispatch(pamh, PAM_SM_CHAUTHTOK, + if (r == PAM_SUCCESS) + r = openpam_dispatch(pamh, PAM_SM_CHAUTHTOK, flags | PAM_UPDATE_AUTHTOK); pam_set_item(pamh, PAM_OLDAUTHTOK, NULL); pam_set_item(pamh, PAM_AUTHTOK, NULL); - RETURNC(pam_err); + RETURNC(r); } /* ==== //depot/projects/openpam/lib/pam_close_session.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_close_session.c#10 $ + * $P4: //depot/projects/openpam/lib/pam_close_session.c#11 $ */ #include <sys/param.h> @@ -51,11 +51,13 @@ pam_close_session(pam_handle_t *pamh, int flags) { + int r; ENTER(); if (flags & ~(PAM_SILENT)) RETURNC(PAM_SYMBOL_ERR); - RETURNC(openpam_dispatch(pamh, PAM_SM_CLOSE_SESSION, flags)); + r = openpam_dispatch(pamh, PAM_SM_CLOSE_SESSION, flags); + RETURNC(r); } /* ==== //depot/projects/openpam/lib/pam_get_authtok.c#21 (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#20 $ + * $P4: //depot/projects/openpam/lib/pam_get_authtok.c#21 $ */ #include <sys/param.h> @@ -124,7 +124,8 @@ free(resp); if (r != PAM_SUCCESS) RETURNC(r); - RETURNC(pam_get_item(pamh, item, (const void **)authtok)); + r = pam_get_item(pamh, item, (const void **)authtok); + RETURNC(r); } /* ==== //depot/projects/openpam/lib/pam_get_user.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_user.c#13 $ + * $P4: //depot/projects/openpam/lib/pam_get_user.c#14 $ */ #include <sys/param.h> @@ -78,7 +78,8 @@ free(resp); if (r != PAM_SUCCESS) RETURNC(r); - RETURNC(pam_get_item(pamh, PAM_USER, (const void **)user)); + r = pam_get_item(pamh, PAM_USER, (const void **)user); + RETURNC(r); } /* ==== //depot/projects/openpam/lib/pam_getenv.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_getenv.c#10 $ + * $P4: //depot/projects/openpam/lib/pam_getenv.c#11 $ */ #include <stdlib.h> @@ -52,16 +52,18 @@ pam_getenv(pam_handle_t *pamh, const char *name) { + char *str; int i; - ENTER(); + ENTERS(name); if (pamh == NULL) RETURNS(NULL); if (name == NULL || strchr(name, '=') != NULL) RETURNS(NULL); if ((i = openpam_findenv(pamh, name, strlen(name))) == -1) RETURNS(NULL); - RETURNS(strdup(pamh->env[i])); + str = strdup(pamh->env[i]); + RETURNS(str); } /** ==== //depot/projects/openpam/lib/pam_open_session.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_open_session.c#10 $ + * $P4: //depot/projects/openpam/lib/pam_open_session.c#11 $ */ #include <sys/param.h> @@ -51,11 +51,13 @@ pam_open_session(pam_handle_t *pamh, int flags) { + int r; ENTER(); if (flags & ~(PAM_SILENT)) RETURNC(PAM_SYMBOL_ERR); - RETURNC(openpam_dispatch(pamh, PAM_SM_OPEN_SESSION, flags)); + r = openpam_dispatch(pamh, PAM_SM_OPEN_SESSION, flags); + RETURNC(r); } /* ==== //depot/projects/openpam/lib/pam_setcred.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_setcred.c#11 $ + * $P4: //depot/projects/openpam/lib/pam_setcred.c#12 $ */ #include <sys/param.h> @@ -51,13 +51,15 @@ pam_setcred(pam_handle_t *pamh, int flags) { + int r; ENTER(); if (flags & ~(PAM_SILENT|PAM_ESTABLISH_CRED|PAM_DELETE_CRED| PAM_REINITIALIZE_CRED|PAM_REFRESH_CRED)) RETURNC(PAM_SYMBOL_ERR); /* XXX enforce exclusivity */ - RETURNC(openpam_dispatch(pamh, PAM_SM_SETCRED, flags)); + r = openpam_dispatch(pamh, PAM_SM_SETCRED, flags); + RETURNC(r); } /* 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?200302081541.h18FftK8060746>