diff --git a/compat/glob.c b/compat/glob.c index a36ac403f..a46ae9d7e 100644 --- a/compat/glob.c +++ b/compat/glob.c @@ -561,9 +561,9 @@ glob1(Char *pattern, Char *pattern_last, glob_t *pglob) /* A null pathname is invalid -- POSIX 1003.1 sect. 2.4. */ if (*pattern == EOS) return 0; - return(glob2(pathbuf, pathbuf + PATH_MAX - 1, + return glob2(pathbuf, pathbuf + PATH_MAX - 1, pathbuf, pathbuf + PATH_MAX - 1, - pattern, pattern_last, pglob)); + pattern, pattern_last, pglob); } /* @@ -624,9 +624,9 @@ glob2(Char *pathbuf, Char *pathbuf_last, Char *pathend, Char *pathend_last, } } else /* Need expansion, recurse. */ - return(glob3(pathbuf, pathbuf_last, pathend, + return glob3(pathbuf, pathbuf_last, pathend, pathend_last, pattern, pattern_last, - p, pattern_last, pglob)); + p, pattern_last, pglob); } /* NOTREACHED */ } diff --git a/plugins/sudoers/ldap.c b/plugins/sudoers/ldap.c index b3a64ae5c..b6d9b5986 100644 --- a/plugins/sudoers/ldap.c +++ b/plugins/sudoers/ldap.c @@ -2163,8 +2163,8 @@ ldap_entry_compare(const void *a, const void *b) const struct ldap_entry_wrapper *aw = a; const struct ldap_entry_wrapper *bw = b; - return(bw->order < aw->order ? -1 : - (bw->order > aw->order ? 1 : 0)); + return bw->order < aw->order ? -1 : + (bw->order > aw->order ? 1 : 0); } /* diff --git a/plugins/sudoers/logging.c b/plugins/sudoers/logging.c index b93f4e56b..70145c58e 100644 --- a/plugins/sudoers/logging.c +++ b/plugins/sudoers/logging.c @@ -614,10 +614,10 @@ static int should_mail(int status) { - return(def_mail_always || ISSET(status, VALIDATE_ERROR) || + return def_mail_always || ISSET(status, VALIDATE_ERROR) || (def_mail_no_user && ISSET(status, FLAG_NO_USER)) || (def_mail_no_host && ISSET(status, FLAG_NO_HOST)) || - (def_mail_no_perms && !ISSET(status, VALIDATE_OK))); + (def_mail_no_perms && !ISSET(status, VALIDATE_OK)); } #define LL_TTY_STR "TTY=" diff --git a/plugins/sudoers/match.c b/plugins/sudoers/match.c index fa3d4973b..a3b65de1f 100644 --- a/plugins/sudoers/match.c +++ b/plugins/sudoers/match.c @@ -240,8 +240,8 @@ int runaslist_matches(struct member_list *user_list, struct member_list *group_list) { alias_seqno++; - return(_runaslist_matches(user_list ? user_list : &empty, - group_list ? group_list : &empty)); + return _runaslist_matches(user_list ? user_list : &empty, + group_list ? group_list : &empty); } /*