diff --git a/common/aix.c b/common/aix.c index b02296ec5..66c6814c5 100644 --- a/common/aix.c +++ b/common/aix.c @@ -72,10 +72,10 @@ aix_getlimit(char *user, char *lim, rlim64_t *valp) if (getuserattr(user, lim, &val, SEC_INT) != 0 && getuserattr("default", lim, &val, SEC_INT) != 0) { - return(-1); + return -1; } *valp = val; - return(0); + return 0; } static void diff --git a/common/alloc.c b/common/alloc.c index b45f0fb05..c484f8fe4 100644 --- a/common/alloc.c +++ b/common/alloc.c @@ -80,7 +80,7 @@ emalloc(size_t size) if ((ptr = malloc(size)) == NULL) errorx(1, "unable to allocate memory"); - return(ptr); + return ptr; } /* @@ -100,7 +100,7 @@ emalloc2(size_t nmemb, size_t size) size *= nmemb; if ((ptr = malloc(size)) == NULL) errorx(1, "unable to allocate memory"); - return(ptr); + return ptr; } /* @@ -118,7 +118,7 @@ erealloc(void *ptr, size_t size) ptr = ptr ? realloc(ptr, size) : malloc(size); if (ptr == NULL) errorx(1, "unable to allocate memory"); - return(ptr); + return ptr; } /* @@ -140,7 +140,7 @@ erealloc3(void *ptr, size_t nmemb, size_t size) ptr = ptr ? realloc(ptr, size) : malloc(size); if (ptr == NULL) errorx(1, "unable to allocate memory"); - return(ptr); + return ptr; } /* @@ -159,7 +159,7 @@ estrdup(const char *src) (void) memcpy(dst, src, len); dst[len] = '\0'; } - return(dst); + return dst; } /* @@ -180,7 +180,7 @@ estrndup(const char *src, size_t maxlen) (void) memcpy(dst, src, len); dst[len] = '\0'; } - return(dst); + return dst; } /* @@ -198,7 +198,7 @@ easprintf(char **ret, const char *fmt, ...) if (len == -1) errorx(1, "unable to allocate memory"); - return(len); + return len; } /* @@ -212,7 +212,7 @@ evasprintf(char **ret, const char *format, va_list args) if ((len = vasprintf(ret, format, args)) == -1) errorx(1, "unable to allocate memory"); - return(len); + return len; } /* diff --git a/common/fileops.c b/common/fileops.c index adcb1cf8a..f159901cc 100644 --- a/common/fileops.c +++ b/common/fileops.c @@ -69,13 +69,13 @@ touch(int fd, char *path, struct timeval *tvp) #if defined(HAVE_FUTIME) || defined(HAVE_FUTIMES) if (fd != -1) - return(futimes(fd, tvp ? times : NULL)); + return futimes(fd, tvp ? times : NULL); else #endif if (path != NULL) - return(utimes(path, tvp ? times : NULL)); + return utimes(path, tvp ? times : NULL); else - return(-1); + return -1; } /* @@ -98,7 +98,7 @@ lock_file(int fd, int lockit) op = F_ULOCK; break; } - return(lockf(fd, op, 0) == 0); + return lockf(fd, op, 0) == 0; } #elif HAVE_FLOCK int @@ -117,7 +117,7 @@ lock_file(int fd, int lockit) op = LOCK_UN; break; } - return(flock(fd, op) == 0); + return flock(fd, op) == 0; } #else int @@ -134,9 +134,9 @@ lock_file(int fd, int lockit) lock.l_whence = SEEK_SET; func = (lockit == SUDO_LOCK) ? F_SETLKW : F_SETLK; - return(fcntl(fd, func, &lock) == 0); + return fcntl(fd, func, &lock) == 0; #else - return(TRUE); + return TRUE; #endif } #endif @@ -164,5 +164,5 @@ sudo_parseln(FILE *fp) for (cp = buf; isblank((unsigned char)*cp); cp++) continue; } - return(cp); + return cp; } diff --git a/common/fmt_string.c b/common/fmt_string.c index f2b301dc7..8ad306cc7 100644 --- a/common/fmt_string.c +++ b/common/fmt_string.c @@ -60,5 +60,5 @@ fmt_string(const char *var, const char *val) *cp = '\0'; } - return(str); + return str; } diff --git a/common/list.c b/common/list.c index d4d060eaa..4b7e05217 100644 --- a/common/list.c +++ b/common/list.c @@ -65,7 +65,7 @@ tq_pop(void *vh) h->last->next = NULL; } } - return (last); + return last; } /* diff --git a/common/term.c b/common/term.c index a1d5639f4..b8f03db0b 100644 --- a/common/term.c +++ b/common/term.c @@ -73,17 +73,17 @@ term_restore(int fd, int flush) int flags = TCSASOFT; flags |= flush ? TCSAFLUSH : TCSADRAIN; if (tcsetattr(fd, flags, &oterm) != 0) - return(0); + return 0; changed = 0; } - return(1); + return 1; } int term_noecho(int fd) { if (!changed && tcgetattr(fd, &oterm) != 0) - return(0); + return 0; (void) memcpy(&term, &oterm, sizeof(term)); CLR(term.c_lflag, ECHO|ECHONL); #ifdef VSTATUS @@ -91,9 +91,9 @@ term_noecho(int fd) #endif if (tcsetattr(fd, TCSADRAIN|TCSASOFT, &term) == 0) { changed = 1; - return(1); + return 1; } - return(0); + return 0; } int @@ -102,7 +102,7 @@ term_raw(int fd, int isig) struct termios term; if (!changed && tcgetattr(fd, &oterm) != 0) - return(0); + return 0; (void) memcpy(&term, &oterm, sizeof(term)); /* Set terminal to raw mode */ term.c_cc[VMIN] = 1; @@ -114,16 +114,16 @@ term_raw(int fd, int isig) SET(term.c_lflag, ISIG); if (tcsetattr(fd, TCSADRAIN|TCSASOFT, &term) == 0) { changed = 1; - return(1); + return 1; } - return(0); + return 0; } int term_cbreak(int fd) { if (!changed && tcgetattr(fd, &oterm) != 0) - return(0); + return 0; (void) memcpy(&term, &oterm, sizeof(term)); /* Set terminal to half-cooked mode */ term.c_cc[VMIN] = 1; @@ -137,9 +137,9 @@ term_cbreak(int fd) term_erase = term.c_cc[VERASE]; term_kill = term.c_cc[VKILL]; changed = 1; - return(1); + return 1; } - return(0); + return 0; } int @@ -148,8 +148,8 @@ term_copy(int src, int dst) struct termios tt; if (tcgetattr(src, &tt) != 0) - return(0); + return 0; if (tcsetattr(dst, TCSANOW|TCSASOFT, &tt) != 0) - return(0); - return(1); + return 0; + return 1; } diff --git a/compat/fnmatch.c b/compat/fnmatch.c index 81a7f2c44..3bc92d3be 100644 --- a/compat/fnmatch.c +++ b/compat/fnmatch.c @@ -78,17 +78,17 @@ fnmatch(const char *pattern, const char *string, int flags) switch (c = *pattern++) { case EOS: if (ISSET(flags, FNM_LEADING_DIR) && *string == '/') - return (0); - return (*string == EOS ? 0 : FNM_NOMATCH); + return 0; + return *string == EOS ? 0 : FNM_NOMATCH; case '?': if (*string == EOS) - return (FNM_NOMATCH); + return FNM_NOMATCH; if (*string == '/' && ISSET(flags, FNM_PATHNAME)) - return (FNM_NOMATCH); + return FNM_NOMATCH; if (*string == '.' && ISSET(flags, FNM_PERIOD) && (string == stringstart || (ISSET(flags, FNM_PATHNAME) && *(string - 1) == '/'))) - return (FNM_NOMATCH); + return FNM_NOMATCH; ++string; break; case '*': @@ -100,7 +100,7 @@ fnmatch(const char *pattern, const char *string, int flags) if (*string == '.' && ISSET(flags, FNM_PERIOD) && (string == stringstart || (ISSET(flags, FNM_PATHNAME) && *(string - 1) == '/'))) - return (FNM_NOMATCH); + return FNM_NOMATCH; /* Optimize for pattern with * at end or before /. */ if (c == EOS) { @@ -109,31 +109,31 @@ fnmatch(const char *pattern, const char *string, int flags) strchr(string, '/') == NULL ? 0 : FNM_NOMATCH); else - return (0); + return 0; } else if (c == '/' && ISSET(flags, FNM_PATHNAME)) { if ((string = strchr(string, '/')) == NULL) - return (FNM_NOMATCH); + return FNM_NOMATCH; break; } /* General case, use recursion. */ while ((test = *string) != EOS) { if (!fnmatch(pattern, string, flags & ~FNM_PERIOD)) - return (0); + return 0; if (test == '/' && ISSET(flags, FNM_PATHNAME)) break; ++string; } - return (FNM_NOMATCH); + return FNM_NOMATCH; case '[': if (*string == EOS) - return (FNM_NOMATCH); + return FNM_NOMATCH; if (*string == '/' && ISSET(flags, FNM_PATHNAME)) - return (FNM_NOMATCH); + return FNM_NOMATCH; if (*string == '.' && ISSET(flags, FNM_PERIOD) && (string == stringstart || (ISSET(flags, FNM_PATHNAME) && *(string - 1) == '/'))) - return (FNM_NOMATCH); + return FNM_NOMATCH; switch (rangematch(pattern, *string, flags, &newp)) { case RANGE_ERROR: @@ -143,7 +143,7 @@ fnmatch(const char *pattern, const char *string, int flags) pattern = newp; break; case RANGE_NOMATCH: - return (FNM_NOMATCH); + return FNM_NOMATCH; } ++string; break; @@ -160,7 +160,7 @@ fnmatch(const char *pattern, const char *string, int flags) if (c != *string && !(ISSET(flags, FNM_CASEFOLD) && (tolower((unsigned char)c) == tolower((unsigned char)*string)))) - return (FNM_NOMATCH); + return FNM_NOMATCH; ++string; break; } @@ -208,9 +208,9 @@ rangematch(const char *pattern, int test, int flags, char **newp) if (c == '\\' && !ISSET(flags, FNM_NOESCAPE)) c = *pattern++; if (c == EOS) - return (RANGE_ERROR); + return RANGE_ERROR; if (c == '/' && ISSET(flags, FNM_PATHNAME)) - return (RANGE_NOMATCH); + return RANGE_NOMATCH; if (ISSET(flags, FNM_CASEFOLD)) c = tolower((unsigned char)c); if (*pattern == '-' @@ -219,7 +219,7 @@ rangematch(const char *pattern, int test, int flags, char **newp) if (c2 == '\\' && !ISSET(flags, FNM_NOESCAPE)) c2 = *pattern++; if (c2 == EOS) - return (RANGE_ERROR); + return RANGE_ERROR; if (ISSET(flags, FNM_CASEFOLD)) c2 = tolower((unsigned char)c2); if (c <= test && test <= c2) @@ -229,7 +229,7 @@ rangematch(const char *pattern, int test, int flags, char **newp) } while ((c = *pattern++) != ']'); *newp = (char *)pattern; - return (ok == negate ? RANGE_NOMATCH : RANGE_MATCH); + return ok == negate ? RANGE_NOMATCH : RANGE_MATCH; } static int @@ -242,7 +242,7 @@ classmatch(const char *pattern, int test, int foldcase, const char **ep) if ((colon = strchr(pattern, ':')) == NULL || colon[1] != ']') { *ep = pattern - 2; - return(RANGE_ERROR); + return RANGE_ERROR; } *ep = colon + 2; len = (size_t)(colon - pattern); @@ -261,5 +261,5 @@ classmatch(const char *pattern, int test, int foldcase, const char **ep) *ep = colon + strlen(colon); rval = RANGE_ERROR; } - return(rval); + return rval; } diff --git a/compat/getcwd.c b/compat/getcwd.c index dd443bde2..31855046c 100644 --- a/compat/getcwd.c +++ b/compat/getcwd.c @@ -102,12 +102,12 @@ getcwd(char *pt, size_t size) ptsize = 0; if (!size) { errno = EINVAL; - return (NULL); + return NULL; } ept = pt + size; } else { if ((pt = malloc(ptsize = 1024 - 4)) == NULL) - return (NULL); + return NULL; ept = pt + ptsize; } bpt = ept - 1; @@ -152,7 +152,7 @@ getcwd(char *pt, size_t size) */ bcopy(bpt, pt, ept - bpt); free(up); - return (pt); + return pt; } /* @@ -260,5 +260,5 @@ err: free(up); if (dir) (void)closedir(dir); - return (NULL); + return NULL; } diff --git a/compat/glob.c b/compat/glob.c index ff479b88f..a36ac403f 100644 --- a/compat/glob.c +++ b/compat/glob.c @@ -529,7 +529,7 @@ glob0(const Char *pattern, glob_t *pglob) #endif if ((err = glob1(patbuf, patbuf + PATH_MAX - 1, pglob)) != 0) - return(err); + return err; /* * If there was no match we are going to append the pattern @@ -537,20 +537,20 @@ glob0(const Char *pattern, glob_t *pglob) */ if (pglob->gl_pathc == oldpathc) { if (pglob->gl_flags & GLOB_NOCHECK) - return(globextend(pattern, pglob)); + return globextend(pattern, pglob); else - return(GLOB_NOMATCH); + return GLOB_NOMATCH; } if (!(pglob->gl_flags & GLOB_NOSORT)) qsort(pglob->gl_pathv + pglob->gl_offs + oldpathc, pglob->gl_pathc - oldpathc, sizeof(char *), compare); - return(0); + return 0; } static int compare(const void *p, const void *q) { - return(strcmp(*(char **)p, *(char **)q)); + return strcmp(*(char **)p, *(char **)q); } static int @@ -560,7 +560,7 @@ 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 0; return(glob2(pathbuf, pathbuf + PATH_MAX - 1, pathbuf, pathbuf + PATH_MAX - 1, pattern, pattern_last, pglob)); @@ -587,7 +587,7 @@ glob2(Char *pathbuf, Char *pathbuf_last, Char *pathend, Char *pathend_last, if (*pattern == EOS) { /* End of pattern? */ *pathend = EOS; if (g_lstat(pathbuf, &sb, pglob)) - return(0); + return 0; if (((pglob->gl_flags & GLOB_MARK) && pathend[-1] != SEP) && (S_ISDIR(sb.st_mode) || @@ -595,12 +595,12 @@ glob2(Char *pathbuf, Char *pathbuf_last, Char *pathend, Char *pathend_last, (g_stat(pathbuf, &sb, pglob) == 0) && S_ISDIR(sb.st_mode)))) { if (pathend+1 > pathend_last) - return (1); + return 1; *pathend++ = SEP; *pathend = EOS; } ++pglob->gl_matchc; - return(globextend(pathbuf, pglob)); + return globextend(pathbuf, pglob); } /* Find end of next segment, copy tentatively to pathend. */ @@ -610,7 +610,7 @@ glob2(Char *pathbuf, Char *pathbuf_last, Char *pathend, Char *pathend_last, if (ismeta(*p)) anymeta = 1; if (q+1 > pathend_last) - return (1); + return 1; *q++ = *p++; } @@ -619,7 +619,7 @@ glob2(Char *pathbuf, Char *pathbuf_last, Char *pathend, Char *pathend_last, pattern = p; while (*pattern == SEP) { if (pathend+1 > pathend_last) - return (1); + return 1; *pathend++ = *pattern++; } } else @@ -642,7 +642,7 @@ glob3(Char *pathbuf, Char *pathbuf_last, Char *pathend, Char *pathend_last, char buf[PATH_MAX]; if (pathend > pathend_last) - return (1); + return 1; *pathend = EOS; errno = 0; @@ -650,12 +650,12 @@ glob3(Char *pathbuf, Char *pathbuf_last, Char *pathend, Char *pathend_last, /* TODO: don't call for ENOENT or ENOTDIR? */ if (pglob->gl_errfunc) { if (g_Ctoc(pathbuf, buf, sizeof(buf))) - return(GLOB_ABORTED); + return GLOB_ABORTED; if (pglob->gl_errfunc(buf, errno) || pglob->gl_flags & GLOB_ERR) - return(GLOB_ABORTED); + return GLOB_ABORTED; } - return(0); + return 0; } err = 0; @@ -689,7 +689,7 @@ glob3(Char *pathbuf, Char *pathbuf_last, Char *pathend, Char *pathend_last, } closedir(dirp); - return(err); + return err; } /* @@ -724,7 +724,7 @@ globextend(const Char *path, glob_t *pglob) free(pglob->gl_pathv); pglob->gl_pathv = NULL; } - return(GLOB_NOSPACE); + return GLOB_NOSPACE; } if (pglob->gl_pathv == NULL && pglob->gl_offs > 0) { @@ -741,13 +741,13 @@ globextend(const Char *path, glob_t *pglob) if ((copy = malloc(len)) != NULL) { if (g_Ctoc(path, copy, len)) { free(copy); - return(GLOB_NOSPACE); + return GLOB_NOSPACE; } pathv[pglob->gl_offs + pglob->gl_pathc++] = copy; } pathv[pglob->gl_offs + pglob->gl_pathc] = NULL; - return(copy == NULL ? GLOB_NOSPACE : 0); + return copy == NULL ? GLOB_NOSPACE : 0; } /* @@ -765,20 +765,20 @@ match(Char *name, Char *pat, Char *patend) switch (c & M_MASK) { case M_ALL: if (pat == patend) - return(1); + return 1; do { if (match(name, pat, patend)) - return(1); + return 1; } while (*name++ != EOS); - return(0); + return 0; case M_ONE: if (*name++ == EOS) - return(0); + return 0; break; case M_SET: ok = 0; if ((k = *name++) == EOS) - return(0); + return 0; if ((negate_range = ((*pat & M_MASK) == M_NOT)) != EOS) ++pat; while (((c = *pat++) & M_MASK) != M_END) { @@ -797,15 +797,15 @@ match(Char *name, Char *pat, Char *patend) ok = 1; } if (ok == negate_range) - return(0); + return 0; break; default: if (*name++ != c) - return(0); + return 0; break; } } - return(*name == EOS); + return *name == EOS; } /* Free allocated data belonging to a glob_t structure. */ @@ -835,9 +835,9 @@ g_opendir(Char *str, glob_t *pglob) buf[1] = '\0'; } else { if (g_Ctoc(str, buf, sizeof(buf))) - return(NULL); + return NULL; } - return(opendir(buf)); + return opendir(buf); } static int @@ -846,8 +846,8 @@ g_lstat(Char *fn, struct stat *sb, glob_t *pglob) char buf[PATH_MAX]; if (g_Ctoc(fn, buf, sizeof(buf))) - return(-1); - return(lstat(buf, sb)); + return -1; + return lstat(buf, sb); } static int @@ -856,8 +856,8 @@ g_stat(Char *fn, struct stat *sb, glob_t *pglob) char buf[PATH_MAX]; if (g_Ctoc(fn, buf, sizeof(buf))) - return(-1); - return(stat(buf, sb)); + return -1; + return stat(buf, sb); } static Char * @@ -865,9 +865,9 @@ g_strchr(const Char *str, int ch) { do { if (*str == ch) - return ((Char *)str); + return (Char *)str; } while (*str++); - return (NULL); + return NULL; } static int @@ -876,9 +876,9 @@ g_Ctoc(const Char *str, char *buf, unsigned int len) while (len--) { if ((*buf++ = *str++) == EOS) - return (0); + return 0; } - return (1); + return 1; } #ifdef DEBUG diff --git a/compat/isblank.c b/compat/isblank.c index dc138874a..2f15f5079 100644 --- a/compat/isblank.c +++ b/compat/isblank.c @@ -24,5 +24,5 @@ int isblank(int ch) { - return(ch == ' ' || ch == '\t'); + return ch == ' ' || ch == '\t'; } diff --git a/compat/memrchr.c b/compat/memrchr.c index fa7479a75..5d21bde6f 100644 --- a/compat/memrchr.c +++ b/compat/memrchr.c @@ -33,8 +33,8 @@ memrchr(const void *s, int c, size_t n) cp = (unsigned char *)s + n; do { if (*(--cp) == (unsigned char)c) - return((void *)cp); + return (void *)cp; } while (--n != 0); } - return((void *)0); + return (void *)0; } diff --git a/compat/mktemp.c b/compat/mktemp.c index c3a43abf4..910c2d855 100644 --- a/compat/mktemp.c +++ b/compat/mktemp.c @@ -55,7 +55,7 @@ static void seed_random(void); int mkstemps(char *path, int slen) { - return(mktemp_internal(path, slen, MKTEMP_FILE)); + return mktemp_internal(path, slen, MKTEMP_FILE); } #endif /* HAVE_MKSTEMPS */ @@ -64,8 +64,8 @@ char * mkdtemp(char *path) { if (mktemp_internal(path, 0, MKTEMP_DIR) == -1) - return(NULL); - return(path); + return NULL; + return path; } #endif /* HAVE_MKDTEMP */ @@ -81,7 +81,7 @@ mktemp_internal(char *path, int slen, int mode) ; if (path + slen >= ep) { errno = EINVAL; - return(-1); + return -1; } ep -= slen; @@ -102,19 +102,19 @@ mktemp_internal(char *path, int slen, int mode) case MKTEMP_FILE: fd = open(path, O_CREAT|O_EXCL|O_RDWR, S_IRUSR|S_IWUSR); if (fd != -1 || errno != EEXIST) - return(fd); + return fd; break; case MKTEMP_DIR: if (mkdir(path, S_IRWXU) == 0) - return(0); + return 0; if (errno != EEXIST) - return(-1); + return -1; break; } } while (--tries); errno = EEXIST; - return(-1); + return -1; } #ifdef HAVE_RANDOM @@ -158,5 +158,5 @@ get_random(void) initialized = 1; } - return(RAND() & 0xffffffff); + return RAND() & 0xffffffff; } diff --git a/compat/nanosleep.c b/compat/nanosleep.c index 435bf3f33..729adf805 100644 --- a/compat/nanosleep.c +++ b/compat/nanosleep.c @@ -50,5 +50,5 @@ nanosleep(const struct timespec *ts, struct timespec *rts) rts->tv_sec = endtime.tv_sec; rts->tv_nsec = endtime.tv_usec * 1000; } - return(rval); + return rval; } diff --git a/compat/regress/glob/globtest.c b/compat/regress/glob/globtest.c index 13a682b81..f20c3c185 100644 --- a/compat/regress/glob/globtest.c +++ b/compat/regress/glob/globtest.c @@ -159,7 +159,7 @@ int test_glob(struct gl_entry *entry) goto mismatch; free(entry->results[i]); } - return (0); + return 0; mismatch: fprintf(stderr, "globtest: mismatch for pattern %s, flags 0x%x " "(found \"%s\", expected \"%s\")\n", entry->pattern, entry->flags, @@ -167,5 +167,5 @@ int test_glob(struct gl_entry *entry) while (i < gl.gl_matchc) { free(entry->results[i++]); } - return (1); + return 1; } diff --git a/compat/snprintf.c b/compat/snprintf.c index 71c11ada1..c097b5076 100644 --- a/compat/snprintf.c +++ b/compat/snprintf.c @@ -142,7 +142,7 @@ __ultoa(unsigned long val, char *endp, int base, int octzero, char *xdigs) case 10: if (val < 10) { /* many numbers are 1 digit */ *--cp = to_char(val); - return (cp); + return cp; } /* * On many machines, unsigned arithmetic is harder than @@ -180,7 +180,7 @@ __ultoa(unsigned long val, char *endp, int base, int octzero, char *xdigs) default: /* oops */ abort(); } - return (cp); + return cp; } /* Identical to __ultoa, but for quads. */ @@ -197,12 +197,12 @@ __uqtoa(unsigned long long val, char *endp, int base, int octzero, char *xdigs) /* quick test for small values; __ultoa is typically much faster */ /* (perhaps instead we should run until small, then call __ultoa?) */ if (val <= (unsigned long long)ULONG_MAX) - return (__ultoa((unsigned long)val, endp, base, octzero, xdigs)); + return __ultoa((unsigned long)val, endp, base, octzero, xdigs); switch (base) { case 10: if (val < 10) { *--cp = to_char(val % 10); - return (cp); + return cp; } if (val > LLONG_MAX) { *--cp = to_char(val % 10); @@ -234,7 +234,7 @@ __uqtoa(unsigned long long val, char *endp, int base, int octzero, char *xdigs) default: /* oops */ abort(); } - return (cp); + return cp; } # endif /* !SIZEOF_LONG_INT */ #endif /* HAVE_LONG_LONG_INT */ @@ -656,7 +656,7 @@ number: if ((dprec = prec) >= 0) done: if (strsize) *str = '\0'; - return (ret); + return ret; /* NOTREACHED */ } @@ -665,7 +665,7 @@ int vsnprintf(char *str, size_t n, const char *fmt, va_list ap) { - return (xxxprintf(&str, n, 0, fmt, ap)); + return xxxprintf(&str, n, 0, fmt, ap); } #endif /* HAVE_VSNPRINTF */ @@ -679,7 +679,7 @@ snprintf(char *str, size_t n, char const *fmt, ...) va_start(ap, fmt); ret = xxxprintf(&str, n, 0, fmt, ap); va_end(ap); - return (ret); + return ret; } #endif /* HAVE_SNPRINTF */ @@ -688,7 +688,7 @@ int vasprintf(char **str, const char *fmt, va_list ap) { - return (xxxprintf(str, 0, 1, fmt, ap)); + return xxxprintf(str, 0, 1, fmt, ap); } #endif /* HAVE_VASPRINTF */ @@ -702,6 +702,6 @@ asprintf(char **str, char const *fmt, ...) va_start(ap, fmt); ret = xxxprintf(str, 0, 1, fmt, ap); va_end(ap); - return (ret); + return ret; } #endif /* HAVE_ASPRINTF */ diff --git a/compat/strlcat.c b/compat/strlcat.c index 91313e6f9..bcfd893f7 100644 --- a/compat/strlcat.c +++ b/compat/strlcat.c @@ -46,7 +46,7 @@ strlcat(char *dst, const char *src, size_t siz) n = siz - dlen; if (n == 0) - return(dlen + strlen(s)); + return dlen + strlen(s); while (*s != '\0') { if (n != 1) { *d++ = *s; @@ -56,5 +56,5 @@ strlcat(char *dst, const char *src, size_t siz) } *d = '\0'; - return(dlen + (s - src)); /* count does not include NUL */ + return dlen + (s - src); /* count does not include NUL */ } diff --git a/compat/strlcpy.c b/compat/strlcpy.c index df29dd2de..9e05a809c 100644 --- a/compat/strlcpy.c +++ b/compat/strlcpy.c @@ -51,5 +51,5 @@ strlcpy(char *dst, const char *src, size_t siz) ; } - return(s - src - 1); /* count does not include NUL */ + return s - src - 1; /* count does not include NUL */ } diff --git a/compat/strsignal.c b/compat/strsignal.c index f68fb9dfe..29010cfb8 100644 --- a/compat/strsignal.c +++ b/compat/strsignal.c @@ -40,6 +40,6 @@ char * strsignal(int signo) { if (signo > 0 && signo < NSIG) - return((char *)my_sys_siglist[signo]); - return("Unknown signal"); + return (char *)my_sys_siglist[signo]; + return "Unknown signal"; } diff --git a/compat/utimes.c b/compat/utimes.c index 8d03a1dae..b9d1a3ec8 100644 --- a/compat/utimes.c +++ b/compat/utimes.c @@ -44,9 +44,9 @@ utimes(const char *file, const struct timeval *times) utb.actime = (time_t)(times[0].tv_sec + times[0].tv_usec / 1000000); utb.modtime = (time_t)(times[1].tv_sec + times[1].tv_usec / 1000000); - return(utime(file, &utb)); + return utime(file, &utb); } else - return(utime(file, NULL)); + return utime(file, NULL); } #endif /* !HAVE_UTIMES */ @@ -62,8 +62,8 @@ futimes(int fd, const struct timeval *times) utb.actime = (time_t)(times[0].tv_sec + times[0].tv_usec / 1000000); utb.modtime = (time_t)(times[1].tv_sec + times[1].tv_usec / 1000000); - return(futime(fd, &utb)); + return futime(fd, &utb); } else - return(futime(fd, NULL)); + return futime(fd, NULL); } #endif /* HAVE_FUTIME */ diff --git a/plugins/sample/sample_plugin.c b/plugins/sample/sample_plugin.c index c337637d4..34074b55d 100644 --- a/plugins/sample/sample_plugin.c +++ b/plugins/sample/sample_plugin.c @@ -104,7 +104,7 @@ fmt_string(const char *var, const char *val) *cp = '\0'; } - return(str); + return str; } /* diff --git a/plugins/sample_group/getgrent.c b/plugins/sample_group/getgrent.c index 714bd6fa3..08ccfe0c6 100644 --- a/plugins/sample_group/getgrent.c +++ b/plugins/sample_group/getgrent.c @@ -106,19 +106,19 @@ mygetgrent(void) int n; if ((colon = fgets(grbuf, sizeof(grbuf), grf)) == NULL) - return(NULL); + return NULL; memset(&gr, 0, sizeof(gr)); if ((colon = strchr(cp = colon, ':')) == NULL) - return(NULL); + return NULL; *colon++ = '\0'; gr.gr_name = cp; if ((colon = strchr(cp = colon, ':')) == NULL) - return(NULL); + return NULL; *colon++ = '\0'; gr.gr_passwd = cp; if ((colon = strchr(cp = colon, ':')) == NULL) - return(NULL); + return NULL; *colon++ = '\0'; gr.gr_gid = atoi(cp); len = strlen(colon); @@ -134,7 +134,7 @@ mygetgrent(void) gr.gr_mem[n++] = NULL; } else gr.gr_mem = NULL; - return(&gr); + return &gr; } struct group * @@ -144,7 +144,7 @@ mygetgrnam(const char *name) if (grf == NULL) { if ((grf = fopen(grfile, "r")) == NULL) - return(NULL); + return NULL; fcntl(fileno(grf), F_SETFD, FD_CLOEXEC); } else { rewind(grf); @@ -157,7 +157,7 @@ mygetgrnam(const char *name) fclose(grf); grf = NULL; } - return(gr); + return gr; } struct group * @@ -167,7 +167,7 @@ mygetgrgid(gid_t gid) if (grf == NULL) { if ((grf = fopen(grfile, "r")) == NULL) - return(NULL); + return NULL; fcntl(fileno(grf), F_SETFD, FD_CLOEXEC); } else { rewind(grf); @@ -180,5 +180,5 @@ mygetgrgid(gid_t gid) fclose(grf); grf = NULL; } - return(gr); + return gr; } diff --git a/plugins/sample_group/plugin_test.c b/plugins/sample_group/plugin_test.c index 69396f6bb..0f673b2cd 100644 --- a/plugins/sample_group/plugin_test.c +++ b/plugins/sample_group/plugin_test.c @@ -154,7 +154,7 @@ static int group_plugin_query(const char *user, const char *group, const struct passwd *pwd) { - return (group_plugin->query)(user, group, pwd); + return group_plugin->query)(user, group, pwd; } static void diff --git a/plugins/sudoers/alias.c b/plugins/sudoers/alias.c index 1474eb981..acd70b208 100644 --- a/plugins/sudoers/alias.c +++ b/plugins/sudoers/alias.c @@ -68,7 +68,7 @@ alias_compare(const void *v1, const void *v2) res = 1; else if ((res = strcmp(a1->name, a2->name)) == 0) res = a1->type - a2->type; - return(res); + return res; } /* @@ -92,10 +92,10 @@ alias_find(char *name, int type) */ a = node->data; if (a->seqno == alias_seqno) - return(NULL); + return NULL; a->seqno = alias_seqno; } - return(a); + return a; } /* @@ -116,9 +116,9 @@ alias_add(char *name, int type, struct member *members) if (rbinsert(aliases, a)) { snprintf(errbuf, sizeof(errbuf), "Alias `%s' already defined", name); alias_free(a); - return(errbuf); + return errbuf; } - return(NULL); + return NULL; } /* @@ -136,7 +136,7 @@ alias_apply(int (*func)(void *, void *), void *cookie) int no_aliases(void) { - return(rbisempty(aliases)); + return rbisempty(aliases); } /* @@ -176,9 +176,9 @@ alias_remove(char *name, int type) key.name = name; key.type = type; if ((node = rbfind(aliases, &key)) == NULL) - return(NULL); + return NULL; a = rbdelete(aliases, node); - return(a); + return a; } void diff --git a/plugins/sudoers/auth/afs.c b/plugins/sudoers/auth/afs.c index 57d99f3e8..b02cf75b2 100644 --- a/plugins/sudoers/auth/afs.c +++ b/plugins/sudoers/auth/afs.c @@ -64,7 +64,7 @@ afs_verify(struct passwd *pw, char *pass, sudo_auth *auth) 0, /* lifetime */ &afs_token, /* token */ 0) == 0) /* new */ - return(AUTH_SUCCESS); + return AUTH_SUCCESS; /* Fall back on old method XXX - needed? */ setpag(); @@ -77,7 +77,7 @@ afs_verify(struct passwd *pw, char *pass, sudo_auth *auth) NULL, /* expiration ptr (unused) */ 0, /* spare */ NULL) == 0) /* reason */ - return(AUTH_SUCCESS); + return AUTH_SUCCESS; - return(AUTH_FAILURE); + return AUTH_FAILURE; } diff --git a/plugins/sudoers/auth/aix_auth.c b/plugins/sudoers/auth/aix_auth.c index f1a464701..238c33065 100644 --- a/plugins/sudoers/auth/aix_auth.c +++ b/plugins/sudoers/auth/aix_auth.c @@ -65,7 +65,7 @@ aixauth_verify(struct passwd *pw, char *prompt, sudo_auth *auth) free(message); zero_bytes(pass, strlen(pass)); } - return(rval); + return rval; } int @@ -74,5 +74,5 @@ aixauth_cleanup(struct passwd *pw, sudo_auth *auth) /* Unset AUTHSTATE as it may not be correct for the runas user. */ unsetenv("AUTHSTATE"); - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } diff --git a/plugins/sudoers/auth/bsdauth.c b/plugins/sudoers/auth/bsdauth.c index 07d52b7a4..2203f6863 100644 --- a/plugins/sudoers/auth/bsdauth.c +++ b/plugins/sudoers/auth/bsdauth.c @@ -62,7 +62,7 @@ bsdauth_init(struct passwd *pw, char **promptp, sudo_auth *auth) if ((as = auth_open()) == NULL) { log_error(USE_ERRNO|NO_EXIT|NO_MAIL, "unable to begin bsd authentication"); - return(AUTH_FATAL); + return AUTH_FATAL; } /* XXX - maybe sanity check the auth style earlier? */ @@ -70,7 +70,7 @@ bsdauth_init(struct passwd *pw, char **promptp, sudo_auth *auth) if (login_style == NULL) { log_error(NO_EXIT|NO_MAIL, "invalid authentication type"); auth_close(as); - return(AUTH_FATAL); + return AUTH_FATAL; } if (auth_setitem(as, AUTHV_STYLE, login_style) < 0 || @@ -78,11 +78,11 @@ bsdauth_init(struct passwd *pw, char **promptp, sudo_auth *auth) auth_setitem(as, AUTHV_CLASS, login_class) < 0) { log_error(NO_EXIT|NO_MAIL, "unable to setup authentication"); auth_close(as); - return(AUTH_FATAL); + return AUTH_FATAL; } auth->data = (void *) as; - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } int @@ -140,14 +140,14 @@ bsdauth_verify(struct passwd *pw, char *prompt, sudo_auth *auth) (void) sigaction(SIGCHLD, &osa, NULL); if (authok) - return(AUTH_SUCCESS); + return AUTH_SUCCESS; if (!pass) - return(AUTH_INTR); + return AUTH_INTR; if ((s = auth_getvalue(as, "errormsg")) != NULL) log_error(NO_EXIT|NO_MAIL, "%s", s); - return(AUTH_FAILURE); + return AUTH_FAILURE; } int @@ -157,5 +157,5 @@ bsdauth_cleanup(struct passwd *pw, sudo_auth *auth) auth_close(as); - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } diff --git a/plugins/sudoers/auth/dce.c b/plugins/sudoers/auth/dce.c index 8be59894b..1b350a551 100644 --- a/plugins/sudoers/auth/dce.c +++ b/plugins/sudoers/auth/dce.c @@ -86,7 +86,7 @@ dce_verify(struct passwd *pw, char *plain_pw, sudo_auth *auth) sec_login_no_flags, &login_context, &status)) { if (check_dce_status(status, "sec_login_setup_identity(1):")) - return(AUTH_FAILURE); + return AUTH_FAILURE; password_rec.key.key_type = sec_passwd_plain; password_rec.key.tagged_union.plain = (idl_char *) plain_pw; @@ -98,7 +98,7 @@ dce_verify(struct passwd *pw, char *plain_pw, sudo_auth *auth) &reset_passwd, &auth_src, &status)) { if (check_dce_status(status, "sec_login_validate_identity(1):")) - return(AUTH_FAILURE); + return AUTH_FAILURE; /* * Certify that the DCE Security Server used to set @@ -108,10 +108,10 @@ dce_verify(struct passwd *pw, char *plain_pw, sudo_auth *auth) if (!sec_login_certify_identity(login_context, &status)) { (void) fprintf(stderr, "Whoa! Bogus authentication server!\n"); (void) check_dce_status(status,"sec_login_certify_identity(1):"); - return(AUTH_FAILURE); + return AUTH_FAILURE; } if (check_dce_status(status, "sec_login_certify_identity(2):")) - return(AUTH_FAILURE); + return AUTH_FAILURE; /* * Sets the network credentials to those specified @@ -119,7 +119,7 @@ dce_verify(struct passwd *pw, char *plain_pw, sudo_auth *auth) */ sec_login_set_context(login_context, &status); if (check_dce_status(status, "sec_login_set_context:")) - return(AUTH_FAILURE); + return AUTH_FAILURE; /* * Oops, your credentials were no good. Possibly @@ -129,13 +129,13 @@ dce_verify(struct passwd *pw, char *plain_pw, sudo_auth *auth) if (auth_src != sec_login_auth_src_network) { (void) fprintf(stderr, "You have no network credentials.\n"); - return(AUTH_FAILURE); + return AUTH_FAILURE; } /* Check if the password has aged and is thus no good */ if (reset_passwd) { (void) fprintf(stderr, "Your DCE password needs resetting.\n"); - return(AUTH_FAILURE); + return AUTH_FAILURE; } /* @@ -147,7 +147,7 @@ dce_verify(struct passwd *pw, char *plain_pw, sudo_auth *auth) sec_login_get_pwent(login_context, (sec_login_passwd_t) &temp_pw, &status); if (check_dce_status(status, "sec_login_get_pwent:")) - return(AUTH_FAILURE); + return AUTH_FAILURE; /* * If we get to here, then the pwent above properly fetched @@ -169,17 +169,17 @@ dce_verify(struct passwd *pw, char *plain_pw, sudo_auth *auth) * somewhere later in the program. */ sec_login_purge_context(&login_context, &status); - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } else { if(check_dce_status(status, "sec_login_validate_identity(2):")) - return(AUTH_FAILURE); + return AUTH_FAILURE; sec_login_purge_context(&login_context, &status); if(check_dce_status(status, "sec_login_purge_context:")) - return(AUTH_FAILURE); + return AUTH_FAILURE; } } (void) check_dce_status(status, "sec_login_setup_identity(2):"); - return(AUTH_FAILURE); + return AUTH_FAILURE; } /* Returns 0 for DCE "ok" status, 1 otherwise */ @@ -190,8 +190,8 @@ check_dce_status(error_status_t input_status, char *comment) unsigned char error_string[dce_c_error_string_len]; if (input_status == rpc_s_ok) - return(0); + return 0; dce_error_inq_text(input_status, error_string, &error_stat); (void) fprintf(stderr, "%s %s\n", comment, error_string); - return(1); + return 1; } diff --git a/plugins/sudoers/auth/fwtk.c b/plugins/sudoers/auth/fwtk.c index 65da060ca..c3cca05a6 100644 --- a/plugins/sudoers/auth/fwtk.c +++ b/plugins/sudoers/auth/fwtk.c @@ -57,25 +57,25 @@ fwtk_init(struct passwd *pw, char **promptp, sudo_auth *auth) if ((confp = cfg_read("sudo")) == (Cfg *)-1) { warningx("cannot read fwtk config"); - return(AUTH_FATAL); + return AUTH_FATAL; } if (auth_open(confp)) { warningx("cannot connect to authentication server"); - return(AUTH_FATAL); + return AUTH_FATAL; } /* Get welcome message from auth server */ if (auth_recv(resp, sizeof(resp))) { warningx("lost connection to authentication server"); - return(AUTH_FATAL); + return AUTH_FATAL; } if (strncmp(resp, "Authsrv ready", 13) != 0) { warningx("authentication server error:\n%s", resp); - return(AUTH_FATAL); + return AUTH_FATAL; } - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } int @@ -91,7 +91,7 @@ fwtk_verify(struct passwd *pw, char *prompt, sudo_auth *auth) restart: if (auth_send(buf) || auth_recv(resp, sizeof(resp))) { warningx("lost connection to authentication server"); - return(AUTH_FATAL); + return AUTH_FATAL; } /* Get the password/response from the user. */ @@ -114,10 +114,10 @@ restart: goto restart; } else { warningx("%s", resp); - return(AUTH_FATAL); + return AUTH_FATAL; } if (!pass) { /* ^C or error */ - return(AUTH_INTR); + return AUTH_INTR; } /* Send the user's response to the server */ @@ -140,7 +140,7 @@ restart: done: zero_bytes(pass, strlen(pass)); zero_bytes(buf, strlen(buf)); - return(error); + return error; } int @@ -148,5 +148,5 @@ fwtk_cleanup(struct passwd *pw, sudo_auth *auth) { auth_close(); - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } diff --git a/plugins/sudoers/auth/kerb4.c b/plugins/sudoers/auth/kerb4.c index 671d5821a..8a122119c 100644 --- a/plugins/sudoers/auth/kerb4.c +++ b/plugins/sudoers/auth/kerb4.c @@ -54,16 +54,16 @@ kerb4_init(struct passwd *pw, char **promptp, sudo_auth *auth) /* Don't try to verify root */ if (pw->pw_uid == 0) - return(AUTH_FAILURE); + return AUTH_FAILURE; /* Get the local realm, or retrun failure (no krb.conf) */ if (krb_get_lrealm(realm, 1) != KSUCCESS) - return(AUTH_FAILURE); + return AUTH_FAILURE; /* Stash a pointer to the realm (used in kerb4_verify) */ auth->data = (void *) realm; - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } int @@ -88,7 +88,7 @@ kerb4_verify(struct passwd *pw, char *pass, sudo_auth *auth) switch (error) { case INTK_OK: dest_tkt(); /* we are done with the temp ticket */ - return(AUTH_SUCCESS); + return AUTH_SUCCESS; break; case INTK_BADPW: case KDC_PR_UNKNOWN: @@ -98,5 +98,5 @@ kerb4_verify(struct passwd *pw, char *pass, sudo_auth *auth) krb_err_txt[error]); } - return(AUTH_FAILURE); + return AUTH_FAILURE; } diff --git a/plugins/sudoers/auth/kerb5.c b/plugins/sudoers/auth/kerb5.c index e93503842..9be1dade5 100644 --- a/plugins/sudoers/auth/kerb5.c +++ b/plugins/sudoers/auth/kerb5.c @@ -105,7 +105,7 @@ kerb5_init(struct passwd *pw, char **promptp, sudo_auth *auth) error = krb5_init_context(&(sudo_krb5_data.sudo_context)); #endif if (error) - return(AUTH_FAILURE); + return AUTH_FAILURE; sudo_context = sudo_krb5_data.sudo_context; if ((error = krb5_parse_name(sudo_context, pw->pw_name, @@ -113,7 +113,7 @@ kerb5_init(struct passwd *pw, char **promptp, sudo_auth *auth) log_error(NO_EXIT|NO_MAIL, "%s: unable to parse '%s': %s", auth->name, pw->pw_name, error_message(error)); - return(AUTH_FAILURE); + return AUTH_FAILURE; } princ = sudo_krb5_data.princ; @@ -126,7 +126,7 @@ kerb5_init(struct passwd *pw, char **promptp, sudo_auth *auth) log_error(NO_EXIT|NO_MAIL, "%s: unable to unparse princ ('%s'): %s", auth->name, pw->pw_name, error_message(error)); - return(AUTH_FAILURE); + return AUTH_FAILURE; } /* Only rewrite prompt if user didn't specify their own. */ @@ -143,11 +143,11 @@ kerb5_init(struct passwd *pw, char **promptp, sudo_auth *auth) log_error(NO_EXIT|NO_MAIL, "%s: unable to resolve ccache: %s", auth->name, error_message(error)); - return(AUTH_FAILURE); + return AUTH_FAILURE; } ccache = sudo_krb5_data.ccache; - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } #ifdef HAVE_KRB5_VERIFY_USER @@ -164,7 +164,7 @@ kerb5_verify(struct passwd *pw, char *pass, sudo_auth *auth) ccache = ((sudo_krb5_datap) auth->data)->ccache; error = krb5_verify_user(sudo_context, princ, ccache, pass, 1, NULL); - return (error ? AUTH_FAILURE : AUTH_SUCCESS); + return error ? AUTH_FAILURE : AUTH_SUCCESS; } #else int @@ -232,7 +232,7 @@ done: } if (creds) krb5_free_cred_contents(sudo_context, creds); - return (error ? AUTH_FAILURE : AUTH_SUCCESS); + return error ? AUTH_FAILURE : AUTH_SUCCESS; } #endif @@ -255,7 +255,7 @@ kerb5_cleanup(struct passwd *pw, sudo_auth *auth) krb5_free_context(sudo_context); } - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } #ifndef HAVE_KRB5_VERIFY_USER @@ -283,7 +283,7 @@ verify_krb_v5_tgt(krb5_context sudo_context, krb5_creds *cred, char *auth_name) log_error(NO_EXIT|NO_MAIL, "%s: unable to get host principal: %s", auth_name, error_message(error)); - return(-1); + return -1; } /* Initialize verify opts and set secure mode */ @@ -298,6 +298,6 @@ verify_krb_v5_tgt(krb5_context sudo_context, krb5_creds *cred, char *auth_name) log_error(NO_EXIT|NO_MAIL, "%s: Cannot verify TGT! Possible attack!: %s", auth_name, error_message(error)); - return(error); + return error; } #endif diff --git a/plugins/sudoers/auth/pam.c b/plugins/sudoers/auth/pam.c index d828e03f5..bf863a992 100644 --- a/plugins/sudoers/auth/pam.c +++ b/plugins/sudoers/auth/pam.c @@ -98,7 +98,7 @@ pam_init(struct passwd *pw, char **promptp, sudo_auth *auth) pam_status = pam_start("sudo", pw->pw_name, &pam_conv, &pamh); if (pam_status != PAM_SUCCESS) { log_error(USE_ERRNO|NO_EXIT|NO_MAIL, "unable to initialize PAM"); - return(AUTH_FATAL); + return AUTH_FATAL; } /* @@ -120,7 +120,7 @@ pam_init(struct passwd *pw, char **promptp, sudo_auth *auth) else (void) pam_set_item(pamh, PAM_TTY, user_ttypath); - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } int @@ -138,11 +138,11 @@ pam_verify(struct passwd *pw, char *prompt, sudo_auth *auth) *pam_status = pam_acct_mgmt(pamh, PAM_SILENT); switch (*pam_status) { case PAM_SUCCESS: - return(AUTH_SUCCESS); + return AUTH_SUCCESS; case PAM_AUTH_ERR: log_error(NO_EXIT|NO_MAIL, "account validation failure, is your account locked?"); - return(AUTH_FATAL); + return AUTH_FATAL; case PAM_NEW_AUTHTOK_REQD: log_error(NO_EXIT|NO_MAIL, "%s, %s", "Account or password is expired", @@ -150,33 +150,33 @@ pam_verify(struct passwd *pw, char *prompt, sudo_auth *auth) *pam_status = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK); if (*pam_status == PAM_SUCCESS) - return(AUTH_SUCCESS); + return AUTH_SUCCESS; if ((s = pam_strerror(pamh, *pam_status))) log_error(NO_EXIT|NO_MAIL, "pam_chauthtok: %s", s); - return(AUTH_FAILURE); + return AUTH_FAILURE; case PAM_AUTHTOK_EXPIRED: log_error(NO_EXIT|NO_MAIL, "Password expired, contact your system administrator"); - return(AUTH_FATAL); + return AUTH_FATAL; case PAM_ACCT_EXPIRED: log_error(NO_EXIT|NO_MAIL, "%s %s", "Account expired or PAM config lacks an \"account\"", "section for sudo, contact your system administrator"); - return(AUTH_FATAL); + return AUTH_FATAL; } /* FALLTHROUGH */ case PAM_AUTH_ERR: if (gotintr) { /* error or ^C from tgetpass() */ - return(AUTH_INTR); + return AUTH_INTR; } case PAM_MAXTRIES: case PAM_PERM_DENIED: - return(AUTH_FAILURE); + return AUTH_FAILURE; default: if ((s = pam_strerror(pamh, *pam_status))) log_error(NO_EXIT|NO_MAIL, "pam_authenticate: %s", s); - return(AUTH_FATAL); + return AUTH_FATAL; } } @@ -187,10 +187,10 @@ pam_cleanup(struct passwd *pw, sudo_auth *auth) /* If successful, we can't close the session until pam_end_session() */ if (auth->status == AUTH_SUCCESS) - return(AUTH_SUCCESS); + return AUTH_SUCCESS; *pam_status = pam_end(pamh, *pam_status | PAM_DATA_SILENT); - return(*pam_status == PAM_SUCCESS ? AUTH_SUCCESS : AUTH_FAILURE); + return *pam_status == PAM_SUCCESS ? AUTH_SUCCESS : AUTH_FAILURE; } int @@ -240,7 +240,7 @@ pam_begin_session(struct passwd *pw, sudo_auth *auth) #endif done: - return(status == PAM_SUCCESS ? AUTH_SUCCESS : AUTH_FAILURE); + return status == PAM_SUCCESS ? AUTH_SUCCESS : AUTH_FAILURE; } int @@ -254,7 +254,7 @@ pam_end_session(sudo_auth *auth) #endif status = pam_end(pamh, PAM_SUCCESS | PAM_DATA_SILENT); } - return(status == PAM_SUCCESS ? AUTH_SUCCESS : AUTH_FAILURE); + return status == PAM_SUCCESS ? AUTH_SUCCESS : AUTH_FAILURE; } /* @@ -272,7 +272,7 @@ converse(int num_msg, PAM_CONST struct pam_message **msg, int n, type, std_prompt; if ((*response = malloc(num_msg * sizeof(struct pam_response))) == NULL) - return(PAM_SYSTEM_ERR); + return PAM_SYSTEM_ERR; zero_bytes(*response, num_msg * sizeof(struct pam_response)); for (pr = *response, pm = *msg, n = num_msg; n--; pr++, pm++) { @@ -334,7 +334,7 @@ converse(int num_msg, PAM_CONST struct pam_message **msg, } } - return(PAM_SUCCESS); + return PAM_SUCCESS; err: /* Zero and free allocated memory and return an error. */ @@ -348,5 +348,5 @@ err: zero_bytes(*response, num_msg * sizeof(struct pam_response)); free(*response); *response = NULL; - return(gotintr ? PAM_AUTH_ERR : PAM_CONV_ERR); + return gotintr ? PAM_AUTH_ERR : PAM_CONV_ERR; } diff --git a/plugins/sudoers/auth/passwd.c b/plugins/sudoers/auth/passwd.c index eaf1f5377..7e5e7d2ce 100644 --- a/plugins/sudoers/auth/passwd.c +++ b/plugins/sudoers/auth/passwd.c @@ -53,12 +53,12 @@ passwd_init(struct passwd *pw, char **promptp, sudo_auth *auth) { #ifdef HAVE_SKEYACCESS if (skeyaccess(pw, user_tty, NULL, NULL) == 0) - return(AUTH_FAILURE); + return AUTH_FAILURE; #endif sudo_setspent(); auth->data = sudo_getepw(pw); sudo_endspent(); - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } int @@ -75,7 +75,7 @@ passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth) /* Ultrix shadow passwords may use crypt16() */ error = strcmp(pw_epasswd, (char *) crypt16(pass, pw_epasswd)); if (!error) - return(AUTH_SUCCESS); + return AUTH_SUCCESS; #endif /* HAVE_GETAUTHUID */ /* @@ -98,7 +98,7 @@ passwd_verify(struct passwd *pw, char *pass, sudo_auth *auth) else error = strcmp(pw_epasswd, epass); - return(error ? AUTH_FAILURE : AUTH_SUCCESS); + return error ? AUTH_FAILURE : AUTH_SUCCESS; } int @@ -112,5 +112,5 @@ passwd_cleanup(pw, auth) zero_bytes(pw_epasswd, strlen(pw_epasswd)); efree(pw_epasswd); } - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } diff --git a/plugins/sudoers/auth/rfc1938.c b/plugins/sudoers/auth/rfc1938.c index bfed5d4f4..5b597a8b6 100644 --- a/plugins/sudoers/auth/rfc1938.c +++ b/plugins/sudoers/auth/rfc1938.c @@ -101,9 +101,9 @@ rfc1938_setup(struct passwd *pw, char **promptp, sudo_auth *auth) if (rfc1938challenge(&rfc1938, pw->pw_name, challenge, sizeof(challenge))) { if (IS_ONEANDONLY(auth)) { warningx("you do not exist in the %s database", auth->name); - return(AUTH_FATAL); + return AUTH_FATAL; } else { - return(AUTH_FAILURE); + return AUTH_FAILURE; } } @@ -120,7 +120,7 @@ rfc1938_setup(struct passwd *pw, char **promptp, sudo_auth *auth) orig_prompt, challenge); *promptp = new_prompt; - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } int @@ -128,7 +128,7 @@ rfc1938_verify(struct passwd *pw, char *pass, sudo_auth *auth) { if (rfc1938verify((struct RFC1938 *) auth->data, pass) == 0) - return(AUTH_SUCCESS); + return AUTH_SUCCESS; else - return(AUTH_FAILURE); + return AUTH_FAILURE; } diff --git a/plugins/sudoers/auth/secureware.c b/plugins/sudoers/auth/secureware.c index 6ddfae70d..3efe6d815 100644 --- a/plugins/sudoers/auth/secureware.c +++ b/plugins/sudoers/auth/secureware.c @@ -59,12 +59,12 @@ secureware_init(struct passwd *pw, char **promptp, sudo_auth *auth) extern int crypt_type; if (crypt_type == INT_MAX) - return(AUTH_FAILURE); /* no shadow */ + return AUTH_FAILURE; /* no shadow */ #endif sudo_setspent(); auth->data = sudo_getepw(pw); sudo_endspent(); - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } int @@ -76,22 +76,22 @@ secureware_verify(struct passwd *pw, char *pass, sudo_auth *auth) # ifdef HAVE_DISPCRYPT if (strcmp(pw_epasswd, dispcrypt(pass, pw_epasswd, crypt_type)) == 0) - return(AUTH_SUCCESS); + return AUTH_SUCCESS; # else if (crypt_type == AUTH_CRYPT_BIGCRYPT) { if (strcmp(pw_epasswd, bigcrypt(pass, pw_epasswd)) == 0) - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } else if (crypt_type == AUTH_CRYPT_CRYPT16) { if (strcmp(pw_epasswd, crypt(pass, pw_epasswd)) == 0) - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } # endif /* HAVE_DISPCRYPT */ #elif defined(HAVE_BIGCRYPT) if (strcmp(pw_epasswd, bigcrypt(pass, pw_epasswd)) == 0) - return(AUTH_SUCCESS); + return AUTH_SUCCESS; #endif /* __alpha */ - return(AUTH_FAILURE); + return AUTH_FAILURE; } int @@ -105,5 +105,5 @@ secureware_cleanup(pw, auth) zero_bytes(pw_epasswd, strlen(pw_epasswd)); efree(pw_epasswd); } - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } diff --git a/plugins/sudoers/auth/securid.c b/plugins/sudoers/auth/securid.c index dab2d5495..db4fb8687 100644 --- a/plugins/sudoers/auth/securid.c +++ b/plugins/sudoers/auth/securid.c @@ -63,9 +63,9 @@ securid_init(struct passwd *pw, char **promptp, sudo_auth *auth) auth->data = (void *) &sd_dat; /* For method-specific data */ if (creadcfg() == 0) - return(AUTH_SUCCESS); + return AUTH_SUCCESS; else - return(AUTH_FATAL); + return AUTH_FATAL; } int @@ -77,10 +77,10 @@ securid_setup(struct passwd *pw, char **promptp, sudo_auth *auth) if (sd_init(sd) == 0) { /* The programmer's guide says username is 32 bytes */ strlcpy(sd->username, pw->pw_name, 32); - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } else { warningx("unable to contact the SecurID server"); - return(AUTH_FATAL); + return AUTH_FATAL; } } @@ -93,7 +93,7 @@ securid_verify(struct passwd *pw, char *pass, sudo_auth *auth) rval = sd_auth(sd); sd_close(); if (rval == ACM_OK) - return(AUTH_SUCCESS); + return AUTH_SUCCESS; else - return(AUTH_FAILURE); + return AUTH_FAILURE; } diff --git a/plugins/sudoers/auth/securid5.c b/plugins/sudoers/auth/securid5.c index 99e1dae97..68c9ada37 100644 --- a/plugins/sudoers/auth/securid5.c +++ b/plugins/sudoers/auth/securid5.c @@ -76,10 +76,10 @@ securid_init(struct passwd *pw, char **promptp, sudo_auth *auth) /* Start communications */ if (AceInitialize() != SD_FALSE) - return(AUTH_SUCCESS); + return AUTH_SUCCESS; warningx("failed to initialise the ACE API library"); - return(AUTH_FATAL); + return AUTH_FATAL; } /* @@ -104,7 +104,7 @@ securid_setup(struct passwd *pw, char **promptp, sudo_auth *auth) /* Re-initialize SecurID every time. */ if (SD_Init(sd) != ACM_OK) { warningx("unable to contact the SecurID server"); - return(AUTH_FATAL); + return AUTH_FATAL; } /* Lock new PIN code */ @@ -113,23 +113,23 @@ securid_setup(struct passwd *pw, char **promptp, sudo_auth *auth) switch (retval) { case ACM_OK: warningx("User ID locked for SecurID Authentication"); - return(AUTH_SUCCESS); + return AUTH_SUCCESS; case ACE_UNDEFINED_USERNAME: warningx("invalid username length for SecurID"); - return(AUTH_FATAL); + return AUTH_FATAL; case ACE_ERR_INVALID_HANDLE: warningx("invalid Authentication Handle for SecurID"); - return(AUTH_FATAL); + return AUTH_FATAL; case ACM_ACCESS_DENIED: warningx("SecurID communication failed"); - return(AUTH_FATAL); + return AUTH_FATAL; default: warningx("unknown SecurID error"); - return(AUTH_FATAL); + return AUTH_FATAL; } } @@ -219,5 +219,5 @@ then enter the new token code.\n", \ SD_Close(*sd); /* Return stored state to calling process */ - return(rval); + return rval; } diff --git a/plugins/sudoers/auth/sia.c b/plugins/sudoers/auth/sia.c index ca73049be..874373924 100644 --- a/plugins/sudoers/auth/sia.c +++ b/plugins/sudoers/auth/sia.c @@ -94,11 +94,11 @@ sia_setup(struct passwd *pw, char **promptp, sudo_auth *auth) log_error(USE_ERRNO|NO_EXIT|NO_MAIL, "unable to initialize SIA session"); - return(AUTH_FATAL); + return AUTH_FATAL; } auth->data = (void *) siah; - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } int @@ -110,9 +110,9 @@ sia_verify(struct passwd *pw, char *prompt, sudo_auth *auth) /* XXX - need a way to detect user hitting return or EOF at prompt */ if (sia_ses_reauthent(sudo_collect, siah) == SIASUCCESS) - return(AUTH_SUCCESS); + return AUTH_SUCCESS; else - return(AUTH_FAILURE); + return AUTH_FAILURE; } int @@ -121,5 +121,5 @@ sia_cleanup(struct passwd *pw, sudo_auth *auth) SIAENTITY *siah = (SIAENTITY *) auth->data; (void) sia_ses_release(&siah); - return(AUTH_SUCCESS); + return AUTH_SUCCESS; } diff --git a/plugins/sudoers/bsm_audit.c b/plugins/sudoers/bsm_audit.c index 2a347c916..94ed4a8bf 100644 --- a/plugins/sudoers/bsm_audit.c +++ b/plugins/sudoers/bsm_audit.c @@ -63,7 +63,7 @@ audit_sudo_selected(int sf) mask = &ainfo_addr.ai_mask; sorf = (sf == 0) ? AU_PRS_SUCCESS : AU_PRS_FAILURE; rc = au_preselect(AUE_sudo, mask, sorf, AU_PRS_REREAD); - return (rc); + return rc; } void diff --git a/plugins/sudoers/check.c b/plugins/sudoers/check.c index b825bee0b..b72b287c7 100644 --- a/plugins/sudoers/check.c +++ b/plugins/sudoers/check.c @@ -359,7 +359,7 @@ expand_prompt(char *old_prompt, char *user, char *host) } else new_prompt = old_prompt; - return(new_prompt); + return new_prompt; oflow: /* We pre-allocate enough space, so this should never happen. */ @@ -373,8 +373,8 @@ int user_is_exempt(void) { if (!def_exempt_group) - return(FALSE); - return(user_in_group(sudo_user.pw, def_exempt_group)); + return FALSE; + return user_in_group(sudo_user.pw, def_exempt_group); } /* @@ -621,7 +621,7 @@ timestamp_status(char *timestampdir, char *timestampfile, char *user, int flags) done: if (timestamp_uid != 0) restore_perms(); - return(status); + return status; } /* @@ -723,5 +723,5 @@ get_authpw(void) pw = sudo_user.pw; } - return(pw); + return pw; } diff --git a/plugins/sudoers/defaults.c b/plugins/sudoers/defaults.c index a416e28e1..b83443207 100644 --- a/plugins/sudoers/defaults.c +++ b/plugins/sudoers/defaults.c @@ -236,7 +236,7 @@ set_default(char *var, char *val, int op) } if (!cur->name) { warningx("unknown defaults entry `%s'", var); - return(FALSE); + return FALSE; } switch (cur->type & T_MASK) { @@ -246,7 +246,7 @@ set_default(char *var, char *val, int op) warningx("value `%s' is invalid for option `%s'", val, var); else warningx("no value specified for `%s'", var); - return(FALSE); + return FALSE; } break; case T_LOGPRI: @@ -255,7 +255,7 @@ set_default(char *var, char *val, int op) warningx("value `%s' is invalid for option `%s'", val, var); else warningx("no value specified for `%s'", var); - return(FALSE); + return FALSE; } break; case T_STR: @@ -263,16 +263,16 @@ set_default(char *var, char *val, int op) /* Check for bogus boolean usage or lack of a value. */ if (!ISSET(cur->type, T_BOOL) || op != FALSE) { warningx("no value specified for `%s'", var); - return(FALSE); + return FALSE; } } if (ISSET(cur->type, T_PATH) && val && *val != '/') { warningx("values for `%s' must start with a '/'", var); - return(FALSE); + return FALSE; } if (!store_str(val, cur, op)) { warningx("value `%s' is invalid for option `%s'", val, var); - return(FALSE); + return FALSE; } break; case T_INT: @@ -280,12 +280,12 @@ set_default(char *var, char *val, int op) /* Check for bogus boolean usage or lack of a value. */ if (!ISSET(cur->type, T_BOOL) || op != FALSE) { warningx("no value specified for `%s'", var); - return(FALSE); + return FALSE; } } if (!store_int(val, cur, op)) { warningx("value `%s' is invalid for option `%s'", val, var); - return(FALSE); + return FALSE; } break; case T_UINT: @@ -293,12 +293,12 @@ set_default(char *var, char *val, int op) /* Check for bogus boolean usage or lack of a value. */ if (!ISSET(cur->type, T_BOOL) || op != FALSE) { warningx("no value specified for `%s'", var); - return(FALSE); + return FALSE; } } if (!store_uint(val, cur, op)) { warningx("value `%s' is invalid for option `%s'", val, var); - return(FALSE); + return FALSE; } break; case T_FLOAT: @@ -306,12 +306,12 @@ set_default(char *var, char *val, int op) /* Check for bogus boolean usage or lack of a value. */ if (!ISSET(cur->type, T_BOOL) || op != FALSE) { warningx("no value specified for `%s'", var); - return(FALSE); + return FALSE; } } if (!store_float(val, cur, op)) { warningx("value `%s' is invalid for option `%s'", val, var); - return(FALSE); + return FALSE; } break; case T_MODE: @@ -319,18 +319,18 @@ set_default(char *var, char *val, int op) /* Check for bogus boolean usage or lack of a value. */ if (!ISSET(cur->type, T_BOOL) || op != FALSE) { warningx("no value specified for `%s'", var); - return(FALSE); + return FALSE; } } if (!store_mode(val, cur, op)) { warningx("value `%s' is invalid for option `%s'", val, var); - return(FALSE); + return FALSE; } break; case T_FLAG: if (val) { warningx("option `%s' does not take a value", var); - return(FALSE); + return FALSE; } cur->sd_un.flag = op; break; @@ -339,27 +339,27 @@ set_default(char *var, char *val, int op) /* Check for bogus boolean usage or lack of a value. */ if (!ISSET(cur->type, T_BOOL) || op != FALSE) { warningx("no value specified for `%s'", var); - return(FALSE); + return FALSE; } } if (!store_list(val, cur, op)) { warningx("value `%s' is invalid for option `%s'", val, var); - return(FALSE); + return FALSE; } break; case T_TUPLE: if (!val && !ISSET(cur->type, T_BOOL)) { warningx("no value specified for `%s'", var); - return(FALSE); + return FALSE; } if (!store_tuple(val, cur, op)) { warningx("value `%s' is invalid for option `%s'", val, var); - return(FALSE); + return FALSE; } break; } - return(TRUE); + return TRUE; } /* @@ -551,7 +551,7 @@ update_defaults(int what) break; } } - return(rc); + return rc; } static int @@ -565,13 +565,13 @@ store_int(char *val, struct sudo_defs_types *def, int op) } else { l = strtol(val, &endp, 10); if (*endp != '\0') - return(FALSE); + return FALSE; /* XXX - should check against INT_MAX */ def->sd_un.ival = (int)l; } if (def->callback) - return(def->callback(val)); - return(TRUE); + return def->callback(val); + return TRUE; } static int @@ -585,13 +585,13 @@ store_uint(char *val, struct sudo_defs_types *def, int op) } else { l = strtol(val, &endp, 10); if (*endp != '\0' || l < 0) - return(FALSE); + return FALSE; /* XXX - should check against INT_MAX */ def->sd_un.ival = (unsigned int)l; } if (def->callback) - return(def->callback(val)); - return(TRUE); + return def->callback(val); + return TRUE; } static int @@ -605,13 +605,13 @@ store_float(char *val, struct sudo_defs_types *def, int op) } else { d = strtod(val, &endp); if (*endp != '\0') - return(FALSE); + return FALSE; /* XXX - should check against HUGE_VAL */ def->sd_un.fval = d; } if (def->callback) - return(def->callback(val)); - return(TRUE); + return def->callback(val); + return TRUE; } static int @@ -636,11 +636,11 @@ store_tuple(char *val, struct sudo_defs_types *def, int op) } } if (v->sval == NULL) - return(FALSE); + return FALSE; } if (def->callback) - return(def->callback(val)); - return(TRUE); + return def->callback(val); + return TRUE; } static int @@ -653,8 +653,8 @@ store_str(char *val, struct sudo_defs_types *def, int op) else def->sd_un.str = estrdup(val); if (def->callback) - return(def->callback(val)); - return(TRUE); + return def->callback(val); + return TRUE; } static int @@ -682,7 +682,7 @@ store_list(char *str, struct sudo_defs_types *def, int op) list_op(start, end - start, def, op == '-' ? delete : add); } while (*end++ != '\0'); } - return(TRUE); + return TRUE; } static int @@ -692,21 +692,21 @@ store_syslogfac(char *val, struct sudo_defs_types *def, int op) if (op == FALSE) { def->sd_un.ival = FALSE; - return(TRUE); + return TRUE; } #ifdef LOG_NFACILITIES if (!val) - return(FALSE); + return FALSE; for (fac = facilities; fac->name && strcmp(val, fac->name); fac++) ; if (fac->name == NULL) - return(FALSE); /* not found */ + return FALSE; /* not found */ def->sd_un.ival = fac->num; #else def->sd_un.ival = -1; #endif /* LOG_NFACILITIES */ - return(TRUE); + return TRUE; } static const char * @@ -717,9 +717,9 @@ logfac2str(int n) for (fac = facilities; fac->name && fac->num != n; fac++) ; - return(fac->name); + return fac->name; #else - return("default"); + return "default"; #endif /* LOG_NFACILITIES */ } @@ -729,15 +729,15 @@ store_syslogpri(char *val, struct sudo_defs_types *def, int op) struct strmap *pri; if (op == FALSE || !val) - return(FALSE); + return FALSE; for (pri = priorities; pri->name && strcmp(val, pri->name); pri++) ; if (pri->name == NULL) - return(FALSE); /* not found */ + return FALSE; /* not found */ def->sd_un.ival = pri->num; - return(TRUE); + return TRUE; } static const char * @@ -747,7 +747,7 @@ logpri2str(int n) for (pri = priorities; pri->name && pri->num != n; pri++) ; - return(pri->name); + return pri->name; } static int @@ -761,12 +761,12 @@ store_mode(char *val, struct sudo_defs_types *def, int op) } else { l = strtol(val, &endp, 8); if (*endp != '\0' || l < 0 || l > 0777) - return(FALSE); + return FALSE; def->sd_un.mode = (mode_t)l; } if (def->callback) - return(def->callback(val)); - return(TRUE); + return def->callback(val); + return TRUE; } static void diff --git a/plugins/sudoers/find_path.c b/plugins/sudoers/find_path.c index 714235b13..006b57800 100644 --- a/plugins/sudoers/find_path.c +++ b/plugins/sudoers/find_path.c @@ -74,13 +74,13 @@ find_path(char *infile, char **outfile, struct stat *sbp, char *path, strlcpy(command, infile, sizeof(command)); /* paranoia */ if (sudo_goodpath(command, sbp)) { *outfile = command; - return(FOUND); + return FOUND; } else - return(NOT_FOUND); + return NOT_FOUND; } if (path == NULL) - return(NOT_FOUND); + return NOT_FOUND; path = estrdup(path); origpath = path; @@ -121,12 +121,12 @@ find_path(char *infile, char **outfile, struct stat *sbp, char *path, errorx(1, "%s: File name too long", infile); result = sudo_goodpath(command, sbp); if (result && ignore_dot) - return(NOT_FOUND_DOT); + return NOT_FOUND_DOT; } if (result) { *outfile = result; - return(FOUND); + return FOUND; } else - return(NOT_FOUND); + return NOT_FOUND; } diff --git a/plugins/sudoers/goodpath.c b/plugins/sudoers/goodpath.c index 142f91a03..76314f69a 100644 --- a/plugins/sudoers/goodpath.c +++ b/plugins/sudoers/goodpath.c @@ -48,18 +48,18 @@ sudo_goodpath(const char *path, struct stat *sbp) /* Check for brain damage */ if (path == NULL || path[0] == '\0') - return(NULL); + return NULL; if (stat(path, &sb)) - return(NULL); + return NULL; /* Make sure path describes an executable regular file. */ if (!S_ISREG(sb.st_mode) || !(sb.st_mode & 0000111)) { errno = EACCES; - return(NULL); + return NULL; } if (sbp != NULL) (void) memcpy(sbp, &sb, sizeof(struct stat)); - return((char *)path); + return (char *)path; } diff --git a/plugins/sudoers/gram.c b/plugins/sudoers/gram.c index b3254b6f2..4adc166a1 100644 --- a/plugins/sudoers/gram.c +++ b/plugins/sudoers/gram.c @@ -647,7 +647,7 @@ new_default(char *var, char *val, int op) d->prev = d; d->next = NULL; - return(d); + return d; } static struct member * @@ -661,7 +661,7 @@ new_member(char *name, int type) m->prev = m; m->next = NULL; - return(m); + return m; } /* diff --git a/plugins/sudoers/gram.y b/plugins/sudoers/gram.y index 77fc3ddb0..a28bb1186 100644 --- a/plugins/sudoers/gram.y +++ b/plugins/sudoers/gram.y @@ -616,7 +616,7 @@ new_default(char *var, char *val, int op) d->prev = d; d->next = NULL; - return(d); + return d; } static struct member * @@ -630,7 +630,7 @@ new_member(char *name, int type) m->prev = m; m->next = NULL; - return(m); + return m; } /* diff --git a/plugins/sudoers/iolog.c b/plugins/sudoers/iolog.c index 5df9f12d6..3a83d0781 100644 --- a/plugins/sudoers/iolog.c +++ b/plugins/sudoers/iolog.c @@ -228,7 +228,7 @@ mkdir_iopath(const char *iolog_path, char *pathbuf, size_t pathsize) log_error(USE_ERRNO, "Can't create %s", pathbuf); } - return(len); + return len; } /* diff --git a/plugins/sudoers/ldap.c b/plugins/sudoers/ldap.c index 0e8c8e276..b3a64ae5c 100644 --- a/plugins/sudoers/ldap.c +++ b/plugins/sudoers/ldap.c @@ -465,7 +465,7 @@ sudo_ldap_parse_uri(const struct ldap_config_list_str *uri_list) done: efree(buf); - return(rc); + return rc; toobig: errorx(1, "sudo_ldap_parse_uri: out of space building hostbuf"); @@ -480,7 +480,7 @@ sudo_ldap_join_uri(struct ldap_config_list_str *uri_list) /* Usually just a single entry. */ if (uri_list->next == NULL) - return(estrdup(uri_list->val)); + return estrdup(uri_list->val); for (uri = uri_list; uri != NULL; uri = uri->next) { len += strlen(uri->val) + 1; @@ -492,7 +492,7 @@ sudo_ldap_join_uri(struct ldap_config_list_str *uri_list) *cp++ = ' '; } cp[-1] = '\0'; - return(buf); + return buf; } #endif /* HAVE_LDAP_INITIALIZE */ @@ -558,7 +558,7 @@ sudo_ldap_init(LDAP **ldp, const char *host, int port) done: *ldp = ld; - return(rc); + return rc; } /* @@ -573,12 +573,12 @@ sudo_ldap_check_user_netgroup(LDAP *ld, LDAPMessage *entry, char *user) int ret = FALSE; if (!entry) - return(ret); + return ret; /* get the values from the entry */ bv = ldap_get_values_len(ld, entry, "sudoUser"); if (bv == NULL) - return(ret); + return ret; /* walk through values */ for (p = bv; *p != NULL && !ret; p++) { @@ -592,7 +592,7 @@ sudo_ldap_check_user_netgroup(LDAP *ld, LDAPMessage *entry, char *user) ldap_value_free_len(bv); /* cleanup */ - return(ret); + return ret; } /* @@ -607,12 +607,12 @@ sudo_ldap_check_host(LDAP *ld, LDAPMessage *entry) int ret = FALSE; if (!entry) - return(ret); + return ret; /* get the values from the entry */ bv = ldap_get_values_len(ld, entry, "sudoHost"); if (bv == NULL) - return(ret); + return ret; /* walk through values */ for (p = bv; *p != NULL && !ret; p++) { @@ -628,7 +628,7 @@ sudo_ldap_check_host(LDAP *ld, LDAPMessage *entry) ldap_value_free_len(bv); /* cleanup */ - return(ret); + return ret; } static int @@ -639,7 +639,7 @@ sudo_ldap_check_runas_user(LDAP *ld, LDAPMessage *entry) int ret = FALSE; if (!runas_pw) - return(UNSPEC); + return UNSPEC; /* get the runas user from the entry */ bv = ldap_get_values_len(ld, entry, "sudoRunAsUser"); @@ -668,7 +668,7 @@ sudo_ldap_check_runas_user(LDAP *ld, LDAPMessage *entry) * what the user specified on the command line. */ if (bv == NULL) - return(!strcasecmp(runas_pw->pw_name, def_runas_default)); + return !strcasecmp(runas_pw->pw_name, def_runas_default); /* walk through values returned, looking for a match */ for (p = bv; *p != NULL && !ret; p++) { @@ -699,7 +699,7 @@ sudo_ldap_check_runas_user(LDAP *ld, LDAPMessage *entry) ldap_value_free_len(bv); /* cleanup */ - return(ret); + return ret; } static int @@ -711,12 +711,12 @@ sudo_ldap_check_runas_group(LDAP *ld, LDAPMessage *entry) /* runas_gr is only set if the user specified the -g flag */ if (!runas_gr) - return(UNSPEC); + return UNSPEC; /* get the values from the entry */ bv = ldap_get_values_len(ld, entry, "sudoRunAsGroup"); if (bv == NULL) - return(ret); + return ret; /* walk through values returned, looking for a match */ for (p = bv; *p != NULL && !ret; p++) { @@ -729,7 +729,7 @@ sudo_ldap_check_runas_group(LDAP *ld, LDAPMessage *entry) ldap_value_free_len(bv); /* cleanup */ - return(ret); + return ret; } /* @@ -742,12 +742,12 @@ sudo_ldap_check_runas(LDAP *ld, LDAPMessage *entry) int ret; if (!entry) - return(FALSE); + return FALSE; ret = sudo_ldap_check_runas_user(ld, entry) != FALSE && sudo_ldap_check_runas_group(ld, entry) != FALSE; - return(ret); + return ret; } /* @@ -762,11 +762,11 @@ sudo_ldap_check_command(LDAP *ld, LDAPMessage *entry, int *setenv_implied) int foundbang, ret = UNSPEC; if (!entry) - return(ret); + return ret; bv = ldap_get_values_len(ld, entry, "sudoCommand"); if (bv == NULL) - return(ret); + return ret; for (p = bv; *p != NULL && ret != FALSE; p++) { val = (*p)->bv_val; @@ -809,7 +809,7 @@ sudo_ldap_check_command(LDAP *ld, LDAPMessage *entry, int *setenv_implied) ldap_value_free_len(bv); /* more cleanup */ - return(ret); + return ret; } /* @@ -824,11 +824,11 @@ sudo_ldap_check_bool(LDAP *ld, LDAPMessage *entry, char *option) int ret = UNSPEC; if (entry == NULL) - return(UNSPEC); + return UNSPEC; bv = ldap_get_values_len(ld, entry, "sudoOption"); if (bv == NULL) - return(ret); + return ret; /* walk through options */ for (p = bv; *p != NULL; p++) { @@ -843,7 +843,7 @@ sudo_ldap_check_bool(LDAP *ld, LDAPMessage *entry, char *option) ldap_value_free_len(bv); - return(ret); + return ret; } /* @@ -946,7 +946,7 @@ sudo_ldap_timefilter(char *buffer, size_t buffersize) } done: - return(bytes); + return bytes; } /* @@ -1027,7 +1027,7 @@ sudo_ldap_build_pass1(struct passwd *pw) } strlcat(buf, ")", sz); /* closes the global OR or the global AND */ - return(buf); + return buf; } /* @@ -1050,7 +1050,7 @@ sudo_ldap_build_pass2(void) buf = estrdup("sudoUser=+*"); } - return(buf); + return buf; } static void @@ -1092,7 +1092,7 @@ sudo_ldap_read_config(void) ldap_conf.rootuse_sasl = -1; if ((fp = fopen(_PATH_LDAP_CONF, "r")) == NULL) - return(FALSE); + return FALSE; while ((cp = sudo_parseln(fp)) != NULL) { if (*cp == '\0') @@ -1239,7 +1239,7 @@ sudo_ldap_read_config(void) sudo_printf(SUDO_CONV_ERROR_MSG, "===================\n"); } if (!ldap_conf.base) - return(FALSE); /* if no base is defined, ignore LDAP */ + return FALSE; /* if no base is defined, ignore LDAP */ if (ldap_conf.bind_timelimit > 0) ldap_conf.bind_timelimit *= 1000; /* convert to ms */ @@ -1266,7 +1266,7 @@ sudo_ldap_read_config(void) if (ldap_conf.uri) { struct ldap_config_list_str *uri = ldap_conf.uri; if (sudo_ldap_parse_uri(uri) != 0) - return(FALSE); + return FALSE; do { ldap_conf.uri = uri->next; efree(uri); @@ -1316,7 +1316,7 @@ sudo_ldap_read_config(void) } } #endif - return(TRUE); + return TRUE; } /* @@ -1330,21 +1330,21 @@ sudo_ldap_get_first_rdn(LDAP *ld, LDAPMessage *entry) LDAPDN tmpDN; if ((dn = ldap_get_dn(ld, entry)) == NULL) - return(NULL); + return NULL; if (ldap_str2dn(dn, &tmpDN, LDAP_DN_FORMAT_LDAP) == LDAP_SUCCESS) { ldap_rdn2str(tmpDN[0], &rdn, LDAP_DN_FORMAT_UFN); ldap_dnfree(tmpDN); } ldap_memfree(dn); - return(rdn); + return rdn; #else char *dn, **edn; if ((dn = ldap_get_dn(ld, entry)) == NULL) - return(NULL); + return NULL; edn = ldap_explode_dn(dn, 1); ldap_memfree(dn); - return(edn ? edn[0] : NULL); + return edn ? edn[0] : NULL; #endif } @@ -1396,7 +1396,7 @@ sudo_ldap_display_defaults(struct sudo_nss *nss, struct passwd *pw, ldap_msgfree(result); } done: - return(count); + return count; } /* @@ -1406,7 +1406,7 @@ static int sudo_ldap_display_bound_defaults(struct sudo_nss *nss, struct passwd *pw, struct lbuf *lbuf) { - return(0); + return 0; } /* @@ -1485,7 +1485,7 @@ sudo_ldap_display_entry_short(LDAP *ld, LDAPMessage *entry, struct lbuf *lbuf) } lbuf_append(lbuf, "\n", NULL); - return(count); + return count; } /* @@ -1569,7 +1569,7 @@ sudo_ldap_display_entry_long(LDAP *ld, LDAPMessage *entry, struct lbuf *lbuf) ldap_value_free_len(bv); } - return(count); + return count; } /* @@ -1602,7 +1602,7 @@ sudo_ldap_display_privs(struct sudo_nss *nss, struct passwd *pw, } done: - return(count); + return count; } static int @@ -1637,7 +1637,7 @@ done: if (found) printf("%s%s%s\n", safe_cmnd ? safe_cmnd : user_cmnd, user_args ? " " : "", user_args ? user_args : ""); - return(!found); + return !found; } #ifdef HAVE_LDAP_SASL_INTERACTIVE_BIND_S @@ -1650,7 +1650,7 @@ sudo_ldap_sasl_interact(LDAP *ld, unsigned int flags, void *_auth_id, for (; interact->id != SASL_CB_LIST_END; interact++) { if (interact->id != SASL_CB_USER) - return(LDAP_PARAM_ERROR); + return LDAP_PARAM_ERROR; if (auth_id != NULL) interact->result = auth_id; @@ -1664,7 +1664,7 @@ sudo_ldap_sasl_interact(LDAP *ld, unsigned int flags, void *_auth_id, interact->result = estrdup(interact->result); #endif /* SASL_VERSION_MAJOR < 2 */ } - return(LDAP_SUCCESS); + return LDAP_SUCCESS; } #endif /* HAVE_LDAP_SASL_INTERACTIVE_BIND_S */ @@ -1702,7 +1702,7 @@ sudo_ldap_set_options(LDAP *ld) if (rc != LDAP_OPT_SUCCESS) { warningx("ldap_set_option: %s -> %d: %s", cur->conf_str, ival, ldap_err2string(rc)); - return(-1); + return -1; } DPRINTF(("ldap_set_option: %s -> %d", cur->conf_str, ival), 1); } @@ -1714,7 +1714,7 @@ sudo_ldap_set_options(LDAP *ld) if (rc != LDAP_OPT_SUCCESS) { warningx("ldap_set_option: %s -> %s: %s", cur->conf_str, sval, ldap_err2string(rc)); - return(-1); + return -1; } DPRINTF(("ldap_set_option: %s -> %s", cur->conf_str, sval), 1); } @@ -1732,7 +1732,7 @@ sudo_ldap_set_options(LDAP *ld) if (rc != LDAP_OPT_SUCCESS) { warningx("ldap_set_option(TIMEOUT, %ld): %s", (long)tv.tv_sec, ldap_err2string(rc)); - return(-1); + return -1; } DPRINTF(("ldap_set_option(LDAP_OPT_TIMEOUT, %ld)", (long)tv.tv_sec), 1); @@ -1748,7 +1748,7 @@ sudo_ldap_set_options(LDAP *ld) if (rc != LDAP_OPT_SUCCESS) { warningx("ldap_set_option(NETWORK_TIMEOUT, %ld): %s", (long)tv.tv_sec, ldap_err2string(rc)); - return(-1); + return -1; } DPRINTF(("ldap_set_option(LDAP_OPT_NETWORK_TIMEOUT, %ld)", (long)tv.tv_sec), 1); @@ -1762,12 +1762,12 @@ sudo_ldap_set_options(LDAP *ld) if (rc != LDAP_SUCCESS) { warningx("ldap_set_option(LDAP_OPT_X_TLS, LDAP_OPT_X_TLS_HARD): %s", ldap_err2string(rc)); - return(-1); + return -1; } DPRINTF(("ldap_set_option(LDAP_OPT_X_TLS, LDAP_OPT_X_TLS_HARD)"), 1); } #endif - return(0); + return 0; } /* @@ -1785,7 +1785,7 @@ sudo_ldap_result_alloc(void) result->allocated_entries = 0; result->user_matches = FALSE; result->host_matches = FALSE; - return(result); + return result; } /* @@ -1834,7 +1834,7 @@ sudo_ldap_result_add_search(struct ldap_result *lres, LDAP *ldap, } else { lres->searches = news; } - return(news); + return news; } /* @@ -1883,7 +1883,7 @@ sudo_ldap_bind_s(LDAP *ld) } if (rc != LDAP_SUCCESS) { warningx("ldap_sasl_interactive_bind_s(): %s", ldap_err2string(rc)); - return(-1); + return -1; } DPRINTF(("ldap_sasl_interactive_bind_s() ok"), 1); } else @@ -1899,7 +1899,7 @@ sudo_ldap_bind_s(LDAP *ld) NULL, NULL, NULL); if (rc != LDAP_SUCCESS) { warningx("ldap_sasl_bind_s(): %s", ldap_err2string(rc)); - return(-1); + return -1; } DPRINTF(("ldap_sasl_bind_s() ok"), 1); } @@ -1908,12 +1908,12 @@ sudo_ldap_bind_s(LDAP *ld) rc = ldap_simple_bind_s(ld, ldap_conf.binddn, ldap_conf.bindpw); if (rc != LDAP_SUCCESS) { warningx("ldap_simple_bind_s(): %s", ldap_err2string(rc)); - return(-1); + return -1; } DPRINTF(("ldap_simple_bind_s() ok"), 1); } #endif - return(0); + return 0; } /* @@ -1928,7 +1928,7 @@ sudo_ldap_open(struct sudo_nss *nss) struct sudo_ldap_handle *handle; if (!sudo_ldap_read_config()) - return(-1); + return -1; /* Prevent reading of user ldaprc and system defaults. */ if (getenv("LDAPNOINIT") == NULL) { @@ -1948,7 +1948,7 @@ sudo_ldap_open(struct sudo_nss *nss) rc = sudo_ldap_init(&ld, ldap_conf.host, ldap_conf.port); if (rc != LDAP_SUCCESS) { warningx("unable to initialize LDAP: %s", ldap_err2string(rc)); - return(-1); + return -1; } if (ldapnoinit) @@ -1956,25 +1956,25 @@ sudo_ldap_open(struct sudo_nss *nss) /* Set LDAP options */ if (sudo_ldap_set_options(ld) < 0) - return(-1); + return -1; if (ldap_conf.ssl_mode == SUDO_LDAP_STARTTLS) { #if defined(HAVE_LDAP_START_TLS_S) rc = ldap_start_tls_s(ld, NULL, NULL); if (rc != LDAP_SUCCESS) { warningx("ldap_start_tls_s(): %s", ldap_err2string(rc)); - return(-1); + return -1; } DPRINTF(("ldap_start_tls_s() ok"), 1); #elif defined(HAVE_LDAP_SSL_CLIENT_INIT) && defined(HAVE_LDAP_START_TLS_S_NP) if (ldap_ssl_client_init(NULL, NULL, 0, &rc) != LDAP_SUCCESS) { warningx("ldap_ssl_client_init(): %s", ldap_err2string(rc)); - return(-1); + return -1; } rc = ldap_start_tls_s_np(ld, NULL); if (rc != LDAP_SUCCESS) { warningx("ldap_start_tls_s_np(): %s", ldap_err2string(rc)); - return(-1); + return -1; } DPRINTF(("ldap_start_tls_s_np() ok"), 1); #else @@ -1984,7 +1984,7 @@ sudo_ldap_open(struct sudo_nss *nss) /* Actually connect */ if (sudo_ldap_bind_s(ld) != 0) - return(-1); + return -1; /* Create a handle container. */ handle = emalloc(sizeof(struct sudo_ldap_handle)); @@ -1994,7 +1994,7 @@ sudo_ldap_open(struct sudo_nss *nss) handle->groups = NULL; nss->handle = handle; - return(0); + return 0; } static int @@ -2008,7 +2008,7 @@ sudo_ldap_setdefs(struct sudo_nss *nss) int rc; if (handle == NULL || handle->ld == NULL) - return(-1); + return -1; ld = handle->ld; for (base = ldap_conf.base; base != NULL; base = base->next) { @@ -2030,7 +2030,7 @@ sudo_ldap_setdefs(struct sudo_nss *nss) ldap_msgfree(result); } - return(0); + return 0; } /* @@ -2046,7 +2046,7 @@ sudo_ldap_lookup(struct sudo_nss *nss, int ret, int pwflag) struct ldap_result *lres = NULL; if (handle == NULL || handle->ld == NULL) - return(ret); + return ret; ld = handle->ld; /* Fetch list of sudoRole entries that match user and host. */ @@ -2151,7 +2151,7 @@ done: CLR(ret, FLAG_NO_HOST); DPRINTF(("sudo_ldap_lookup(%d)=0x%02x", pwflag, ret), 1); - return(ret); + return ret; } /* @@ -2181,7 +2181,7 @@ sudo_ldap_result_last_search(struct ldap_result *lres) while (result->next) result = result->next; } - return(result); + return result; } /* @@ -2226,7 +2226,7 @@ sudo_ldap_result_add_entry(struct ldap_result *lres, LDAPMessage *entry) lres->entries[lres->nentries - 1].entry = entry; lres->entries[lres->nentries - 1].order = order; - return(&lres->entries[lres->nentries - 1]); + return &lres->entries[lres->nentries - 1]; } /* @@ -2274,7 +2274,7 @@ sudo_ldap_result_get(struct sudo_nss *nss, struct passwd *pw) strcmp(pw->pw_name, handle->username) == 0) { DPRINTF(("reusing previous result (user %s) with %d entries", handle->username, handle->result->nentries), 1); - return(handle->result); + return handle->result; } /* User mismatch, cached result cannot be used. */ DPRINTF(("removing result (user %s), new search (user %s)", @@ -2346,7 +2346,7 @@ sudo_ldap_result_get(struct sudo_nss *nss, struct passwd *pw) handle->username = estrdup(pw->pw_name); handle->groups = user_groups; - return(lres); + return lres; } /* @@ -2371,7 +2371,7 @@ sudo_ldap_close(struct sudo_nss *nss) efree(nss->handle); nss->handle = NULL; } - return(0); + return 0; } /* @@ -2380,7 +2380,7 @@ sudo_ldap_close(struct sudo_nss *nss) static int sudo_ldap_parse(struct sudo_nss *nss) { - return(0); + return 0; } #if 0 @@ -2418,6 +2418,6 @@ sudo_ldap_result_from_search(LDAP *ldap, LDAPMessage *searchresult) } DPRINTF(("sudo_ldap_result_from_search: %d entries found", result->nentries), 2); - return(result); + return result; } #endif diff --git a/plugins/sudoers/match.c b/plugins/sudoers/match.c index 3841e0e64..fa3d4973b 100644 --- a/plugins/sudoers/match.c +++ b/plugins/sudoers/match.c @@ -141,14 +141,14 @@ _userlist_matches(struct passwd *pw, struct member_list *list) if (matched != UNSPEC) break; } - return(matched); + return matched; } int userlist_matches(struct passwd *pw, struct member_list *list) { alias_seqno++; - return(_userlist_matches(pw, list)); + return _userlist_matches(pw, list); } /* @@ -168,7 +168,7 @@ _runaslist_matches(struct member_list *user_list, struct member_list *group_list if (runas_pw != NULL) { /* If no runas user or runas group listed in sudoers, use default. */ if (tq_empty(user_list) && tq_empty(group_list)) - return(userpw_matches(def_runas_default, runas_pw->pw_name, runas_pw)); + return userpw_matches(def_runas_default, runas_pw->pw_name, runas_pw); tq_foreach_rev(user_list, m) { switch (m->type) { @@ -230,10 +230,10 @@ _runaslist_matches(struct member_list *user_list, struct member_list *group_list } if (user_matched == DENY || group_matched == DENY) - return(DENY); + return DENY; if (user_matched == group_matched || runas_gr == NULL) - return(user_matched); - return(UNSPEC); + return user_matched; + return UNSPEC; } int @@ -284,14 +284,14 @@ _hostlist_matches(struct member_list *list) if (matched != UNSPEC) break; } - return(matched); + return matched; } int hostlist_matches(struct member_list *list) { alias_seqno++; - return(_hostlist_matches(list)); + return _hostlist_matches(list); } /* @@ -309,14 +309,14 @@ _cmndlist_matches(struct member_list *list) if (matched != UNSPEC) break; } - return(matched); + return matched; } int cmndlist_matches(struct member_list *list) { alias_seqno++; - return(_cmndlist_matches(list)); + return _cmndlist_matches(list); } /* @@ -348,7 +348,7 @@ cmnd_matches(struct member *m) matched = !m->negated; break; } - return(matched); + return matched; } static int @@ -396,13 +396,13 @@ command_matches(char *sudoers_cmnd, char *sudoers_args) */ if (strcmp(sudoers_cmnd, "sudoedit") != 0 || strcmp(user_cmnd, "sudoedit") != 0) - return(FALSE); + return FALSE; if (command_args_match(sudoers_cmnd, sudoers_args)) { efree(safe_cmnd); safe_cmnd = estrdup(sudoers_cmnd); - return(TRUE); + return TRUE; } else - return(FALSE); + return FALSE; } if (has_meta(sudoers_cmnd)) { @@ -411,10 +411,10 @@ command_matches(char *sudoers_cmnd, char *sudoers_args) * use glob(3) and/or fnmatch(3) to do the matching. */ if (def_fast_glob) - return(command_matches_fnmatch(sudoers_cmnd, sudoers_args)); - return(command_matches_glob(sudoers_cmnd, sudoers_args)); + return command_matches_fnmatch(sudoers_cmnd, sudoers_args); + return command_matches_glob(sudoers_cmnd, sudoers_args); } - return(command_matches_normal(sudoers_cmnd, sudoers_args)); + return command_matches_normal(sudoers_cmnd, sudoers_args); } static int @@ -428,14 +428,14 @@ command_matches_fnmatch(char *sudoers_cmnd, char *sudoers_args) * else return false. */ if (fnmatch(sudoers_cmnd, user_cmnd, FNM_PATHNAME) != 0) - return(FALSE); + return FALSE; if (command_args_match(sudoers_cmnd, sudoers_args)) { if (safe_cmnd) free(safe_cmnd); safe_cmnd = estrdup(user_cmnd); - return(TRUE); + return TRUE; } else - return(FALSE); + return FALSE; } static int @@ -456,7 +456,7 @@ command_matches_glob(char *sudoers_cmnd, char *sudoers_args) if ((base = strrchr(sudoers_cmnd, '/')) != NULL) { base++; if (!has_meta(base) && strcmp(user_base, base) != 0) - return(FALSE); + return FALSE; } } /* @@ -469,7 +469,7 @@ command_matches_glob(char *sudoers_cmnd, char *sudoers_args) #define GLOB_FLAGS (GLOB_NOSORT | GLOB_MARK | GLOB_BRACE | GLOB_TILDE) if (glob(sudoers_cmnd, GLOB_FLAGS, NULL, &gl) != 0 || gl.gl_pathc == 0) { globfree(&gl); - return(FALSE); + return FALSE; } /* For each glob match, compare basename, st_dev and st_ino. */ for (ap = gl.gl_pathv; (cp = *ap) != NULL; ap++) { @@ -477,7 +477,7 @@ command_matches_glob(char *sudoers_cmnd, char *sudoers_args) dlen = strlen(cp); if (cp[dlen - 1] == '/') { if (command_matches_dir(cp, dlen)) - return(TRUE); + return TRUE; continue; } @@ -499,14 +499,14 @@ command_matches_glob(char *sudoers_cmnd, char *sudoers_args) } globfree(&gl); if (cp == NULL) - return(FALSE); + return FALSE; if (command_args_match(sudoers_cmnd, sudoers_args)) { efree(safe_cmnd); safe_cmnd = estrdup(user_cmnd); - return(TRUE); + return TRUE; } - return(FALSE); + return FALSE; } static int @@ -519,7 +519,7 @@ command_matches_normal(char *sudoers_cmnd, char *sudoers_args) /* If it ends in '/' it is a directory spec. */ dlen = strlen(sudoers_cmnd); if (sudoers_cmnd[dlen - 1] == '/') - return(command_matches_dir(sudoers_cmnd, dlen)); + return command_matches_dir(sudoers_cmnd, dlen); /* Only proceed if user_base and basename(sudoers_cmnd) match */ if ((base = strrchr(sudoers_cmnd, '/')) == NULL) @@ -528,7 +528,7 @@ command_matches_normal(char *sudoers_cmnd, char *sudoers_args) base++; if (strcmp(user_base, base) != 0 || stat(sudoers_cmnd, &sudoers_stat) == -1) - return(FALSE); + return FALSE; /* * Return true if inode/device matches AND @@ -539,13 +539,13 @@ command_matches_normal(char *sudoers_cmnd, char *sudoers_args) if (user_stat != NULL && (user_stat->st_dev != sudoers_stat.st_dev || user_stat->st_ino != sudoers_stat.st_ino)) - return(FALSE); + return FALSE; if (command_args_match(sudoers_cmnd, sudoers_args)) { efree(safe_cmnd); safe_cmnd = estrdup(sudoers_cmnd); - return(TRUE); + return TRUE; } - return(FALSE); + return FALSE; } /* @@ -564,11 +564,11 @@ command_matches_dir(char *sudoers_dir, size_t dlen) */ dirp = opendir(sudoers_dir); if (dirp == NULL) - return(FALSE); + return FALSE; if (strlcpy(buf, sudoers_dir, sizeof(buf)) >= sizeof(buf)) { closedir(dirp); - return(FALSE); + return FALSE; } while ((dent = readdir(dirp)) != NULL) { /* ignore paths > PATH_MAX (XXX - log) */ @@ -589,7 +589,7 @@ command_matches_dir(char *sudoers_dir, size_t dlen) } closedir(dirp); - return(dent != NULL); + return dent != NULL; } static int @@ -620,24 +620,24 @@ addr_matches_if(char *n) if (ifp->addr.ip4.s_addr == addr.ip4.s_addr || (ifp->addr.ip4.s_addr & ifp->netmask.ip4.s_addr) == addr.ip4.s_addr) - return(TRUE); + return TRUE; break; #ifdef HAVE_IN6_ADDR case AF_INET6: if (memcmp(ifp->addr.ip6.s6_addr, addr.ip6.s6_addr, sizeof(addr.ip6.s6_addr)) == 0) - return(TRUE); + return TRUE; for (j = 0; j < sizeof(addr.ip6.s6_addr); j++) { if ((ifp->addr.ip6.s6_addr[j] & ifp->netmask.ip6.s6_addr[j]) != addr.ip6.s6_addr[j]) break; } if (j == sizeof(addr.ip6.s6_addr)) - return(TRUE); + return TRUE; #endif } } - return(FALSE); + return FALSE; } static int @@ -694,7 +694,7 @@ addr_matches_if_netmask(char *n, char *m) switch(family) { case AF_INET: if ((ifp->addr.ip4.s_addr & mask.ip4.s_addr) == addr.ip4.s_addr) - return(TRUE); + return TRUE; #ifdef HAVE_IN6_ADDR case AF_INET6: for (j = 0; j < sizeof(addr.ip6.s6_addr); j++) { @@ -702,12 +702,12 @@ addr_matches_if_netmask(char *n, char *m) break; } if (j == sizeof(addr.ip6.s6_addr)) - return(TRUE); + return TRUE; #endif /* HAVE_IN6_ADDR */ } } - return(FALSE); + return FALSE; } /* @@ -728,7 +728,7 @@ addr_matches(char *n) } else retval = addr_matches_if(n); - return(retval); + return retval; } /* @@ -739,14 +739,14 @@ hostname_matches(char *shost, char *lhost, char *pattern) { if (has_meta(pattern)) { if (strchr(pattern, '.')) - return(!fnmatch(pattern, lhost, FNM_CASEFOLD)); + return !fnmatch(pattern, lhost, FNM_CASEFOLD); else - return(!fnmatch(pattern, shost, FNM_CASEFOLD)); + return !fnmatch(pattern, shost, FNM_CASEFOLD); } else { if (strchr(pattern, '.')) - return(!strcasecmp(lhost, pattern)); + return !strcasecmp(lhost, pattern); else - return(!strcasecmp(shost, pattern)); + return !strcasecmp(shost, pattern); } } @@ -760,9 +760,9 @@ userpw_matches(char *sudoers_user, char *user, struct passwd *pw) if (pw != NULL && *sudoers_user == '#') { uid_t uid = (uid_t) atoi(sudoers_user + 1); if (uid == pw->pw_uid) - return(TRUE); + return TRUE; } - return(strcmp(sudoers_user, user) == 0); + return strcmp(sudoers_user, user) == 0; } /* @@ -775,9 +775,9 @@ group_matches(char *sudoers_group, struct group *gr) if (*sudoers_group == '#') { gid_t gid = (gid_t) atoi(sudoers_group + 1); if (gid == gr->gr_gid) - return(TRUE); + return TRUE; } - return(strcmp(gr->gr_name, sudoers_group) == 0); + return strcmp(gr->gr_name, sudoers_group) == 0; } /* @@ -821,7 +821,7 @@ done: if (pw0 != NULL) pw_delref(pw0); - return(matched); + return matched; } /* @@ -841,7 +841,7 @@ netgr_matches(char *netgr, char *lhost, char *shost, char *user) /* make sure we have a valid netgroup, sudo style */ if (*netgr++ != '+') - return(FALSE); + return FALSE; #ifdef HAVE_GETDOMAINNAME /* get the domain name (if any) */ @@ -857,10 +857,10 @@ netgr_matches(char *netgr, char *lhost, char *shost, char *user) #ifdef HAVE_INNETGR if (innetgr(netgr, lhost, user, domain)) - return(TRUE); + return TRUE; else if (lhost != shost && innetgr(netgr, shost, user, domain)) - return(TRUE); + return TRUE; #endif /* HAVE_INNETGR */ - return(FALSE); + return FALSE; } diff --git a/plugins/sudoers/mon_systrace.c b/plugins/sudoers/mon_systrace.c index 5bae00a98..4ff4332d6 100644 --- a/plugins/sudoers/mon_systrace.c +++ b/plugins/sudoers/mon_systrace.c @@ -54,7 +54,7 @@ systrace_open() fd = open(_PATH_DEV_SYSTRACE, O_RDONLY, 0644); if (fd == -1) - return(-1); + return -1; serrno = errno; #ifdef SYSTR_CLONE @@ -69,11 +69,11 @@ systrace_open() if (fcntl(fd, F_SETFD, 1) == -1) /* really needed? */ goto bad; - return(fd); + return fd; bad: close(fd); errno = serrno; - return(-1); + return -1; } static void @@ -334,13 +334,13 @@ switch_emulation(fd, msgp) struct emulation *emul; if ((entry = find_child(msgp->msg_pid)) == NULL) - return(-1); + return -1; for (emul = emulations; emul != NULL; emul++) if (strcmp(emul->name, msgp->msg_data.msg_emul.emul) == 0) { entry->action = emul->action; - return(set_policy(fd, entry)); + return set_policy(fd, entry); } - return(-1); + return -1; } /* @@ -376,9 +376,9 @@ find_child(pid) for (cur = children.first; cur != NULL; cur = cur->next) { if (cur->pid == pid) - return(cur); + return cur; } - return(NULL); + return NULL; } /* @@ -417,12 +417,12 @@ set_policy(fd, child) pol.strp_num = -1; pol.strp_maxents = SYSTRACE_MAXENTS; if (ioctl(fd, STRIOCPOLICY, &pol) == -1) - return(-1); + return -1; pol.strp_op = SYSTR_POLICY_ASSIGN; pol.strp_pid = child->pid; if (ioctl(fd, STRIOCPOLICY, &pol) == -1) - return(-1); + return -1; for (i = 0; i < SYSTRACE_MAXENTS; i++) { pol.strp_op = SYSTR_POLICY_MODIFY; @@ -435,9 +435,9 @@ set_policy(fd, child) } } if (ioctl(fd, STRIOCPOLICY, &pol) == -1) - return(-1); + return -1; } - return(0); + return 0; } /* @@ -463,7 +463,7 @@ systrace_read(fd, pid, addr, buf, bufsiz) io.strio_op = SYSTR_READ; if ((rval = ioctl(fd, STRIOCIO, &io)) != 0) warning("systrace_read: STRIOCIO"); - return(rval ? -1 : (ssize_t)io.strio_len); + return rval ? -1 : (ssize_t)io.strio_len; } /* @@ -495,7 +495,7 @@ read_string(fd, pid, addr, buf, bufsiz) bufsiz -= nread; } else { if (errno != EINVAL || chunksiz == 1) - return(-1); + return -1; chunksiz >>= 1; /* chunksiz too big, halve it */ } } @@ -503,7 +503,7 @@ read_string(fd, pid, addr, buf, bufsiz) if (cp == buf) warningx("read empty string, chunksize == %d", chunksiz); /* XXX, should not happen but does */ #endif - return(bufsiz >= chunksiz ? cp - buf : -1); + return bufsiz >= chunksiz ? cp - buf : -1; } static struct syscallhandler * @@ -516,13 +516,13 @@ find_handler(pid, code) if ((child = find_child(pid)) == NULL) { warningx("unable to find child with pid %d", pid); - return(NULL); + return NULL; } for (sca = child->action; sca->code != -1; sca++) { if (sca->code == code) - return(&sca->handler); + return &sca->handler; } - return(NULL); + return NULL; } #define SUDO_USER 0 @@ -554,7 +554,7 @@ systrace_write(fd, pid, addr, buf, len) io.strio_op = SYSTR_WRITE; if ((rval = ioctl(fd, STRIOCIO, &io)) != 0) warning("systrace_write: STRIOCIO"); - return(rval ? -1 : (ssize_t)io.strio_len); + return rval ? -1 : (ssize_t)io.strio_len; } /* @@ -583,12 +583,12 @@ update_env(fd, pid, seqnr, askp) envep = envbuf + (sizeof(envbuf) / sizeof(char *)); for (envp = envbuf; envp < envep; envp++, off += sizeof(char *)) { if (systrace_read(fd, pid, off, &ap, sizeof(ap)) == -1) - return(-1); + return -1; if ((*envp = ap) == NULL) break; memset(buf, 0, sizeof(buf)); if ((len = read_string(fd, pid, ap, buf, sizeof(buf))) == -1) - return(-1); + return -1; if (buf[0] == 'S') { if (strncmp(buf, "SUDO_USER=", 10) == 0) { offsets[SUDO_USER] = off; @@ -662,7 +662,7 @@ update_env(fd, pid, seqnr, askp) if (replace[SUDO_USER]) { n = snprintf(cp, sizeof(buf) - (cp - buf), "SUDO_USER=%s", user_name); if (n < 0 || n >= sizeof(buf) - (cp - buf)) - return(-1); + return -1; replace[SUDO_USER] = cp; cp += n + 1; } @@ -670,7 +670,7 @@ update_env(fd, pid, seqnr, askp) n = snprintf(cp, sizeof(buf) - (cp - buf), "SUDO_COMMAND=%s%s%s", user_cmnd, user_args ? " " : "", user_args ? user_args : ""); if (n < 0 || n >= sizeof(buf) - (cp - buf)) - return(-1); + return -1; replace[SUDO_COMMAND] = cp; cp += n + 1; } @@ -678,7 +678,7 @@ update_env(fd, pid, seqnr, askp) n = snprintf(cp, sizeof(buf) - (cp - buf), "SUDO_UID=%lu", (unsigned long) user_uid); if (n < 0 || n >= sizeof(buf) - (cp - buf)) - return(-1); + return -1; replace[SUDO_UID] = cp; cp += n + 1; } @@ -686,7 +686,7 @@ update_env(fd, pid, seqnr, askp) n = snprintf(cp, sizeof(buf) - (cp - buf), "SUDO_GID=%lu", (unsigned long) user_gid); if (n < 0 || n >= sizeof(buf) - (cp - buf)) - return(-1); + return -1; replace[SUDO_GID] = cp; cp += n + 1; } @@ -697,7 +697,7 @@ update_env(fd, pid, seqnr, askp) inject.stri_addr = buf; inject.stri_len = cp - buf; if (ioctl(fd, STRIOCINJECT, &inject) != 0) - return(-1); + return -1; n = (offsets[SUDO_USER] == NULL) + (offsets[SUDO_COMMAND] == NULL) + (offsets[SUDO_UID] == NULL) + (offsets[SUDO_GID] == NULL); /* @@ -713,7 +713,7 @@ update_env(fd, pid, seqnr, askp) continue; ap = inject.stri_addr + (replace[n] - buf); if (systrace_write(fd, pid, offsets[n], &ap, sizeof(ap)) == -1) - return(-1); + return -1; } } else { /* @@ -731,7 +731,7 @@ update_env(fd, pid, seqnr, askp) *envp = inject.stri_addr + (replace[SUDO_GID] - buf); } if (envp + n >= envep) - return(-1); + return -1; if (offsets[SUDO_USER] == NULL) *envp++ = inject.stri_addr + (replace[SUDO_USER] - buf); if (offsets[SUDO_COMMAND] == NULL) @@ -753,10 +753,10 @@ update_env(fd, pid, seqnr, askp) repl.strr_off[0] = 0; repl.strr_offlen[0] = (char *)envp - (char *)envbuf; if (ioctl(fd, STRIOCREPLACE, &repl) != 0) - return(-1); + return -1; } } - return(0); + return 0; } #endif /* STRIOCINJECT */ @@ -782,7 +782,7 @@ decode_args(fd, pid, askp) */ memset(pbuf, 0, sizeof(pbuf)); if (read_string(fd, pid, (void *)askp->args[0], pbuf, sizeof(pbuf)) == -1) - return(-1); + return -1; if ((user_base = strrchr(user_cmnd = pbuf, '/')) != NULL) user_base++; else @@ -802,7 +802,7 @@ decode_args(fd, pid, askp) off = (char *)askp->args[1]; for (cp = abuf, ep = abuf + sizeof(abuf); cp < ep; off += sizeof(char *)) { if (systrace_read(fd, pid, off, &ap, sizeof(ap)) == -1) - return(-1); + return -1; if (ap == NULL) break; /* end of args */ if (argc + 1 >= argc_max) { @@ -810,7 +810,7 @@ decode_args(fd, pid, askp) argv = erealloc3(argv, argc_max, sizeof(char *)); } if ((len = read_string(fd, pid, ap, cp, ep - cp)) == -1) - return(-1); + return -1; argv[argc++] = cp; cp += len; } @@ -832,7 +832,7 @@ decode_args(fd, pid, askp) } efree(argv); - return(0); + return 0; } static void @@ -865,30 +865,30 @@ check_execv(fd, pid, seqnr, askp, policyp, errorp) if (initialized == 0) { initialized = 1; *policyp = SYSTR_POLICY_PERMIT; - return(0); + return 0; } /* Failure should not be possible. */ if ((info = find_child(pid)) == NULL) { *policyp = SYSTR_POLICY_NEVER; *errorp = ECHILD; - return(0); + return 0; } /* Fill in user_cmnd, user_base, user_args and user_stat. */ if (decode_args(fd, pid, askp) != 0) { if (errno == EBUSY) - return(-1); + return -1; *policyp = SYSTR_POLICY_NEVER; *errorp = errno; - return(0); + return 0; } /* Get process cwd. */ rval = ioctl(fd, STRIOCGETCWD, &pid); if (rval == -1 || getcwd(user_cwd, sizeof(user_cwd)) == NULL) { if (rval == -1 && errno == EBUSY) - return(-1); + return -1; warningx("cannot get working directory"); (void) strlcpy(user_cwd, "unknown", sizeof(user_cwd)); } @@ -901,7 +901,7 @@ check_execv(fd, pid, seqnr, askp, policyp, errorp) warning("can't restore cwd"); *policyp = SYSTR_POLICY_NEVER; *errorp = EACCES; - return(0); + return 0; } if (rval != -1 && ioctl(fd, STRIOCRESCWD, 0) != 0) warning("can't restore cwd"); @@ -929,7 +929,7 @@ check_execv(fd, pid, seqnr, askp, policyp, errorp) *policyp = SYSTR_POLICY_NEVER; *errorp = EACCES; } - return(validated); + return validated; } /* @@ -955,7 +955,7 @@ check_execve(fd, pid, seqnr, askp, policyp, errorp) rval = -1; } #endif - return(rval); + return rval; } /* diff --git a/plugins/sudoers/parse.c b/plugins/sudoers/parse.c index 57e9e8211..0f3279697 100644 --- a/plugins/sudoers/parse.c +++ b/plugins/sudoers/parse.c @@ -82,9 +82,9 @@ int sudo_file_open(struct sudo_nss *nss) { if (def_ignore_local_sudoers) - return(-1); + return -1; nss->handle = open_sudoers(_PATH_SUDOERS, FALSE, NULL); - return(nss->handle ? 0 : -1); + return nss->handle ? 0 : -1; } int @@ -97,7 +97,7 @@ sudo_file_close(struct sudo_nss *nss) nss->handle = NULL; yyin = NULL; } - return(0); + return 0; } /* @@ -107,16 +107,16 @@ int sudo_file_parse(struct sudo_nss *nss) { if (nss->handle == NULL) - return(-1); + return -1; init_parser(_PATH_SUDOERS, 0); yyin = nss->handle; if (yyparse() != 0 || parse_error) { log_error(NO_EXIT, "parse error in %s near line %d", errorfile, errorlineno); - return(-1); + return -1; } - return(0); + return 0; } /* @@ -126,11 +126,11 @@ int sudo_file_setdefs(struct sudo_nss *nss) { if (nss->handle == NULL) - return(-1); + return -1; if (!update_defaults(SETDEF_GENERIC|SETDEF_HOST|SETDEF_USER)) - return(-1); - return(0); + return -1; + return 0; } /* @@ -147,7 +147,7 @@ sudo_file_lookup(struct sudo_nss *nss, int validated, int pwflag) struct userspec *us; if (nss->handle == NULL) - return(validated); + return validated; /* * Only check the actual command if pwflag is not set. @@ -193,7 +193,7 @@ sudo_file_lookup(struct sudo_nss *nss, int validated, int pwflag) SET(validated, FLAG_CHECK_USER); else if (pwcheck == never || nopass == TRUE) def_authenticate = FALSE; - return(validated); + return validated; } /* Need to be runas user while stat'ing things. */ @@ -252,7 +252,7 @@ sudo_file_lookup(struct sudo_nss *nss, int validated, int pwflag) CLR(validated, VALIDATE_OK); } restore_perms(); - return(validated); + return validated; } #define TAG_CHANGED(t) \ @@ -350,7 +350,7 @@ sudo_file_display_priv_short(struct passwd *pw, struct userspec *us, } lbuf_append(lbuf, "\n", NULL); } - return(nfound); + return nfound; } static int @@ -403,7 +403,7 @@ sudo_file_display_priv_long(struct passwd *pw, struct userspec *us, nfound++; } } - return(nfound); + return nfound; } int @@ -426,7 +426,7 @@ sudo_file_display_privs(struct sudo_nss *nss, struct passwd *pw, nfound += sudo_file_display_priv_short(pw, us, lbuf); } done: - return(nfound); + return nfound; } /* @@ -478,7 +478,7 @@ sudo_file_display_defaults(struct sudo_nss *nss, struct passwd *pw, nfound++; } done: - return(nfound); + return nfound; } /* @@ -494,7 +494,7 @@ sudo_file_display_bound_defaults(struct sudo_nss *nss, struct passwd *pw, nfound += display_bound_defaults(DEFAULTS_RUNAS, lbuf); nfound += display_bound_defaults(DEFAULTS_CMND, lbuf); - return(nfound); + return nfound; } /* @@ -530,7 +530,7 @@ display_bound_defaults(int dtype, struct lbuf *lbuf) dsep = "!"; break; default: - return(-1); + return -1; } /* sudo_printf(SUDO_CONV_INFO_MSG, "Per-%s Defaults entries:\n", dname); */ tq_foreach_fwd(&defaults, d) { @@ -558,7 +558,7 @@ display_bound_defaults(int dtype, struct lbuf *lbuf) lbuf_append(lbuf, d->op == FALSE ? "!" : "", d->var, NULL); } - return(nfound); + return nfound; } int @@ -604,7 +604,7 @@ sudo_file_display_cmnd(struct sudo_nss *nss, struct passwd *pw) rval = 0; } done: - return(rval); + return rval; } /* diff --git a/plugins/sudoers/pwutil.c b/plugins/sudoers/pwutil.c index f18a9a278..b9c7a1857 100644 --- a/plugins/sudoers/pwutil.c +++ b/plugins/sudoers/pwutil.c @@ -91,7 +91,7 @@ cmp_pwuid(const void *v1, const void *v2) { const struct cache_item *ci1 = (const struct cache_item *) v1; const struct cache_item *ci2 = (const struct cache_item *) v2; - return(ci1->k.uid - ci2->k.uid); + return ci1->k.uid - ci2->k.uid; } /* @@ -102,7 +102,7 @@ cmp_pwnam(const void *v1, const void *v2) { const struct cache_item *ci1 = (const struct cache_item *) v1; const struct cache_item *ci2 = (const struct cache_item *) v2; - return(strcmp(ci1->k.name, ci2->k.name)); + return strcmp(ci1->k.name, ci2->k.name); } #define FIELD_SIZE(src, name, size) \ @@ -161,7 +161,7 @@ make_pwitem(const struct passwd *pw, const char *name) /* Allocate space for struct item, struct passwd and the strings. */ if ((item = malloc(total)) == NULL) - return(NULL); + return NULL; cp = (char *) item + sizeof(struct cache_item); /* @@ -193,7 +193,7 @@ make_pwitem(const struct passwd *pw, const char *name) item->d.pw = newpw; item->refcnt = 1; - return(item); + return item; } void @@ -257,7 +257,7 @@ sudo_getpwuid(uid_t uid) #endif done: item->refcnt++; - return(item->d.pw); + return item->d.pw; } /* @@ -301,7 +301,7 @@ sudo_getpwnam(const char *name) #endif done: item->refcnt++; - return(item->d.pw); + return item->d.pw; } /* @@ -357,7 +357,7 @@ sudo_fakepwnam(const char *user, gid_t gid) } } item->refcnt++; - return(pw); + return pw; } void @@ -398,7 +398,7 @@ cmp_grgid(const void *v1, const void *v2) { const struct cache_item *ci1 = (const struct cache_item *) v1; const struct cache_item *ci2 = (const struct cache_item *) v2; - return(ci1->k.gid - ci2->k.gid); + return ci1->k.gid - ci2->k.gid; } /* @@ -429,7 +429,7 @@ make_gritem(const struct group *gr, const char *name) total += strlen(name) + 1; if ((item = malloc(total)) == NULL) - return(NULL); + return NULL; cp = (char *) item + sizeof(struct cache_item); /* @@ -464,7 +464,7 @@ make_gritem(const struct group *gr, const char *name) item->d.gr = newgr; item->refcnt = 1; - return(item); + return item; } void @@ -521,7 +521,7 @@ sudo_getgrgid(gid_t gid) } done: item->refcnt++; - return(item->d.gr); + return item->d.gr; } /* @@ -558,7 +558,7 @@ sudo_getgrnam(const char *name) } done: item->refcnt++; - return(item->d.gr); + return item->d.gr; } /* @@ -603,7 +603,7 @@ sudo_fakegrnam(const char *group) } } item->refcnt++; - return(gr); + return gr; } void @@ -712,5 +712,5 @@ user_in_group(struct passwd *pw, const char *group) done: if (grp != NULL) gr_delref(grp); - return(retval); + return retval; } diff --git a/plugins/sudoers/redblack.c b/plugins/sudoers/redblack.c index 1ccc4edcc..55ba39b89 100644 --- a/plugins/sudoers/redblack.c +++ b/plugins/sudoers/redblack.c @@ -109,7 +109,7 @@ rbcreate(int (*compar)(const void *, const void*)) tree->root.color = black; tree->root.data = NULL; - return(tree); + return tree; } /* @@ -174,7 +174,7 @@ rbinsert(struct rbtree *tree, void *data) while (node != rbnil(tree)) { parent = node; if ((res = tree->compar(data, node->data)) == 0) - return(node); + return node; node = res < 0 ? node->left : node->right; } @@ -248,7 +248,7 @@ rbinsert(struct rbtree *tree, void *data) } } rbfirst(tree)->color = black; /* first node is always black */ - return(NULL); + return NULL; } /* @@ -263,10 +263,10 @@ rbfind(struct rbtree *tree, void *key) while (node != rbnil(tree)) { if ((res = tree->compar(key, node->data)) == 0) - return(node); + return node; node = res < 0 ? node->left : node->right; } - return(NULL); + return NULL; } /* @@ -283,19 +283,19 @@ rbapply_node(struct rbtree *tree, struct rbnode *node, if (node != rbnil(tree)) { if (order == preorder) if ((error = func(node->data, cookie)) != 0) - return(error); + return error; if ((error = rbapply_node(tree, node->left, func, cookie, order)) != 0) - return(error); + return error; if (order == inorder) if ((error = func(node->data, cookie)) != 0) - return(error); + return error; if ((error = rbapply_node(tree, node->right, func, cookie, order)) != 0) - return(error); + return error; if (order == postorder) if ((error = func(node->data, cookie)) != 0) - return(error); + return error; } - return (0); + return 0; } /* @@ -316,7 +316,7 @@ rbsuccessor(struct rbtree *tree, struct rbnode *node) if (succ == rbroot(tree)) succ = rbnil(tree); } - return(succ); + return succ; } /* @@ -382,7 +382,7 @@ void *rbdelete(struct rbtree *tree, struct rbnode *z) } free(z); - return (data); + return data; } /* diff --git a/plugins/sudoers/set_perms.c b/plugins/sudoers/set_perms.c index 5d3773eb5..911f16d97 100644 --- a/plugins/sudoers/set_perms.c +++ b/plugins/sudoers/set_perms.c @@ -292,7 +292,7 @@ bad: warningx("%s: %s", errstr, errno == EAGAIN ? "too many processes" : strerror(errno)); if (noexit) - return(0); + return 0; exit(1); } @@ -517,7 +517,7 @@ bad: warningx("%s: %s", errstr, errno == EAGAIN ? "too many processes" : strerror(errno)); if (noexit) - return(0); + return 0; exit(1); } @@ -748,7 +748,7 @@ bad: warningx("%s: %s", errstr, errno == EAGAIN ? "too many processes" : strerror(errno)); if (noexit) - return(0); + return 0; exit(1); } @@ -882,7 +882,7 @@ bad: warningx("%s: %s", errstr, errno == EAGAIN ? "too many processes" : strerror(errno)); if (noexit) - return(0); + return 0; exit(1); } diff --git a/plugins/sudoers/sudo_nss.c b/plugins/sudoers/sudo_nss.c index a5c8e11cb..8f81f3cf5 100644 --- a/plugins/sudoers/sudo_nss.c +++ b/plugins/sudoers/sudo_nss.c @@ -100,7 +100,7 @@ nomatch: if (tq_empty(&snl)) tq_append(&snl, &sudo_nss_file); - return(&snl); + return &snl; } #else /* HAVE_LDAP && _PATH_NSSWITCH_CONF */ @@ -179,7 +179,7 @@ nomatch: if (tq_empty(&snl)) tq_append(&snl, &sudo_nss_file); - return(&snl); + return &snl; } # else /* !_PATH_NETSVC_CONF && !_PATH_NSSWITCH_CONF */ @@ -197,7 +197,7 @@ sudo_read_nss(void) # endif tq_append(&snl, &sudo_nss_file); - return(&snl); + return &snl; } # endif /* !HAVE_LDAP || !_PATH_NETSVC_CONF */ @@ -317,7 +317,7 @@ display_cmnd(struct sudo_nss_list *snl, struct passwd *pw) tq_foreach_fwd(snl, nss) { if (nss->display_cmnd(nss, pw) == 0) - return(0); + return 0; } - return(1); + return 1; } diff --git a/plugins/sudoers/sudoers.c b/plugins/sudoers/sudoers.c index a98fc2a9f..61b144077 100644 --- a/plugins/sudoers/sudoers.c +++ b/plugins/sudoers/sudoers.c @@ -855,7 +855,7 @@ set_cmnd(int sudo_mode) if (!runas_user && !runas_group) set_runaspw(def_runas_default); /* may have been updated above */ - return(rval); + return rval; } /* @@ -932,7 +932,7 @@ open_sudoers(const char *sudoers, int doedit, int *keepopen) } restore_perms(); /* change back to root */ - return(fp); + return fp; } #ifdef HAVE_LOGIN_CAP_H diff --git a/plugins/sudoers/sudoreplay.c b/plugins/sudoers/sudoreplay.c index a88083caf..e86fc49d5 100644 --- a/plugins/sudoers/sudoreplay.c +++ b/plugins/sudoers/sudoreplay.c @@ -529,7 +529,7 @@ parse_expr(struct search_node **headp, char *argv[]) errorx(1, "unmatched ')' in expression"); if (node_stack[stack_top]) sn->next = node_stack[stack_top]->next; - return(av - argv + 1); + return av - argv + 1; bad: default: errorx(1, "unknown search term \"%s\"", *av); @@ -575,7 +575,7 @@ parse_expr(struct search_node **headp, char *argv[]) if (not) errorx(1, "illegal trailing \"!\""); - return(av - argv); + return av - argv; } static int @@ -631,7 +631,7 @@ match_expr(struct search_node *head, struct log_info *log) if (sn->negated) matched = !matched; } - return(matched); + return matched; } static int @@ -648,7 +648,7 @@ list_session_dir(char *pathbuf, REGEX_T *re, const char *user, const char *tty) d = opendir(pathbuf); if (d == NULL && errno != ENOTDIR) { warning("cannot opendir %s", pathbuf); - return(-1); + return -1; } while ((dp = readdir(d)) != NULL) { if (NAMLEN(dp) != 2 || !isalnum((unsigned char)dp->d_name[0]) || @@ -733,7 +733,7 @@ list_session_dir(char *pathbuf, REGEX_T *re, const char *user, const char *tty) printf("GROUP=%s ; ", li.runas_group); printf("TSID=%s ; COMMAND=%s\n", idstr, li.cmd); } - return(0); + return 0; } static int @@ -801,7 +801,7 @@ list_sessions(int argc, char **argv, const char *pattern, const char *user, closedir(d2); } closedir(d1); - return(0); + return 0; } /* diff --git a/plugins/sudoers/testsudoers.c b/plugins/sudoers/testsudoers.c index 7a1228be2..ef12f6745 100644 --- a/plugins/sudoers/testsudoers.c +++ b/plugins/sudoers/testsudoers.c @@ -342,7 +342,7 @@ sudo_endspent(void) char * sudo_getepw(const struct passwd *pw) { - return (pw->pw_passwd); + return pw->pw_passwd; } void @@ -354,7 +354,7 @@ set_fqdn(void) FILE * open_sudoers(const char *path, int isdir, int *keepopen) { - return(fopen(path, "r")); + return fopen(path, "r"); } void @@ -468,7 +468,7 @@ print_alias(void *v1, void *v2) fputs(m->name, stdout); } putchar('\n'); - return(0); + return 0; } void diff --git a/plugins/sudoers/timestr.c b/plugins/sudoers/timestr.c index 97309c092..64cb64f79 100644 --- a/plugins/sudoers/timestr.c +++ b/plugins/sudoers/timestr.c @@ -53,7 +53,7 @@ get_timestr(time_t tstamp, int log_year) /* strftime() does not guarantee to NUL-terminate so we must check. */ buf[sizeof(buf) - 1] = '\0'; if (strftime(buf, sizeof(buf), s, timeptr) && buf[sizeof(buf) - 1] == '\0') - return(buf); + return buf; #endif /* HAVE_STRFTIME */ @@ -63,5 +63,5 @@ get_timestr(time_t tstamp, int log_year) else s[15] = '\0'; /* don't care about year */ - return(s); + return s; } diff --git a/plugins/sudoers/toke.c b/plugins/sudoers/toke.c index 0e1096f99..512754b02 100644 --- a/plugins/sudoers/toke.c +++ b/plugins/sudoers/toke.c @@ -1490,7 +1490,7 @@ static char *parse_include(char *); #define INSTR 5 -#line 1495 "lex.yy.c" +#line 1493 "lex.yy.c" /* Macros after this point can all be overridden by user definitions in * section 1. @@ -1644,9 +1644,9 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 118 "toke.l" +#line 116 "toke.l" -#line 1651 "lex.yy.c" +#line 1649 "lex.yy.c" if ( yy_init ) { @@ -1732,57 +1732,57 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 119 "toke.l" +#line 117 "toke.l" BEGIN STARTDEFS; YY_BREAK case 2: YY_RULE_SETUP -#line 121 "toke.l" +#line 119 "toke.l" { BEGIN INDEFS; LEXTRACE("DEFVAR "); if (!fill(yytext, yyleng)) yyterminate(); - return(DEFVAR); + return DEFVAR; } YY_BREAK case 3: YY_RULE_SETUP -#line 130 "toke.l" +#line 128 "toke.l" { BEGIN STARTDEFS; LEXTRACE(", "); - return(','); + return ','; } /* return ',' */ YY_BREAK case 4: YY_RULE_SETUP -#line 136 "toke.l" +#line 134 "toke.l" { LEXTRACE("= "); - return('='); + return '='; } /* return '=' */ YY_BREAK case 5: YY_RULE_SETUP -#line 141 "toke.l" +#line 139 "toke.l" { LEXTRACE("+= "); - return('+'); + return '+'; } /* return '+' */ YY_BREAK case 6: YY_RULE_SETUP -#line 146 "toke.l" +#line 144 "toke.l" { LEXTRACE("-= "); - return('-'); + return '-'; } /* return '-' */ YY_BREAK case 7: YY_RULE_SETUP -#line 151 "toke.l" +#line 149 "toke.l" { LEXTRACE("BEGINSTR "); yylval.string = NULL; @@ -1791,19 +1791,19 @@ YY_RULE_SETUP YY_BREAK case 8: YY_RULE_SETUP -#line 157 "toke.l" +#line 155 "toke.l" { LEXTRACE("WORD(2) "); if (!fill(yytext, yyleng)) yyterminate(); - return(WORD); + return WORD; } YY_BREAK case 9: YY_RULE_SETUP -#line 166 "toke.l" +#line 164 "toke.l" { /* Line continuation char followed by newline. */ ++sudolineno; @@ -1812,16 +1812,16 @@ YY_RULE_SETUP YY_BREAK case 10: YY_RULE_SETUP -#line 172 "toke.l" +#line 170 "toke.l" { LEXTRACE("ENDSTR "); BEGIN INDEFS; - return(WORD); + return WORD; } YY_BREAK case 11: YY_RULE_SETUP -#line 178 "toke.l" +#line 176 "toke.l" { LEXTRACE("BACKSLASH "); if (!append(yytext, yyleng)) @@ -1830,7 +1830,7 @@ YY_RULE_SETUP YY_BREAK case 12: YY_RULE_SETUP -#line 184 "toke.l" +#line 182 "toke.l" { LEXTRACE("STRBODY "); if (!append(yytext, yyleng)) @@ -1841,7 +1841,7 @@ YY_RULE_SETUP case 13: YY_RULE_SETUP -#line 192 "toke.l" +#line 190 "toke.l" { /* quoted fnmatch glob char, pass verbatim */ LEXTRACE("QUOTEDCHAR "); @@ -1852,7 +1852,7 @@ YY_RULE_SETUP YY_BREAK case 14: YY_RULE_SETUP -#line 200 "toke.l" +#line 198 "toke.l" { /* quoted sudoers special char, strip backslash */ LEXTRACE("QUOTEDCHAR "); @@ -1863,16 +1863,16 @@ YY_RULE_SETUP YY_BREAK case 15: YY_RULE_SETUP -#line 208 "toke.l" +#line 206 "toke.l" { BEGIN INITIAL; yyless(0); - return(COMMAND); + return COMMAND; } /* end of command line args */ YY_BREAK case 16: YY_RULE_SETUP -#line 214 "toke.l" +#line 212 "toke.l" { LEXTRACE("ARG "); if (!fill_args(yytext, yyleng, sawspace)) @@ -1883,7 +1883,7 @@ YY_RULE_SETUP case 17: YY_RULE_SETUP -#line 222 "toke.l" +#line 220 "toke.l" { char *path; @@ -1899,7 +1899,7 @@ YY_RULE_SETUP YY_BREAK case 18: YY_RULE_SETUP -#line 235 "toke.l" +#line 233 "toke.l" { char *path; @@ -1918,7 +1918,7 @@ YY_RULE_SETUP YY_BREAK case 19: YY_RULE_SETUP -#line 251 "toke.l" +#line 249 "toke.l" { int n; for (n = 0; isblank((unsigned char)yytext[n]); n++) @@ -1929,28 +1929,28 @@ YY_RULE_SETUP case ':': yyless(n); LEXTRACE("DEFAULTS_USER "); - return(DEFAULTS_USER); + return DEFAULTS_USER; case '>': yyless(n); LEXTRACE("DEFAULTS_RUNAS "); - return(DEFAULTS_RUNAS); + return DEFAULTS_RUNAS; case '@': yyless(n); LEXTRACE("DEFAULTS_HOST "); - return(DEFAULTS_HOST); + return DEFAULTS_HOST; case '!': yyless(n); LEXTRACE("DEFAULTS_CMND "); - return(DEFAULTS_CMND); + return DEFAULTS_CMND; default: LEXTRACE("DEFAULTS "); - return(DEFAULTS); + return DEFAULTS; } } YY_BREAK case 20: YY_RULE_SETUP -#line 280 "toke.l" +#line 278 "toke.l" { int n; for (n = 0; isblank((unsigned char)yytext[n]); n++) @@ -1958,210 +1958,210 @@ YY_RULE_SETUP switch (yytext[n]) { case 'H': LEXTRACE("HOSTALIAS "); - return(HOSTALIAS); + return HOSTALIAS; case 'C': LEXTRACE("CMNDALIAS "); - return(CMNDALIAS); + return CMNDALIAS; case 'U': LEXTRACE("USERALIAS "); - return(USERALIAS); + return USERALIAS; case 'R': LEXTRACE("RUNASALIAS "); - return(RUNASALIAS); + return RUNASALIAS; } } YY_BREAK case 21: YY_RULE_SETUP -#line 300 "toke.l" +#line 298 "toke.l" { /* cmnd does not require passwd for this user */ LEXTRACE("NOPASSWD "); - return(NOPASSWD); + return NOPASSWD; } YY_BREAK case 22: YY_RULE_SETUP -#line 306 "toke.l" +#line 304 "toke.l" { /* cmnd requires passwd for this user */ LEXTRACE("PASSWD "); - return(PASSWD); + return PASSWD; } YY_BREAK case 23: YY_RULE_SETUP -#line 312 "toke.l" +#line 310 "toke.l" { LEXTRACE("NOEXEC "); - return(NOEXEC); + return NOEXEC; } YY_BREAK case 24: YY_RULE_SETUP -#line 317 "toke.l" +#line 315 "toke.l" { LEXTRACE("EXEC "); - return(EXEC); + return EXEC; } YY_BREAK case 25: YY_RULE_SETUP -#line 322 "toke.l" +#line 320 "toke.l" { LEXTRACE("SETENV "); - return(SETENV); + return SETENV; } YY_BREAK case 26: YY_RULE_SETUP -#line 327 "toke.l" +#line 325 "toke.l" { LEXTRACE("NOSETENV "); - return(NOSETENV); + return NOSETENV; } YY_BREAK case 27: YY_RULE_SETUP -#line 332 "toke.l" +#line 330 "toke.l" { LEXTRACE("LOG_OUTPUT "); - return(LOG_OUTPUT); + return LOG_OUTPUT; } YY_BREAK case 28: YY_RULE_SETUP -#line 337 "toke.l" +#line 335 "toke.l" { LEXTRACE("NOLOG_OUTPUT "); - return(NOLOG_OUTPUT); + return NOLOG_OUTPUT; } YY_BREAK case 29: YY_RULE_SETUP -#line 342 "toke.l" +#line 340 "toke.l" { LEXTRACE("LOG_INPUT "); - return(LOG_INPUT); + return LOG_INPUT; } YY_BREAK case 30: YY_RULE_SETUP -#line 347 "toke.l" +#line 345 "toke.l" { LEXTRACE("NOLOG_INPUT "); - return(NOLOG_INPUT); + return NOLOG_INPUT; } YY_BREAK case 31: YY_RULE_SETUP -#line 352 "toke.l" +#line 350 "toke.l" { /* netgroup */ if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("NETGROUP "); - return(NETGROUP); + return NETGROUP; } YY_BREAK case 32: YY_RULE_SETUP -#line 360 "toke.l" +#line 358 "toke.l" { /* UN*X group */ if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("USERGROUP "); - return(USERGROUP); + return USERGROUP; } YY_BREAK case 33: YY_RULE_SETUP -#line 368 "toke.l" +#line 366 "toke.l" { if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("NTWKADDR "); - return(NTWKADDR); + return NTWKADDR; } YY_BREAK case 34: YY_RULE_SETUP -#line 375 "toke.l" +#line 373 "toke.l" { if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("NTWKADDR "); - return(NTWKADDR); + return NTWKADDR; } YY_BREAK case 35: YY_RULE_SETUP -#line 382 "toke.l" +#line 380 "toke.l" { if (!ipv6_valid(yytext)) { LEXTRACE("ERROR "); - return(ERROR); + return ERROR; } if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("NTWKADDR "); - return(NTWKADDR); + return NTWKADDR; } YY_BREAK case 36: YY_RULE_SETUP -#line 393 "toke.l" +#line 391 "toke.l" { if (!ipv6_valid(yytext)) { LEXTRACE("ERROR "); - return(ERROR); + return ERROR; } if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("NTWKADDR "); - return(NTWKADDR); + return NTWKADDR; } YY_BREAK case 37: YY_RULE_SETUP -#line 404 "toke.l" +#line 402 "toke.l" { if (strcmp(yytext, "ALL") == 0) { LEXTRACE("ALL "); - return(ALL); + return ALL; } #ifdef HAVE_SELINUX /* XXX - restrict type/role to initial state */ if (strcmp(yytext, "TYPE") == 0) { LEXTRACE("TYPE "); - return(TYPE); + return TYPE; } if (strcmp(yytext, "ROLE") == 0) { LEXTRACE("ROLE "); - return(ROLE); + return ROLE; } #endif /* HAVE_SELINUX */ if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("ALIAS "); - return(ALIAS); + return ALIAS; } YY_BREAK case 38: YY_RULE_SETUP -#line 426 "toke.l" +#line 424 "toke.l" { /* no command args allowed for Defaults!/path */ if (!fill_cmnd(yytext, yyleng)) yyterminate(); LEXTRACE("COMMAND "); - return(COMMAND); + return COMMAND; } YY_BREAK case 39: YY_RULE_SETUP -#line 434 "toke.l" +#line 432 "toke.l" { BEGIN GOTCMND; LEXTRACE("COMMAND "); @@ -2171,14 +2171,14 @@ YY_RULE_SETUP YY_BREAK case 40: YY_RULE_SETUP -#line 441 "toke.l" +#line 439 "toke.l" { /* directories can't have args... */ if (yytext[yyleng - 1] == '/') { LEXTRACE("COMMAND "); if (!fill_cmnd(yytext, yyleng)) yyterminate(); - return(COMMAND); + return COMMAND; } else { BEGIN GOTCMND; LEXTRACE("COMMAND "); @@ -2189,7 +2189,7 @@ YY_RULE_SETUP YY_BREAK case 41: YY_RULE_SETUP -#line 456 "toke.l" +#line 454 "toke.l" { /* a quoted user/group name */ if (!fill(yytext + 1, yyleng - 2)) @@ -2197,95 +2197,95 @@ YY_RULE_SETUP switch (yytext[1]) { case '%': LEXTRACE("USERGROUP "); - return(USERGROUP); + return USERGROUP; case '+': LEXTRACE("NETGROUP "); - return(NETGROUP); + return NETGROUP; default: LEXTRACE("WORD(4) "); - return(WORD); + return WORD; } } YY_BREAK case 42: YY_RULE_SETUP -#line 473 "toke.l" +#line 471 "toke.l" { /* a word */ if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("WORD(5) "); - return(WORD); + return WORD; } YY_BREAK case 43: YY_RULE_SETUP -#line 481 "toke.l" +#line 479 "toke.l" { LEXTRACE("( "); - return ('('); + return '('; } YY_BREAK case 44: YY_RULE_SETUP -#line 486 "toke.l" +#line 484 "toke.l" { LEXTRACE(") "); - return(')'); + return ')'; } YY_BREAK case 45: YY_RULE_SETUP -#line 491 "toke.l" +#line 489 "toke.l" { LEXTRACE(", "); - return(','); + return ','; } /* return ',' */ YY_BREAK case 46: YY_RULE_SETUP -#line 496 "toke.l" +#line 494 "toke.l" { LEXTRACE("= "); - return('='); + return '='; } /* return '=' */ YY_BREAK case 47: YY_RULE_SETUP -#line 501 "toke.l" +#line 499 "toke.l" { LEXTRACE(": "); - return(':'); + return ':'; } /* return ':' */ YY_BREAK case 48: YY_RULE_SETUP -#line 506 "toke.l" +#line 504 "toke.l" { if (yyleng % 2 == 1) - return('!'); /* return '!' */ + return '!'; /* return '!' */ } YY_BREAK case 49: YY_RULE_SETUP -#line 511 "toke.l" +#line 509 "toke.l" { BEGIN INITIAL; ++sudolineno; LEXTRACE("\n"); - return(COMMENT); + return COMMENT; } /* return newline */ YY_BREAK case 50: YY_RULE_SETUP -#line 518 "toke.l" +#line 516 "toke.l" { /* throw away space/tabs */ sawspace = TRUE; /* but remember for fill_args */ } YY_BREAK case 51: YY_RULE_SETUP -#line 522 "toke.l" +#line 520 "toke.l" { sawspace = TRUE; /* remember for fill_args */ ++sudolineno; @@ -2294,20 +2294,20 @@ YY_RULE_SETUP YY_BREAK case 52: YY_RULE_SETUP -#line 528 "toke.l" +#line 526 "toke.l" { BEGIN INITIAL; ++sudolineno; LEXTRACE("\n"); - return(COMMENT); + return COMMENT; } /* comment, not uid/gid */ YY_BREAK case 53: YY_RULE_SETUP -#line 535 "toke.l" +#line 533 "toke.l" { LEXTRACE("ERROR "); - return(ERROR); + return ERROR; } /* parse error */ YY_BREAK case YY_STATE_EOF(INITIAL): @@ -2316,12 +2316,12 @@ case YY_STATE_EOF(GOTCMND): case YY_STATE_EOF(STARTDEFS): case YY_STATE_EOF(INDEFS): case YY_STATE_EOF(INSTR): -#line 540 "toke.l" +#line 538 "toke.l" { if (YY_START != INITIAL) { BEGIN INITIAL; LEXTRACE("ERROR "); - return(ERROR); + return ERROR; } if (!pop_include()) yyterminate(); @@ -2329,10 +2329,10 @@ case YY_STATE_EOF(INSTR): YY_BREAK case 54: YY_RULE_SETUP -#line 550 "toke.l" +#line 548 "toke.l" ECHO; YY_BREAK -#line 2337 "lex.yy.c" +#line 2335 "lex.yy.c" case YY_END_OF_BUFFER: { @@ -3223,7 +3223,7 @@ int main() return 0; } #endif -#line 550 "toke.l" +#line 548 "toke.l" struct path_list { char *path; @@ -3244,7 +3244,7 @@ pl_compare(const void *v1, const void *v2) const struct path_list * const *p1 = v1; const struct path_list * const *p2 = v2; - return(strcmp((*p1)->path, (*p2)->path)); + return strcmp((*p1)->path, (*p2)->path); } static char * @@ -3260,7 +3260,7 @@ switch_dir(struct include_stack *stack, char *dirpath) if (!(dir = opendir(dirpath))) { yyerror(dirpath); - return(NULL); + return NULL; } while ((dent = readdir(dir))) { /* Ignore files that end in '~' or have a '.' in them. */ @@ -3318,7 +3318,7 @@ switch_dir(struct include_stack *stack, char *dirpath) } done: efree(dirpath); - return(path); + return path; bad: while (first != NULL) { pl = first; @@ -3329,7 +3329,7 @@ bad: efree(sorted); efree(dirpath); efree(path); - return(NULL); + return NULL; } #define MAX_SUDOERS_DEPTH 128 @@ -3372,26 +3372,26 @@ _push_include(char *path, int isdir) if (idepth >= istacksize) { if (idepth > MAX_SUDOERS_DEPTH) { yyerror("too many levels of includes"); - return(FALSE); + return FALSE; } istacksize += SUDOERS_STACK_INCREMENT; istack = (struct include_stack *) realloc(istack, sizeof(*istack) * istacksize); if (istack == NULL) { yyerror("unable to allocate memory"); - return(FALSE); + return FALSE; } } if (isdir) { if (!(path = switch_dir(&istack[idepth], path))) { /* switch_dir() called yyerror() for us */ - return(FALSE); + return FALSE; } while ((fp = open_sudoers(path, FALSE, &keepopen)) == NULL) { /* Unable to open path in includedir, go to next one, if any. */ efree(path); if ((pl = istack[idepth].more) == NULL) - return(FALSE); + return FALSE; path = pl->path; istack[idepth].more = pl->next; efree(pl); @@ -3399,7 +3399,7 @@ _push_include(char *path, int isdir) } else { if ((fp = open_sudoers(path, TRUE, &keepopen)) == NULL) { yyerror(path); - return(FALSE); + return FALSE; } istack[idepth].more = NULL; } @@ -3413,7 +3413,7 @@ _push_include(char *path, int isdir) sudoers = path; yy_switch_to_buffer(yy_create_buffer(fp, YY_BUF_SIZE)); - return(TRUE); + return TRUE; } static int @@ -3423,7 +3423,7 @@ pop_include(void) FILE *fp; if (idepth == 0) - return(FALSE); + return FALSE; if (!keepopen) fclose(YY_CURRENT_BUFFER->yy_input_file); @@ -3454,7 +3454,7 @@ pop_include(void) sudolineno = istack[idepth].lineno; keepopen = istack[idepth].keepopen; } - return(TRUE); + return TRUE; } static char * @@ -3506,5 +3506,5 @@ parse_include(char *base) if (*ep != '\0') yyless((int)(ep - base)); - return(path); + return path; } diff --git a/plugins/sudoers/toke.l b/plugins/sudoers/toke.l index ab32db50e..f0219b2bc 100644 --- a/plugins/sudoers/toke.l +++ b/plugins/sudoers/toke.l @@ -121,29 +121,29 @@ DEFVAR [a-z_]+ LEXTRACE("DEFVAR "); if (!fill(yytext, yyleng)) yyterminate(); - return(DEFVAR); + return DEFVAR; } { , { BEGIN STARTDEFS; LEXTRACE(", "); - return(','); + return ','; } /* return ',' */ = { LEXTRACE("= "); - return('='); + return '='; } /* return '=' */ \+= { LEXTRACE("+= "); - return('+'); + return '+'; } /* return '+' */ -= { LEXTRACE("-= "); - return('-'); + return '-'; } /* return '-' */ \" { @@ -156,7 +156,7 @@ DEFVAR [a-z_]+ LEXTRACE("WORD(2) "); if (!fill(yytext, yyleng)) yyterminate(); - return(WORD); + return WORD; } } @@ -170,7 +170,7 @@ DEFVAR [a-z_]+ \" { LEXTRACE("ENDSTR "); BEGIN INDEFS; - return(WORD); + return WORD; } \\ { @@ -206,7 +206,7 @@ DEFVAR [a-z_]+ [#:\,=\n] { BEGIN INITIAL; yyless(0); - return(COMMAND); + return COMMAND; } /* end of command line args */ [^#\\:, \t\n]+ { @@ -256,22 +256,22 @@ DEFVAR [a-z_]+ case ':': yyless(n); LEXTRACE("DEFAULTS_USER "); - return(DEFAULTS_USER); + return DEFAULTS_USER; case '>': yyless(n); LEXTRACE("DEFAULTS_RUNAS "); - return(DEFAULTS_RUNAS); + return DEFAULTS_RUNAS; case '@': yyless(n); LEXTRACE("DEFAULTS_HOST "); - return(DEFAULTS_HOST); + return DEFAULTS_HOST; case '!': yyless(n); LEXTRACE("DEFAULTS_CMND "); - return(DEFAULTS_CMND); + return DEFAULTS_CMND; default: LEXTRACE("DEFAULTS "); - return(DEFAULTS); + return DEFAULTS; } } @@ -282,69 +282,69 @@ DEFVAR [a-z_]+ switch (yytext[n]) { case 'H': LEXTRACE("HOSTALIAS "); - return(HOSTALIAS); + return HOSTALIAS; case 'C': LEXTRACE("CMNDALIAS "); - return(CMNDALIAS); + return CMNDALIAS; case 'U': LEXTRACE("USERALIAS "); - return(USERALIAS); + return USERALIAS; case 'R': LEXTRACE("RUNASALIAS "); - return(RUNASALIAS); + return RUNASALIAS; } } NOPASSWD[[:blank:]]*: { /* cmnd does not require passwd for this user */ LEXTRACE("NOPASSWD "); - return(NOPASSWD); + return NOPASSWD; } PASSWD[[:blank:]]*: { /* cmnd requires passwd for this user */ LEXTRACE("PASSWD "); - return(PASSWD); + return PASSWD; } NOEXEC[[:blank:]]*: { LEXTRACE("NOEXEC "); - return(NOEXEC); + return NOEXEC; } EXEC[[:blank:]]*: { LEXTRACE("EXEC "); - return(EXEC); + return EXEC; } SETENV[[:blank:]]*: { LEXTRACE("SETENV "); - return(SETENV); + return SETENV; } NOSETENV[[:blank:]]*: { LEXTRACE("NOSETENV "); - return(NOSETENV); + return NOSETENV; } LOG_OUTPUT[[:blank:]]*: { LEXTRACE("LOG_OUTPUT "); - return(LOG_OUTPUT); + return LOG_OUTPUT; } NOLOG_OUTPUT[[:blank:]]*: { LEXTRACE("NOLOG_OUTPUT "); - return(NOLOG_OUTPUT); + return NOLOG_OUTPUT; } LOG_INPUT[[:blank:]]*: { LEXTRACE("LOG_INPUT "); - return(LOG_INPUT); + return LOG_INPUT; } NOLOG_INPUT[[:blank:]]*: { LEXTRACE("NOLOG_INPUT "); - return(NOLOG_INPUT); + return NOLOG_INPUT; } \+{WORD} { @@ -352,7 +352,7 @@ NOLOG_INPUT[[:blank:]]*: { if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("NETGROUP "); - return(NETGROUP); + return NETGROUP; } \%:?{WORD} { @@ -360,65 +360,65 @@ NOLOG_INPUT[[:blank:]]*: { if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("USERGROUP "); - return(USERGROUP); + return USERGROUP; } {IPV4ADDR}(\/{IPV4ADDR})? { if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("NTWKADDR "); - return(NTWKADDR); + return NTWKADDR; } {IPV4ADDR}\/([12][0-9]*|3[0-2]*) { if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("NTWKADDR "); - return(NTWKADDR); + return NTWKADDR; } {IPV6ADDR}(\/{IPV6ADDR})? { if (!ipv6_valid(yytext)) { LEXTRACE("ERROR "); - return(ERROR); + return ERROR; } if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("NTWKADDR "); - return(NTWKADDR); + return NTWKADDR; } {IPV6ADDR}\/([0-9]|[1-9][0-9]|1[01][0-9]|12[0-8]) { if (!ipv6_valid(yytext)) { LEXTRACE("ERROR "); - return(ERROR); + return ERROR; } if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("NTWKADDR "); - return(NTWKADDR); + return NTWKADDR; } [[:upper:]][[:upper:][:digit:]_]* { if (strcmp(yytext, "ALL") == 0) { LEXTRACE("ALL "); - return(ALL); + return ALL; } #ifdef HAVE_SELINUX /* XXX - restrict type/role to initial state */ if (strcmp(yytext, "TYPE") == 0) { LEXTRACE("TYPE "); - return(TYPE); + return TYPE; } if (strcmp(yytext, "ROLE") == 0) { LEXTRACE("ROLE "); - return(ROLE); + return ROLE; } #endif /* HAVE_SELINUX */ if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("ALIAS "); - return(ALIAS); + return ALIAS; } ({PATH}|sudoedit) { @@ -426,7 +426,7 @@ NOLOG_INPUT[[:blank:]]*: { if (!fill_cmnd(yytext, yyleng)) yyterminate(); LEXTRACE("COMMAND "); - return(COMMAND); + return COMMAND; } sudoedit { @@ -442,7 +442,7 @@ sudoedit { LEXTRACE("COMMAND "); if (!fill_cmnd(yytext, yyleng)) yyterminate(); - return(COMMAND); + return COMMAND; } else { BEGIN GOTCMND; LEXTRACE("COMMAND "); @@ -458,13 +458,13 @@ sudoedit { switch (yytext[1]) { case '%': LEXTRACE("USERGROUP "); - return(USERGROUP); + return USERGROUP; case '+': LEXTRACE("NETGROUP "); - return(NETGROUP); + return NETGROUP; default: LEXTRACE("WORD(4) "); - return(WORD); + return WORD; } } @@ -473,44 +473,44 @@ sudoedit { if (!fill(yytext, yyleng)) yyterminate(); LEXTRACE("WORD(5) "); - return(WORD); + return WORD; } \( { LEXTRACE("( "); - return ('('); + return '('; } \) { LEXTRACE(") "); - return(')'); + return ')'; } , { LEXTRACE(", "); - return(','); + return ','; } /* return ',' */ = { LEXTRACE("= "); - return('='); + return '='; } /* return '=' */ : { LEXTRACE(": "); - return(':'); + return ':'; } /* return ':' */ <*>!+ { if (yyleng % 2 == 1) - return('!'); /* return '!' */ + return '!'; /* return '!' */ } <*>\n { BEGIN INITIAL; ++sudolineno; LEXTRACE("\n"); - return(COMMENT); + return COMMENT; } /* return newline */ <*>[[:blank:]]+ { /* throw away space/tabs */ @@ -527,19 +527,19 @@ sudoedit { BEGIN INITIAL; ++sudolineno; LEXTRACE("\n"); - return(COMMENT); + return COMMENT; } /* comment, not uid/gid */ <*>. { LEXTRACE("ERROR "); - return(ERROR); + return ERROR; } /* parse error */ <*><> { if (YY_START != INITIAL) { BEGIN INITIAL; LEXTRACE("ERROR "); - return(ERROR); + return ERROR; } if (!pop_include()) yyterminate(); @@ -565,7 +565,7 @@ pl_compare(const void *v1, const void *v2) const struct path_list * const *p1 = v1; const struct path_list * const *p2 = v2; - return(strcmp((*p1)->path, (*p2)->path)); + return strcmp((*p1)->path, (*p2)->path); } static char * @@ -581,7 +581,7 @@ switch_dir(struct include_stack *stack, char *dirpath) if (!(dir = opendir(dirpath))) { yyerror(dirpath); - return(NULL); + return NULL; } while ((dent = readdir(dir))) { /* Ignore files that end in '~' or have a '.' in them. */ @@ -639,7 +639,7 @@ switch_dir(struct include_stack *stack, char *dirpath) } done: efree(dirpath); - return(path); + return path; bad: while (first != NULL) { pl = first; @@ -650,7 +650,7 @@ bad: efree(sorted); efree(dirpath); efree(path); - return(NULL); + return NULL; } #define MAX_SUDOERS_DEPTH 128 @@ -693,26 +693,26 @@ _push_include(char *path, int isdir) if (idepth >= istacksize) { if (idepth > MAX_SUDOERS_DEPTH) { yyerror("too many levels of includes"); - return(FALSE); + return FALSE; } istacksize += SUDOERS_STACK_INCREMENT; istack = (struct include_stack *) realloc(istack, sizeof(*istack) * istacksize); if (istack == NULL) { yyerror("unable to allocate memory"); - return(FALSE); + return FALSE; } } if (isdir) { if (!(path = switch_dir(&istack[idepth], path))) { /* switch_dir() called yyerror() for us */ - return(FALSE); + return FALSE; } while ((fp = open_sudoers(path, FALSE, &keepopen)) == NULL) { /* Unable to open path in includedir, go to next one, if any. */ efree(path); if ((pl = istack[idepth].more) == NULL) - return(FALSE); + return FALSE; path = pl->path; istack[idepth].more = pl->next; efree(pl); @@ -720,7 +720,7 @@ _push_include(char *path, int isdir) } else { if ((fp = open_sudoers(path, TRUE, &keepopen)) == NULL) { yyerror(path); - return(FALSE); + return FALSE; } istack[idepth].more = NULL; } @@ -734,7 +734,7 @@ _push_include(char *path, int isdir) sudoers = path; yy_switch_to_buffer(yy_create_buffer(fp, YY_BUF_SIZE)); - return(TRUE); + return TRUE; } static int @@ -744,7 +744,7 @@ pop_include(void) FILE *fp; if (idepth == 0) - return(FALSE); + return FALSE; if (!keepopen) fclose(YY_CURRENT_BUFFER->yy_input_file); @@ -775,7 +775,7 @@ pop_include(void) sudolineno = istack[idepth].lineno; keepopen = istack[idepth].keepopen; } - return(TRUE); + return TRUE; } static char * @@ -827,5 +827,5 @@ parse_include(char *base) if (*ep != '\0') yyless((int)(ep - base)); - return(path); + return path; } diff --git a/plugins/sudoers/toke_util.c b/plugins/sudoers/toke_util.c index d8d441538..1ae4ceb45 100644 --- a/plugins/sudoers/toke_util.c +++ b/plugins/sudoers/toke_util.c @@ -98,7 +98,7 @@ hexchar(const char *s) s++; } } - return((unsigned char)result); + return (unsigned char)result; } int @@ -109,7 +109,7 @@ fill_txt(const char *src, int len, int olen) dst = olen ? realloc(yylval.string, olen + len + 1) : malloc(len + 1); if (dst == NULL) { yyerror("unable to allocate memory"); - return(FALSE); + return FALSE; } yylval.string = dst; @@ -133,7 +133,7 @@ fill_txt(const char *src, int len, int olen) } } *dst = '\0'; - return(TRUE); + return TRUE; } int @@ -144,7 +144,7 @@ append(const char *src, int len) if (yylval.string != NULL) olen = strlen(yylval.string); - return(fill_txt(src, len, olen)); + return fill_txt(src, len, olen); } #define SPECIAL(c) \ @@ -161,7 +161,7 @@ fill_cmnd(const char *src, int len) dst = yylval.command.cmnd = (char *) malloc(len + 1); if (yylval.command.cmnd == NULL) { yyerror("unable to allocate memory"); - return(FALSE); + return FALSE; } /* Copy the string and collapse any escaped sudo-specific characters. */ @@ -174,7 +174,7 @@ fill_cmnd(const char *src, int len) *dst = '\0'; yylval.command.args = NULL; - return(TRUE); + return TRUE; } int @@ -200,7 +200,7 @@ fill_args(const char *s, int len, int addspace) if (p == NULL) { efree(yylval.command.args); yyerror("unable to allocate memory"); - return(FALSE); + return FALSE; } else yylval.command.args = p; } @@ -211,10 +211,10 @@ fill_args(const char *s, int len, int addspace) *p++ = ' '; if (strlcpy(p, s, arg_size - (p - yylval.command.args)) != len) { yyerror("fill_args: buffer overflow"); /* paranoia */ - return(FALSE); + return FALSE; } arg_len = new_len; - return(TRUE); + return TRUE; } /* @@ -236,5 +236,5 @@ ipv6_valid(const char *s) nmatch = 0; /* reset if we hit netmask */ } - return (nmatch <= 1); + return nmatch <= 1; } diff --git a/plugins/sudoers/tsgetgrpw.c b/plugins/sudoers/tsgetgrpw.c index 69997ccc5..a2bee39da 100644 --- a/plugins/sudoers/tsgetgrpw.c +++ b/plugins/sudoers/tsgetgrpw.c @@ -117,38 +117,38 @@ getpwent(void) char *cp, *colon; if ((colon = fgets(pwbuf, sizeof(pwbuf), pwf)) == NULL) - return(NULL); + return NULL; zero_bytes(&pw, sizeof(pw)); if ((colon = strchr(cp = colon, ':')) == NULL) - return(NULL); + return NULL; *colon++ = '\0'; pw.pw_name = cp; if ((colon = strchr(cp = colon, ':')) == NULL) - return(NULL); + return NULL; *colon++ = '\0'; pw.pw_passwd = cp; if ((colon = strchr(cp = colon, ':')) == NULL) - return(NULL); + return NULL; *colon++ = '\0'; pw.pw_uid = atoi(cp); if ((colon = strchr(cp = colon, ':')) == NULL) - return(NULL); + return NULL; *colon++ = '\0'; pw.pw_gid = atoi(cp); if ((colon = strchr(cp = colon, ':')) == NULL) - return(NULL); + return NULL; *colon++ = '\0'; pw.pw_gecos = cp; if ((colon = strchr(cp = colon, ':')) == NULL) - return(NULL); + return NULL; *colon++ = '\0'; pw.pw_dir = cp; pw.pw_shell = colon; len = strlen(colon); if (len > 0 && colon[len - 1] == '\n') colon[len - 1] = '\0'; - return(&pw); + return &pw; } struct passwd * @@ -158,7 +158,7 @@ getpwnam(const char *name) if (pwf == NULL) { if ((pwf = fopen(pwfile, "r")) == NULL) - return(NULL); + return NULL; fcntl(fileno(pwf), F_SETFD, FD_CLOEXEC); } else { rewind(pwf); @@ -171,7 +171,7 @@ getpwnam(const char *name) fclose(pwf); pwf = NULL; } - return(pw); + return pw; } struct passwd * @@ -181,7 +181,7 @@ getpwuid(uid_t uid) if (pwf == NULL) { if ((pwf = fopen(pwfile, "r")) == NULL) - return(NULL); + return NULL; fcntl(fileno(pwf), F_SETFD, FD_CLOEXEC); } else { rewind(pwf); @@ -194,7 +194,7 @@ getpwuid(uid_t uid) fclose(pwf); pwf = NULL; } - return(pw); + return pw; } void @@ -238,19 +238,19 @@ getgrent(void) int n; if ((colon = fgets(grbuf, sizeof(grbuf), grf)) == NULL) - return(NULL); + return NULL; zero_bytes(&gr, sizeof(gr)); if ((colon = strchr(cp = colon, ':')) == NULL) - return(NULL); + return NULL; *colon++ = '\0'; gr.gr_name = cp; if ((colon = strchr(cp = colon, ':')) == NULL) - return(NULL); + return NULL; *colon++ = '\0'; gr.gr_passwd = cp; if ((colon = strchr(cp = colon, ':')) == NULL) - return(NULL); + return NULL; *colon++ = '\0'; gr.gr_gid = atoi(cp); len = strlen(colon); @@ -266,7 +266,7 @@ getgrent(void) gr.gr_mem[n++] = NULL; } else gr.gr_mem = NULL; - return(&gr); + return &gr; } struct group * @@ -276,7 +276,7 @@ getgrnam(const char *name) if (grf == NULL) { if ((grf = fopen(grfile, "r")) == NULL) - return(NULL); + return NULL; fcntl(fileno(grf), F_SETFD, FD_CLOEXEC); } else { rewind(grf); @@ -289,7 +289,7 @@ getgrnam(const char *name) fclose(grf); grf = NULL; } - return(gr); + return gr; } struct group * @@ -299,7 +299,7 @@ getgrgid(gid_t gid) if (grf == NULL) { if ((grf = fopen(grfile, "r")) == NULL) - return(NULL); + return NULL; fcntl(fileno(grf), F_SETFD, FD_CLOEXEC); } else { rewind(grf); @@ -312,5 +312,5 @@ getgrgid(gid_t gid) fclose(grf); grf = NULL; } - return(gr); + return gr; } diff --git a/plugins/sudoers/visudo.c b/plugins/sudoers/visudo.c index cf97ef6ff..ddc2f251c 100644 --- a/plugins/sudoers/visudo.c +++ b/plugins/sudoers/visudo.c @@ -348,17 +348,17 @@ edit_sudoers(struct sudoersfile *sp, char *editor, char *args, int lineno) if (stat(sp->tpath, &sb) < 0) { warningx("cannot stat temporary file (%s), %s unchanged", sp->tpath, sp->path); - return(FALSE); + return FALSE; } if (sb.st_size == 0 && orig_size != 0) { warningx("zero length temporary file (%s), %s unchanged", sp->tpath, sp->path); sp->modified = TRUE; - return(FALSE); + return FALSE; } } else { warningx("editor (%s) failed, %s unchanged", editor, sp->path); - return(FALSE); + return FALSE; } /* Set modified bit if use changed the file. */ @@ -382,7 +382,7 @@ edit_sudoers(struct sudoersfile *sp, char *editor, char *args, int lineno) else warningx("%s unchanged", sp->tpath); - return(TRUE); + return TRUE; } /* @@ -461,7 +461,7 @@ reparse_sudoers(char *editor, char *args, int strict, int quiet) } } while (parse_error); - return(TRUE); + return TRUE; } /* @@ -497,12 +497,12 @@ install_sudoers(struct sudoersfile *sp, int oldperms) if (chown(sp->tpath, SUDOERS_UID, SUDOERS_GID) != 0) { warning("unable to set (uid, gid) of %s to (%d, %d)", sp->tpath, SUDOERS_UID, SUDOERS_GID); - return(FALSE); + return FALSE; } if (chmod(sp->tpath, SUDOERS_MODE) != 0) { warning("unable to change mode of %s to 0%o", sp->tpath, SUDOERS_MODE); - return(FALSE); + return FALSE; } } @@ -536,17 +536,17 @@ install_sudoers(struct sudoersfile *sp, int oldperms) (void) unlink(sp->tpath); efree(sp->tpath); sp->tpath = NULL; - return(FALSE); + return FALSE; } efree(sp->tpath); sp->tpath = NULL; } else { warning("error renaming %s, %s unchanged", sp->tpath, sp->path); (void) unlink(sp->tpath); - return(FALSE); + return FALSE; } } - return(TRUE); + return TRUE; } /* STUB */ @@ -567,7 +567,7 @@ init_envtables(void) int user_is_exempt(void) { - return(FALSE); + return FALSE; } /* STUB */ @@ -594,7 +594,7 @@ group_plugin_query(const char *user, const char *group, const struct passwd *pw) char * sudo_getepw(const struct passwd *pw) { - return (pw->pw_passwd); + return pw->pw_passwd; } /* @@ -619,7 +619,7 @@ whatnow(void) case 'e': case 'x': case 'Q': - return(choice); + return choice; default: (void) puts("Options are:"); (void) puts(" (e)dit sudoers file again"); @@ -675,8 +675,8 @@ run_command(char *path, char **argv) } while (rv == -1 && errno == EINTR); if (rv == -1 || !WIFEXITED(status)) - return(-1); - return(WEXITSTATUS(status)); + return -1; + return WEXITSTATUS(status); } static int @@ -739,7 +739,7 @@ check_syntax(char *sudoers_path, int quiet, int strict) } } - return(error); + return error; } /* @@ -769,7 +769,7 @@ open_sudoers(const char *path, int doedit, int *keepopen) if (entry->fd == -1) { warning("%s", entry->path); efree(entry); - return(NULL); + return NULL; } if (!lock_file(entry->fd, SUDO_TLOCK)) errorx(1, "%s busy, try again later", entry->path); @@ -789,7 +789,7 @@ open_sudoers(const char *path, int doedit, int *keepopen) } if (keepopen != NULL) *keepopen = TRUE; - return(fp); + return fp; } static char * @@ -889,7 +889,7 @@ get_editor(char **args) errorx(1, "no editor found (editor path = %s)", def_editor); } *args = EditorArgs; - return(Editor); + return Editor; } /* @@ -908,7 +908,7 @@ get_args(char *cmnd) while (*args && isblank((unsigned char) *args)) args++; } - return(*args ? args : NULL); + return *args ? args : NULL; } /* @@ -959,7 +959,7 @@ alias_remove_recursive(char *name, int type, int strict, int quiet) a = alias_remove(name, type); if (a) rbinsert(alias_freelist, a); - return(error); + return error; } /* @@ -1080,7 +1080,7 @@ check_aliases(int strict, int quiet) if (!no_aliases() && !quiet) alias_apply(print_unused, strict ? "Error" : "Warning"); - return (strict ? error : 0); + return strict ? error : 0; } static void @@ -1121,7 +1121,7 @@ print_unused(void *v1, void *v2) a->type == HOSTALIAS ? "Host" : a->type == CMNDALIAS ? "Cmnd" : a->type == USERALIAS ? "User" : a->type == RUNASALIAS ? "Runas" : "Unknown", a->name); - return(0); + return 0; } /* diff --git a/src/exec_pty.c b/src/exec_pty.c index 2045feb43..d9bd721b8 100644 --- a/src/exec_pty.c +++ b/src/exec_pty.c @@ -346,7 +346,7 @@ suspend_parent(int signo) break; } - return(rval); + return rval; } /* diff --git a/src/get_pty.c b/src/get_pty.c index dafe30c35..7a5156029 100644 --- a/src/get_pty.c +++ b/src/get_pty.c @@ -66,10 +66,10 @@ get_pty(int *master, int *slave, char *name, size_t namesz, uid_t ttyuid) ttygid = gr->gr_gid; if (openpty(master, slave, name, NULL, NULL) != 0) - return(0); + return 0; if (chown(name, ttyuid, ttygid) != 0) - return(0); - return(1); + return 0; + return 1; } #elif defined(HAVE__GETPTY) @@ -81,15 +81,15 @@ get_pty(int *master, int *slave, char *name, size_t namesz, uid_t ttyuid) /* IRIX-style dynamic ptys (may fork) */ line = _getpty(master, O_RDWR, S_IRUSR|S_IWUSR|S_IWGRP, 0); if (line == NULL) - return (0); + return 0; *slave = open(line, O_RDWR|O_NOCTTY, 0); if (*slave == -1) { close(*master); - return(0); + return 0; } (void) chown(line, ttyuid, -1); strlcpy(name, line, namesz); - return(1); + return 1; } #elif defined(HAVE_GRANTPT) # ifndef HAVE_POSIX_OPENPT @@ -103,7 +103,7 @@ posix_openpt(int oflag) # else fd = open("/dev/ptmx", oflag); # endif - return(fd); + return fd; } # endif /* HAVE_POSIX_OPENPT */ @@ -114,22 +114,22 @@ get_pty(int *master, int *slave, char *name, size_t namesz, uid_t ttyuid) *master = posix_openpt(O_RDWR|O_NOCTTY); if (*master == -1) - return(0); + return 0; (void) grantpt(*master); /* may fork */ if (unlockpt(*master) != 0) { close(*master); - return(0); + return 0; } line = ptsname(*master); if (line == NULL) { close(*master); - return(0); + return 0; } *slave = open(line, O_RDWR|O_NOCTTY, 0); if (*slave == -1) { close(*master); - return(0); + return 0; } # if defined(I_PUSH) && !defined(_AIX) ioctl(*slave, I_PUSH, "ptem"); /* pseudo tty emulation module */ @@ -137,7 +137,7 @@ get_pty(int *master, int *slave, char *name, size_t namesz, uid_t ttyuid) # endif (void) chown(line, ttyuid, -1); strlcpy(name, line, namesz); - return(1); + return 1; } #else /* Old-style BSD ptys */ @@ -161,7 +161,7 @@ get_pty(int *master, int *slave, char *name, size_t namesz, uid_t ttyuid) *master = open(line, O_RDWR|O_NOCTTY, 0); if (*master == -1) { if (errno == ENOENT) - return(0); /* out of ptys */ + return 0; /* out of ptys */ continue; /* already in use */ } line[sizeof("/dev/p") - 2] = 't'; @@ -173,11 +173,11 @@ get_pty(int *master, int *slave, char *name, size_t namesz, uid_t ttyuid) *slave = open(line, O_RDWR|O_NOCTTY, 0); if (*slave != -1) { strlcpy(name, line, namesz); - return(1); /* success */ + return 1; /* success */ } (void) close(*master); } } - return(0); + return 0; } #endif /* HAVE_OPENPTY */ diff --git a/src/load_plugins.c b/src/load_plugins.c index c7c7063ea..d17e85986 100644 --- a/src/load_plugins.c +++ b/src/load_plugins.c @@ -122,7 +122,7 @@ sudo_read_conf(const char *conf_file) done: - return(&pil); + return &pil; } /* diff --git a/src/parse_args.c b/src/parse_args.c index 419809c4c..f9b9ce289 100644 --- a/src/parse_args.c +++ b/src/parse_args.c @@ -454,7 +454,7 @@ parse_args(int argc, char **argv, int *nargc, char ***nargv, char ***settingsp, *env_addp = env_add; *nargc = argc; *nargv = argv; - return(mode | flags); + return mode | flags; } static int diff --git a/src/sudo_noexec.c b/src/sudo_noexec.c index d0c6047c7..c7efac3cb 100644 --- a/src/sudo_noexec.c +++ b/src/sudo_noexec.c @@ -41,7 +41,7 @@ extern int errno; #define DUMMY_BODY \ { \ errno = EACCES; \ - return(-1); \ + return -1; \ } #define DUMMY2(fn, t1, t2) \ diff --git a/src/tgetpass.c b/src/tgetpass.c index ad88086b8..4991d2c63 100644 --- a/src/tgetpass.c +++ b/src/tgetpass.c @@ -93,7 +93,7 @@ tgetpass(const char *prompt, int timeout, int flags) !tty_present()) { if (askpass == NULL || getenv("DISPLAY") == NULL) { warningx("no tty present and no askpass program specified"); - return(NULL); + return NULL; } SET(flags, TGP_ASKPASS); } @@ -102,7 +102,7 @@ tgetpass(const char *prompt, int timeout, int flags) if (ISSET(flags, TGP_ASKPASS)) { if (askpass == NULL || *askpass == '\0') errorx(1, "no askpass program specified, try setting SUDO_ASKPASS"); - return(sudo_askpass(askpass, prompt)); + return sudo_askpass(askpass, prompt); } restart: @@ -203,7 +203,7 @@ restore: if (save_errno) errno = save_errno; - return(pass); + return pass; } /* @@ -257,7 +257,7 @@ sudo_askpass(const char *askpass, const char *prompt) (void) close(pfd[0]); (void) sigaction(SIGPIPE, &saved_sa_pipe, NULL); - return(pass); + return pass; } extern int term_erase, term_kill; @@ -272,7 +272,7 @@ getln(int fd, char *buf, size_t bufsiz, int feedback) if (left == 0) { errno = EINVAL; - return(NULL); /* sanity */ + return NULL; /* sanity */ } while (--left) { @@ -312,7 +312,7 @@ getln(int fd, char *buf, size_t bufsiz, int feedback) } } - return(nr == 1 ? buf : NULL); + return nr == 1 ? buf : NULL; } static void @@ -329,5 +329,5 @@ tty_present(void) if ((fd = open(_PATH_TTY, O_RDWR|O_NOCTTY)) != -1) close(fd); - return(fd != -1); + return fd != -1; }