From owner-p4-projects@FreeBSD.ORG Sat May 24 10:53:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7001437B405; Sat, 24 May 2003 10:53:30 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2357437B401 for ; Sat, 24 May 2003 10:53:30 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6C89743F85 for ; Sat, 24 May 2003 10:53:29 -0700 (PDT) (envelope-from des@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4OHrT0U088225 for ; Sat, 24 May 2003 10:53:29 -0700 (PDT) (envelope-from des@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4OHrSIw088222 for perforce@freebsd.org; Sat, 24 May 2003 10:53:28 -0700 (PDT) Date: Sat, 24 May 2003 10:53:28 -0700 (PDT) Message-Id: <200305241753.h4OHrSIw088222@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to des@freebsd.org using -f From: Dag-Erling Smorgrav To: Perforce Change Reviews Subject: PERFORCE change 31796 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 May 2003 17:53:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=31796 Change 31796 by des@des.at.des.thinksec.com on 2003/05/24 10:52:28 Return code paranoia: compare against 0 instead of -1. Suggested by: Dmitry V. Levin Affected files ... .. //depot/projects/openpam/lib/openpam_borrow_cred.c#8 edit .. //depot/projects/openpam/lib/openpam_dynamic.c#11 edit .. //depot/projects/openpam/lib/openpam_restore_cred.c#7 edit .. //depot/projects/openpam/lib/pam_getenv.c#15 edit .. //depot/projects/openpam/lib/pam_putenv.c#11 edit .. //depot/projects/openpam/lib/pam_setenv.c#11 edit Differences ... ==== //depot/projects/openpam/lib/openpam_borrow_cred.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/openpam_borrow_cred.c#7 $ + * $P4: //depot/projects/openpam/lib/openpam_borrow_cred.c#8 $ */ #include @@ -76,7 +76,7 @@ scred->euid = geteuid(); scred->egid = getegid(); r = getgroups(NGROUPS_MAX, scred->groups); - if (r == -1) { + if (r < 0) { FREE(scred); RETURNC(PAM_SYSTEM_ERR); } @@ -88,8 +88,8 @@ } if (geteuid() == pwd->pw_uid) RETURNC(PAM_SUCCESS); - if (initgroups(pwd->pw_name, pwd->pw_gid) == -1 || - setegid(pwd->pw_gid) == -1 || seteuid(pwd->pw_uid) == -1) { + if (initgroups(pwd->pw_name, pwd->pw_gid) < 0 || + setegid(pwd->pw_gid) < 0 || seteuid(pwd->pw_uid) < 0) { openpam_restore_cred(pamh); RETURNC(PAM_SYSTEM_ERR); } ==== //depot/projects/openpam/lib/openpam_dynamic.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/openpam_dynamic.c#10 $ + * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#11 $ */ #include @@ -62,7 +62,7 @@ goto buf_err; /* try versioned module first, then unversioned module */ - if (asprintf(&vpath, "%s.%d", path, LIB_MAJ) == -1) + if (asprintf(&vpath, "%s.%d", path, LIB_MAJ) < 0) goto buf_err; if ((dlh = dlopen(vpath, RTLD_LAZY)) == NULL) { openpam_log(PAM_LOG_DEBUG, "%s: %s", vpath, dlerror()); ==== //depot/projects/openpam/lib/openpam_restore_cred.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/openpam_restore_cred.c#6 $ + * $P4: //depot/projects/openpam/lib/openpam_restore_cred.c#7 $ */ #include @@ -64,9 +64,9 @@ if (scred == NULL) RETURNC(PAM_SYSTEM_ERR); if (scred->euid != geteuid()) { - if (seteuid(scred->euid) == -1 || - setgroups(scred->ngroups, scred->groups) == -1 || - setegid(scred->egid) == -1) + if (seteuid(scred->euid) < 0 || + setgroups(scred->ngroups, scred->groups) < 0 || + setegid(scred->egid) < 0) RETURNC(PAM_SYSTEM_ERR); } pam_set_data(pamh, PAM_SAVED_CRED, NULL, NULL); ==== //depot/projects/openpam/lib/pam_getenv.c#15 (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#14 $ + * $P4: //depot/projects/openpam/lib/pam_getenv.c#15 $ */ #include @@ -60,7 +60,7 @@ RETURNS(NULL); if (name == NULL || strchr(name, '=') != NULL) RETURNS(NULL); - if ((i = openpam_findenv(pamh, name, strlen(name))) == -1) + if ((i = openpam_findenv(pamh, name, strlen(name))) < 0) RETURNS(NULL); for (str = pamh->env[i]; *str != '\0'; ++str) { if (*str == '=') { ==== //depot/projects/openpam/lib/pam_putenv.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_putenv.c#10 $ + * $P4: //depot/projects/openpam/lib/pam_putenv.c#11 $ */ #include @@ -64,7 +64,7 @@ RETURNC(PAM_SYSTEM_ERR); /* see if the variable is already in the environment */ - if ((i = openpam_findenv(pamh, namevalue, p - namevalue)) != -1) { + if ((i = openpam_findenv(pamh, namevalue, p - namevalue)) >= 0) { if ((p = strdup(namevalue)) == NULL) RETURNC(PAM_BUF_ERR); FREE(pamh->env[i]); ==== //depot/projects/openpam/lib/pam_setenv.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_setenv.c#10 $ + * $P4: //depot/projects/openpam/lib/pam_setenv.c#11 $ */ #include @@ -67,7 +67,7 @@ RETURNC(PAM_SYSTEM_ERR); /* is it already there? */ - if (!overwrite && openpam_findenv(pamh, name, strlen(name)) != -1) + if (!overwrite && openpam_findenv(pamh, name, strlen(name)) >= 0) RETURNC(PAM_SUCCESS); /* set it... */