g/c second arg to set_perms--it is no longer used

diff --git a/auth/sudo_auth.c b/auth/sudo_auth.c
index 13a2d8ded0a911b9953d4edf665d039087705d6a..3661746b741e2cff140091abe8e68c91602d1cdb 100644 (file)
--- a/auth/sudo_auth.c
+++ b/auth/sudo_auth.c
@@ -138,7 +138,7 @@ verify_user(pw, prompt)
     for (auth = auth_switch; auth->name; auth++) {
        if (auth->init && IS_CONFIGURED(auth)) {
            if (NEEDS_USER(auth))
-               set_perms(PERM_USER, 0);
+               set_perms(PERM_USER);
 
            status = (auth->init)(pw, &prompt, auth);
            if (status == AUTH_FAILURE)
@@ -147,7 +147,7 @@ verify_user(pw, prompt)
                exit(1);                /* assume error msg already printed */
 
            if (NEEDS_USER(auth))
-               set_perms(PERM_ROOT, 0);
+               set_perms(PERM_ROOT);
        }
     }
 
@@ -156,7 +156,7 @@ verify_user(pw, prompt)
        for (auth = auth_switch; auth->name; auth++) {
            if (auth->setup && IS_CONFIGURED(auth)) {
                if (NEEDS_USER(auth))
-                   set_perms(PERM_USER, 0);
+                   set_perms(PERM_USER);
 
                status = (auth->setup)(pw, &prompt, auth);
                if (status == AUTH_FAILURE)
@@ -165,7 +165,7 @@ verify_user(pw, prompt)
                    exit(1);            /* assume error msg already printed */
 
                if (NEEDS_USER(auth))
-                   set_perms(PERM_ROOT, 0);
+                   set_perms(PERM_ROOT);
            }
        }
 
@@ -186,12 +186,12 @@ verify_user(pw, prompt)
                continue;
 
            if (NEEDS_USER(auth))
-               set_perms(PERM_USER, 0);
+               set_perms(PERM_USER);
 
            success = auth->status = (auth->verify)(pw, p, auth);
 
            if (NEEDS_USER(auth))
-               set_perms(PERM_ROOT, 0);
+               set_perms(PERM_ROOT);
 
            if (auth->status != AUTH_FAILURE)
                goto cleanup;
@@ -217,14 +217,14 @@ cleanup:
     for (auth = auth_switch; auth->name; auth++) {
        if (auth->cleanup && IS_CONFIGURED(auth)) {
            if (NEEDS_USER(auth))
-               set_perms(PERM_USER, 0);
+               set_perms(PERM_USER);
 
            status = (auth->cleanup)(pw, auth);
            if (status == AUTH_FATAL)   /* XXX log */
                exit(1);                /* assume error msg already printed */
 
            if (NEEDS_USER(auth))
-               set_perms(PERM_ROOT, 0);
+               set_perms(PERM_ROOT);
        }
     }
 

diff --git a/check.c b/check.c
index f673b6222491195679d43bcc9b4835323f2d3ad3..33451f6091a6603e54e879b349dfe6b1cdc5b22e 100644 (file)
--- a/check.c
+++ b/check.c
@@ -145,7 +145,7 @@ update_timestamp(timestampdir, timestampfile)
     char *timestampfile;
 {
 
-    set_perms(PERM_TIMESTAMP, 0);
+    set_perms(PERM_TIMESTAMP);
     if (touch(timestampfile ? timestampfile : timestampdir, time(NULL)) == -1) {
        if (timestampfile) {
            int fd = open(timestampfile, O_WRONLY|O_CREAT|O_TRUNC, 0600);
@@ -159,7 +159,7 @@ update_timestamp(timestampdir, timestampfile)
                log_error(NO_EXIT|USE_ERRNO, "Can't mkdir %s", timestampdir);
        }
     }
-    set_perms(PERM_ROOT, 0);
+    set_perms(PERM_ROOT);
 }
 
 /*
@@ -309,7 +309,7 @@ timestamp_status(timestampdir, timestampfile, user, make_dirs)
     char *dirparent = def_str(I_TIMESTAMPDIR);
     int status = TS_ERROR;             /* assume the worst */
 
-    set_perms(PERM_TIMESTAMP, 0);
+    set_perms(PERM_TIMESTAMP);
 
     /*
      * Sanity check dirparent and make it if it doesn't already exist.
@@ -347,7 +347,7 @@ timestamp_status(timestampdir, timestampfile, user, make_dirs)
        }
     }
     if (status == TS_ERROR) {
-       set_perms(PERM_ROOT, 0);
+       set_perms(PERM_ROOT);
        return(status);
     }
 
@@ -462,7 +462,7 @@ timestamp_status(timestampdir, timestampfile, user, make_dirs)
        }
     }
 
-    set_perms(PERM_ROOT, 0);
+    set_perms(PERM_ROOT);
     return(status);
 }
 

diff --git a/logging.c b/logging.c
index 56f15b6a9944ac9e339378c7b85772f2039ea32a..31f9260dbea9ace6ea8b002feeac1e7496f9ff90 100644 (file)
--- a/logging.c
+++ b/logging.c
@@ -365,7 +365,7 @@ log_error(va_alist)
 
     /* Become root if we are not already to avoid user control */
     if (geteuid() != 0)
-       set_perms(PERM_ROOT, 0);
+       set_perms(PERM_ROOT);
 
     /* Expand printf-style format + args. */
     evasprintf(&message, fmt, ap);
@@ -507,10 +507,10 @@ send_mail(line)
                 * (so user cannot kill it) or as the user (for the paranoid).
                 */
 #ifndef NO_ROOT_MAILER
-               set_perms(PERM_FULL_ROOT, 0);
+               set_perms(PERM_FULL_ROOT);
                execve(mpath, argv, root_envp);
 #else
-               set_perms(PERM_FULL_USER, 0);
+               set_perms(PERM_FULL_USER);
                execv(mpath, argv);
 #endif /* NO_ROOT_MAILER */
                _exit(127);

diff --git a/parse.c b/parse.c
index 0027d1ebdff564c46c010324d1549a6e8f9c5125..d0e9bc336b08794b85acc5160ad7e73fcad3f2b5 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -125,7 +125,7 @@ sudoers_lookup(pwflag)
     int nopass;
 
     /* Become sudoers file owner */
-    set_perms(PERM_SUDOERS, 0);
+    set_perms(PERM_SUDOERS);
 
     /* We opened _PATH_SUDOERS in check_sudoers() so just rewind it. */
     rewind(sudoers_fp);
@@ -140,7 +140,7 @@ sudoers_lookup(pwflag)
        keepall = TRUE;
 
     /* Need to be root while stat'ing things in the parser. */
-    set_perms(PERM_ROOT, 0);
+    set_perms(PERM_ROOT);
     error = yyparse();
 
     /* Close the sudoers file now that we are done with it. */

diff --git a/set_perms.c b/set_perms.c
index 94462e7bbfe27900c87fee55f845d07e59bf191b..ac07eabbcb8d106767d6d29f077dc2937ac6b54d 100644 (file)
--- a/set_perms.c
+++ b/set_perms.c
@@ -82,9 +82,8 @@ static void fatal             __P((char *, int));
  * toggling the effective uid/gid unless we are headed for an exec().
  */
 void
-set_perms_posix(perm, sudo_mode)
+set_perms_posix(perm)
     int perm;
-    int sudo_mode;
 {
     int error;
 
@@ -161,9 +160,8 @@ set_perms_posix(perm, sudo_mode)
  * we are headed for an exec().
  */
 void
-set_perms_fallback(perm, sudo_mode)
+set_perms_fallback(perm)
     int perm;
-    int sudo_mode;
 {
     int error;
 
@@ -232,9 +230,8 @@ set_perms_fallback(perm, sudo_mode)
  * NOTE: does not support the "stay_setuid" option.
  */
 void
-set_perms_fallback(perm, sudo_mode)
+set_perms_fallback(perm)
     int perm;
-    int sudo_mode;
 {
 
     /*

diff --git a/sudo.c b/sudo.c
index 15aaf9177800d237759ae1e7ddb6819ff9334445..ab13c7bc121c4282652ae21c52c74c79f9d2c10e 100644 (file)
--- a/sudo.c
+++ b/sudo.c
@@ -142,7 +142,7 @@ login_cap_t *lc;
 #ifdef HAVE_BSD_AUTH_H
 char *login_style;
 #endif /* HAVE_BSD_AUTH_H */
-void (*set_perms) __P((int, int));
+void (*set_perms) __P((int));
 
 
 int
@@ -397,7 +397,7 @@ main(argc, argv, envp)
 #endif /* RLIMIT_CORE */
 
        /* Become specified user or root. */
-       set_perms(PERM_RUNAS, sudo_mode);
+       set_perms(PERM_RUNAS);
 
        /* Close the password and group files */
        endpwent();
@@ -546,16 +546,16 @@ init_vars(sudo_mode)
     /*
      * Get current working directory.  Try as user, fall back to root.
      */
-    set_perms(PERM_USER, sudo_mode);
+    set_perms(PERM_USER);
     if (!getcwd(user_cwd, sizeof(user_cwd))) {
-       set_perms(PERM_ROOT, sudo_mode);
+       set_perms(PERM_ROOT);
        if (!getcwd(user_cwd, sizeof(user_cwd))) {
            (void) fprintf(stderr, "%s: Can't get working directory!\n",
                           Argv[0]);
            (void) strcpy(user_cwd, "unknown");
        }
     } else
-       set_perms(PERM_ROOT, sudo_mode);
+       set_perms(PERM_ROOT);
 
     /*
      * If we were given the '-s' option (run shell) we need to redo
@@ -586,9 +586,9 @@ init_vars(sudo_mode)
        rval = find_path(NewArgv[0], &user_cmnd, user_path);
        if (rval != FOUND) {
            /* Failed as root, try as invoking user. */
-           set_perms(PERM_USER, sudo_mode);
+           set_perms(PERM_USER);
            rval = find_path(NewArgv[0], &user_cmnd, user_path);
-           set_perms(PERM_ROOT, sudo_mode);
+           set_perms(PERM_ROOT);
        }
 
        /* set user_args */
@@ -823,7 +823,7 @@ check_sudoers()
      * file owner.  We already did a stat as root, so use that
      * data if we can't stat as sudoers file owner.
      */
-    set_perms(PERM_SUDOERS, 0);
+    set_perms(PERM_SUDOERS);
 
     if (rootstat != 0 && lstat(_PATH_SUDOERS, &statbuf) != 0)
        log_error(USE_ERRNO, "can't stat %s", _PATH_SUDOERS);
@@ -857,7 +857,7 @@ check_sudoers()
            log_error(USE_ERRNO, "can't open %s", _PATH_SUDOERS);
     }
 
-    set_perms(PERM_ROOT, 0);           /* change back to root */
+    set_perms(PERM_ROOT);              /* change back to root */
 }
 
 /*

diff --git a/sudo.h b/sudo.h
index 79fe62075f28fc0863dd81926aabf2be890f80cd..9ac79cf845662a65c211bdaaabdf1cdc53697d9d 100644 (file)
--- a/sudo.h
+++ b/sudo.h
@@ -202,8 +202,8 @@ int find_path               __P((char *, char **, char *));
 void check_user                __P((void));
 void verify_user       __P((struct passwd *, char *));
 int sudoers_lookup     __P((int));
-void set_perms_posix   __P((int, int));
-void set_perms_fallback        __P((int, int));
+void set_perms_posix   __P((int));
+void set_perms_fallback        __P((int));
 void remove_timestamp  __P((int));
 int check_secureware   __P((char *));
 void sia_attempt_auth  __P((void));
@@ -238,7 +238,7 @@ extern FILE *sudoers_fp;
 extern int tgetpass_flags;
 extern int timestamp_uid;
 
-extern void (*set_perms) __P((int, int));
+extern void (*set_perms) __P((int));
 #endif
 extern int errno;
 

diff --git a/testsudoers.c b/testsudoers.c
index b9edf3269a8e96573004f5e3f15f20a455d3db3a..fa379456edefe5142273d0d0cc9f8128a0ee2ae8 100644 (file)
--- a/testsudoers.c
+++ b/testsudoers.c
@@ -91,7 +91,7 @@ static const char rcsid[] = "$Sudo$";
  */
 void init_parser       __P((void));
 void dumpaliases       __P((void));
-void set_perms_dummy   __P((int, int));
+void set_perms_dummy   __P((int));
 
 /*
  * Globals
@@ -102,7 +102,7 @@ int parse_error = FALSE;
 int num_interfaces;
 struct interface *interfaces;
 struct sudo_user sudo_user;
-void (*set_perms) __P((int, int)) = set_perms_dummy;
+void (*set_perms) __P((int)) = set_perms_dummy;
 extern int clearaliases;
 extern int pedantic;
 
@@ -311,8 +311,8 @@ netgr_matches(netgr, host, shost, user)
 }
 
 void
-set_perms_dummy(i, j)
-    int i, j;
+set_perms_dummy(i)
+    int i;
 {
     return;
 }