isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PERM_FULL_ROOT is now no different than PERM_ROOT so remove PERM_FULL_ROOT

Browse Source
This commit is contained in:
Todd C. Miller
2007-07-06 14:04:40 +00:00
parent af53e335a1
commit f3ef738254
4 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
logging.c
View File

@@ -527,7 +527,7 @@ send_mail(line)
* (so user cannot kill it) or as the user (for the paranoid). * (so user cannot kill it) or as the user (for the paranoid).
*/ */
#ifndef NO_ROOT_MAILER #ifndef NO_ROOT_MAILER
set_perms(PERM_FULL_ROOT); set_perms(PERM_ROOT);
execve(mpath, argv, root_envp); execve(mpath, argv, root_envp);
#else #else
set_perms(PERM_FULL_USER); set_perms(PERM_FULL_USER);

2
mon_systrace.c
View File

@@ -165,7 +165,7 @@ systrace_attach(pid)
} }
/* become a daemon */ /* become a daemon */
set_perms(PERM_FULL_ROOT); set_perms(PERM_ROOT);
if (setsid() == -1) { if (setsid() == -1) {
warning("setsid"); warning("setsid");
kill(pid, SIGKILL); kill(pid, SIGKILL);

4
set_perms.c
View File

@@ -78,7 +78,6 @@ set_perms(perm)
int perm; int perm;
{ {
switch (perm) { switch (perm) {
case PERM_FULL_ROOT:
case PERM_ROOT: case PERM_ROOT:
if (setresuid(ROOT_UID, ROOT_UID, ROOT_UID)) if (setresuid(ROOT_UID, ROOT_UID, ROOT_UID))
errorx(1, "setresuid(ROOT_UID, ROOT_UID, ROOT_UID) failed, your operating system may have a broken setresuid() function\nTry running configure with --disable-setresuid"); errorx(1, "setresuid(ROOT_UID, ROOT_UID, ROOT_UID) failed, your operating system may have a broken setresuid() function\nTry running configure with --disable-setresuid");
@@ -152,7 +151,6 @@ set_perms(perm)
int perm; int perm;
{ {
switch (perm) { switch (perm) {
case PERM_FULL_ROOT:
case PERM_ROOT: case PERM_ROOT:
if (setreuid(-1, ROOT_UID)) if (setreuid(-1, ROOT_UID))
errorx(1, "setreuid(-1, ROOT_UID) failed, your operating system may have a broken setreuid() function\nTry running configure with --disable-setreuid"); errorx(1, "setreuid(-1, ROOT_UID) failed, your operating system may have a broken setreuid() function\nTry running configure with --disable-setreuid");
@@ -235,7 +233,6 @@ set_perms(perm)
error(1, "setuid(ROOT_UID)"); error(1, "setuid(ROOT_UID)");
switch (perm) { switch (perm) {
case PERM_FULL_ROOT:
case PERM_ROOT: case PERM_ROOT:
/* already set above */ /* already set above */
break; break;
@@ -304,7 +301,6 @@ set_perms(perm)
{ {
switch (perm) { switch (perm) {
case PERM_FULL_ROOT:
case PERM_ROOT: case PERM_ROOT:
if (setuid(ROOT_UID)) if (setuid(ROOT_UID))
error(1, "setuid(ROOT_UID)"); error(1, "setuid(ROOT_UID)");

13
sudo.h
View File

@@ -109,13 +109,12 @@ struct sudo_user {
* Used with set_perms() * Used with set_perms()
*/ */
#define PERM_ROOT 0x00 #define PERM_ROOT 0x00
#define PERM_FULL_ROOT 0x01 #define PERM_USER 0x01
#define PERM_USER 0x02 #define PERM_FULL_USER 0x02
#define PERM_FULL_USER 0x03 #define PERM_SUDOERS 0x03
#define PERM_SUDOERS 0x04 #define PERM_RUNAS 0x04
#define PERM_RUNAS 0x05 #define PERM_FULL_RUNAS 0x05
#define PERM_FULL_RUNAS 0x06 #define PERM_TIMESTAMP 0x06
#define PERM_TIMESTAMP 0x07
/* /*
* Shortcuts for sudo_user contents. * Shortcuts for sudo_user contents.