PERM_FULL_ROOT is now no different than PERM_ROOT so remove PERM_FULL_ROOT

diff --git a/logging.c b/logging.c
index 29b784c9fd49d22ccf9ae18525a64aee923c20cf..6d251f67b332fefee8a99604ee7551b55e5ca075 100644 (file)
--- a/logging.c
+++ b/logging.c
@@ -527,7 +527,7 @@ send_mail(line)
                 * (so user cannot kill it) or as the user (for the paranoid).
                 */
 #ifndef NO_ROOT_MAILER
-               set_perms(PERM_FULL_ROOT);
+               set_perms(PERM_ROOT);
                execve(mpath, argv, root_envp);
 #else
                set_perms(PERM_FULL_USER);

diff --git a/mon_systrace.c b/mon_systrace.c
index 29ea9718c5328570b7181c0f197ba578c2e0a333..f6fbcfe013aedcb0b258d99752b63a5420695e21 100644 (file)
--- a/mon_systrace.c
+++ b/mon_systrace.c
@@ -165,7 +165,7 @@ systrace_attach(pid)
     }
 
     /* become a daemon */
-    set_perms(PERM_FULL_ROOT);
+    set_perms(PERM_ROOT);
     if (setsid() == -1) {
        warning("setsid");
        kill(pid, SIGKILL);

diff --git a/set_perms.c b/set_perms.c
index 9cd5b85137f74b5f9b24490cea75e29c16ce67b1..464540ca8e896c987a7bf5b8155794d00794354c 100644 (file)
--- a/set_perms.c
+++ b/set_perms.c
@@ -78,7 +78,6 @@ set_perms(perm)
     int perm;
 {
     switch (perm) {
-       case PERM_FULL_ROOT:
        case PERM_ROOT:
                                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");
@@ -152,7 +151,6 @@ set_perms(perm)
     int perm;
 {
     switch (perm) {
-       case PERM_FULL_ROOT:
        case PERM_ROOT:
                                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");
@@ -235,7 +233,6 @@ set_perms(perm)
        error(1, "setuid(ROOT_UID)");
 
     switch (perm) {
-       case PERM_FULL_ROOT:
        case PERM_ROOT:
                                /* already set above */
                                break;
@@ -304,7 +301,6 @@ set_perms(perm)
 {
 
     switch (perm) {
-       case PERM_FULL_ROOT:
        case PERM_ROOT:
                                if (setuid(ROOT_UID))
                                        error(1, "setuid(ROOT_UID)");

diff --git a/sudo.h b/sudo.h
index 290e1b527726c8eff2ffc35da1e2d44a18969c0e..1f6e26e5ede720c7d18f19a54c3d28c313cfd0ea 100644 (file)
--- a/sudo.h
+++ b/sudo.h
@@ -109,13 +109,12 @@ struct sudo_user {
  * Used with set_perms()
  */
 #define PERM_ROOT                0x00
-#define PERM_FULL_ROOT           0x01
-#define PERM_USER                0x02
-#define PERM_FULL_USER           0x03
-#define PERM_SUDOERS             0x04
-#define PERM_RUNAS               0x05
-#define PERM_FULL_RUNAS          0x06
-#define PERM_TIMESTAMP           0x07
+#define PERM_USER                0x01
+#define PERM_FULL_USER           0x02
+#define PERM_SUDOERS             0x03
+#define PERM_RUNAS               0x04
+#define PERM_FULL_RUNAS          0x05
+#define PERM_TIMESTAMP           0x06
 
 /*
  * Shortcuts for sudo_user contents.