[BACK]Return to sudo.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / sudo

Diff for /src/usr.bin/sudo/Attic/sudo.c between version 1.32 and 1.33

version 1.32, 2007/12/21 01:16:52 version 1.33, 2008/07/31 16:44:03
Line 96 
Line 96 
 # include <project.h>  # include <project.h>
 # include <sys/task.h>  # include <sys/task.h>
 #endif  #endif
   #ifdef HAVE_SELINUX
   # include <selinux/selinux.h>
   #endif
   
 #include "sudo.h"  #include "sudo.h"
 #include "interfaces.h"  #include "interfaces.h"
 #include "version.h"  #include "version.h"
   
 #ifndef lint  #ifndef lint
 __unused __unused static const char rcsid[] = "$Sudo: sudo.c,v 1.369.2.34 2007/12/13 14:12:49 millert Exp $";  __unused __unused static const char rcsid[] = "$Sudo: sudo.c,v 1.369.2.43 2008/07/02 10:28:43 millert Exp $";
 #endif /* lint */  #endif /* lint */
   
 /*  /*
Line 152 
Line 155 
 #ifdef HAVE_BSD_AUTH_H  #ifdef HAVE_BSD_AUTH_H
 char *login_style;  char *login_style;
 #endif /* HAVE_BSD_AUTH_H */  #endif /* HAVE_BSD_AUTH_H */
 sigaction_t saved_sa_int, saved_sa_quit, saved_sa_tstp, saved_sa_chld;  sigaction_t saved_sa_int, saved_sa_quit, saved_sa_tstp;
   
   
 int  int
Line 201 
Line 204 
     (void) sigaction(SIGINT, &sa, &saved_sa_int);      (void) sigaction(SIGINT, &sa, &saved_sa_int);
     (void) sigaction(SIGQUIT, &sa, &saved_sa_quit);      (void) sigaction(SIGQUIT, &sa, &saved_sa_quit);
     (void) sigaction(SIGTSTP, &sa, &saved_sa_tstp);      (void) sigaction(SIGTSTP, &sa, &saved_sa_tstp);
     sa.sa_handler = reapchild;  
     (void) sigaction(SIGCHLD, &sa, &saved_sa_chld);  
   
     /*      /*
      * Turn off core dumps and close open files.       * Turn off core dumps and close open files.
Line 270 
Line 271 
     validated = sudo_ldap_check(pwflag);      validated = sudo_ldap_check(pwflag);
   
     /* Skip reading /etc/sudoers if LDAP told us to */      /* Skip reading /etc/sudoers if LDAP told us to */
     if (def_ignore_local_sudoers); /* skips */      if (!def_ignore_local_sudoers) {
     else if (ISSET(validated, VALIDATE_OK) && !printmatches); /* skips */          int v;
     else if (ISSET(validated, VALIDATE_OK) && printmatches)  
     {  
         check_sudoers();        /* check mode/owner on _PATH_SUDOERS */  
   
         /* User is found in LDAP and we want a list of all sudo commands the  
          * user can do, so consult sudoers but throw away result.  
          */  
         sudoers_lookup(pwflag);  
     }  
     else  
 #endif  
     {  
         check_sudoers();        /* check mode/owner on _PATH_SUDOERS */          check_sudoers();        /* check mode/owner on _PATH_SUDOERS */
   
         /* Validate the user but don't search for pseudo-commands. */          /* Local sudoers file overrides LDAP if we have a match. */
         validated = sudoers_lookup(pwflag);          v = sudoers_lookup(pwflag);
           if (validated == VALIDATE_ERROR || ISSET(v, VALIDATE_OK))
               validated = v;
     }      }
   #else
       check_sudoers();    /* check mode/owner on _PATH_SUDOERS */
   
       /* Validate the user but don't search for pseudo-commands. */
       validated = sudoers_lookup(pwflag);
   #endif
     if (safe_cmnd == NULL)      if (safe_cmnd == NULL)
         safe_cmnd = estrdup(user_cmnd);          safe_cmnd = estrdup(user_cmnd);
   
Line 437 
Line 435 
         (void) sigaction(SIGINT, &saved_sa_int, NULL);          (void) sigaction(SIGINT, &saved_sa_int, NULL);
         (void) sigaction(SIGQUIT, &saved_sa_quit, NULL);          (void) sigaction(SIGQUIT, &saved_sa_quit, NULL);
         (void) sigaction(SIGTSTP, &saved_sa_tstp, NULL);          (void) sigaction(SIGTSTP, &saved_sa_tstp, NULL);
         (void) sigaction(SIGCHLD, &saved_sa_chld, NULL);  
   
 #ifndef PROFILING  #ifndef PROFILING
         if (ISSET(sudo_mode, MODE_BACKGROUND) && fork() > 0)          if (ISSET(sudo_mode, MODE_BACKGROUND) && fork() > 0)
             exit(0);              exit(0);
         else          else {
   #ifdef HAVE_SELINUX
               if (is_selinux_enabled() > 0 && user_role != NULL)
                   selinux_exec(user_role, user_type, NewArgv, environ,
                       ISSET(sudo_mode, MODE_LOGIN_SHELL));
   #endif
             execve(safe_cmnd, NewArgv, environ);              execve(safe_cmnd, NewArgv, environ);
           }
 #else  #else
         exit(0);          exit(0);
 #endif /* PROFILING */  #endif /* PROFILING */
Line 610 
Line 613 
         log_error(USE_ERRNO|MSG_ONLY, "can't get hostname");          log_error(USE_ERRNO|MSG_ONLY, "can't get hostname");
   
     set_runaspw(*user_runas);           /* may call log_error() */      set_runaspw(*user_runas);           /* may call log_error() */
     if (*user_runas[0] == '#' && runas_pw->pw_name && runas_pw->pw_name[0])      if (*user_runas[0] == '#') {
         *user_runas = estrdup(runas_pw->pw_name);          if (runas_pw->pw_name != *user_runas && runas_pw->pw_name[0])
               *user_runas = estrdup(runas_pw->pw_name);
       }
   
     /*      /*
      * Get current working directory.  Try as user, fall back to root.       * Get current working directory.  Try as user, fall back to root.
Line 858 
Line 863 
                 case 'E':                  case 'E':
                     SET(rval, MODE_PRESERVE_ENV);                      SET(rval, MODE_PRESERVE_ENV);
                     break;                      break;
   #ifdef HAVE_SELINUX
                   case 'r':
                       /* Must have an associated SELinux role. */
                       if (NewArgv[1] == NULL)
                           usage(1);
   
                       user_role = NewArgv[1];
   
                       NewArgc--;
                       NewArgv++;
                       break;
                   case 't':
                       /* Must have an associated SELinux type. */
                       if (NewArgv[1] == NULL)
                           usage(1);
   
                       user_type = NewArgv[1];
   
                       NewArgc--;
                       NewArgv++;
                       break;
   #endif
                 case '-':                  case '-':
                     NewArgc--;                      NewArgc--;
                     NewArgv++;                      NewArgv++;
Line 893 
Line 920 
             warnx("you may not specify environment variables in edit mode");              warnx("you may not specify environment variables in edit mode");
         usage(1);          usage(1);
     }      }
       if (ISSET(rval, MODE_PRESERVE_ENV) && ISSET(rval, MODE_LOGIN_SHELL)) {
           warnx("you may not specify both the `-i' and `-E' options");
           usage(1);
       }
     if (user_runas != NULL && !ISSET(rval, (MODE_EDIT|MODE_RUN))) {      if (user_runas != NULL && !ISSET(rval, (MODE_EDIT|MODE_RUN))) {
         if (excl != '\0')          if (excl != '\0')
             warnx("the `-u' and '-%c' options may not be used together", excl);              warnx("the `-u' and '-%c' options may not be used together", excl);
Line 992 
Line 1022 
 initial_setup()  initial_setup()
 {  {
     int miss[3], devnull = -1;      int miss[3], devnull = -1;
 #if defined(RLIMIT_CORE) && !defined(SUDO_DEVEL)  #if defined(__linux__) || (defined(RLIMIT_CORE) && !defined(SUDO_DEVEL))
     struct rlimit rl;      struct rlimit rl;
   #endif
   
   #if defined(__linux__)
     /*      /*
        * Unlimit the number of processes since Linux's setuid() will
        * apply resource limits when changing uid and return EAGAIN if
        * nproc would be violated by the uid switch.
        */
       rl.rlim_cur = rl.rlim_max = RLIM_INFINITY;
       if (setrlimit(RLIMIT_NPROC, &rl)) {
           if (getrlimit(RLIMIT_NPROC, &rl) == 0) {
               rl.rlim_cur = rl.rlim_max;
               (void)setrlimit(RLIMIT_NPROC, &rl);
           }
       }
   #endif /* __linux__ */
   #if defined(RLIMIT_CORE) && !defined(SUDO_DEVEL)
       /*
      * Turn off core dumps.       * Turn off core dumps.
      */       */
     (void) getrlimit(RLIMIT_CORE, &corelimit);      (void) getrlimit(RLIMIT_CORE, &corelimit);
Line 1194 
Line 1240 
             runas_pw = emalloc(sizeof(struct passwd));              runas_pw = emalloc(sizeof(struct passwd));
             (void) memset((VOID *)runas_pw, 0, sizeof(struct passwd));              (void) memset((VOID *)runas_pw, 0, sizeof(struct passwd));
             runas_pw->pw_uid = atoi(user + 1);              runas_pw->pw_uid = atoi(user + 1);
               runas_pw->pw_name = user;
               runas_pw->pw_passwd = "*";
               runas_pw->pw_gecos = user;
               runas_pw->pw_dir = "/";
               runas_pw->pw_shell = estrdup(_PATH_BSHELL);
         }          }
     } else {      } else {
         runas_pw = sudo_getpwnam(user);          runas_pw = sudo_getpwnam(user);
Line 1273 
Line 1324 
 #ifdef HAVE_LOGIN_CAP_H  #ifdef HAVE_LOGIN_CAP_H
         " [-c class|-]",          " [-c class|-]",
 #endif  #endif
   #ifdef HAVE_SELINUX
           " [-r role]",
   #endif
         " [-p prompt]",          " [-p prompt]",
   #ifdef HAVE_SELINUX
           " [-t type]",
   #endif
         " [-u username|#uid]",          " [-u username|#uid]",
         " [VAR=value]",          " [VAR=value]",
         " {-i | -s | <command>}",          " {-i | -s | <command>}",
Legend:
Removed from v.1.32  
changed lines
  Added in v.1.33