From df0aac6712814b5d43f4264db99731fb7b00ae3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Sat, 24 May 2003 19:52:28 +0000 Subject: [PATCH] Return code paranoia: compare against 0 instead of -1. Suggested by: Dmitry V. Levin git-svn-id: svn+ssh://svn.openpam.org/svn/openpam/trunk@234 185d5e19-27fe-0310-9dcf-9bff6b9f3609 --- lib/openpam_borrow_cred.c | 8 ++++---- lib/openpam_dynamic.c | 4 ++-- lib/openpam_restore_cred.c | 8 ++++---- lib/pam_getenv.c | 4 ++-- lib/pam_putenv.c | 4 ++-- lib/pam_setenv.c | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/openpam_borrow_cred.c b/lib/openpam_borrow_cred.c index 323ae3d..8023971 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#7 $ + * $P4: //depot/projects/openpam/lib/openpam_borrow_cred.c#8 $ */ #include @@ -76,7 +76,7 @@ openpam_borrow_cred(pam_handle_t *pamh, 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 @@ openpam_borrow_cred(pam_handle_t *pamh, } 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); } diff --git a/lib/openpam_dynamic.c b/lib/openpam_dynamic.c index b566a35..0376d9a 100644 --- a/lib/openpam_dynamic.c +++ b/lib/openpam_dynamic.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_dynamic.c#10 $ + * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#11 $ */ #include @@ -62,7 +62,7 @@ openpam_dynamic(const char *path) 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()); diff --git a/lib/openpam_restore_cred.c b/lib/openpam_restore_cred.c index 9bba368..7f769bd 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#6 $ + * $P4: //depot/projects/openpam/lib/openpam_restore_cred.c#7 $ */ #include @@ -64,9 +64,9 @@ openpam_restore_cred(pam_handle_t *pamh) 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); diff --git a/lib/pam_getenv.c b/lib/pam_getenv.c index 2cf50cc..a0a2004 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#14 $ + * $P4: //depot/projects/openpam/lib/pam_getenv.c#15 $ */ #include @@ -60,7 +60,7 @@ pam_getenv(pam_handle_t *pamh, 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 == '=') { diff --git a/lib/pam_putenv.c b/lib/pam_putenv.c index 5ea53cc..711c19a 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#10 $ + * $P4: //depot/projects/openpam/lib/pam_putenv.c#11 $ */ #include @@ -64,7 +64,7 @@ pam_putenv(pam_handle_t *pamh, 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]); diff --git a/lib/pam_setenv.c b/lib/pam_setenv.c index 02ffe23..cf26f75 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#10 $ + * $P4: //depot/projects/openpam/lib/pam_setenv.c#11 $ */ #include @@ -67,7 +67,7 @@ pam_setenv(pam_handle_t *pamh, 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... */