Ignore a missing or insecure #includedir, it is not a fatal error.

diff --git a/plugins/sudoers/toke.c b/plugins/sudoers/toke.c
index e90411de54572c11facc7edde7537bcea969e1bf..c23da7c9aebccd5cd8e67baf9ce70b7823c17cf6 100644 (file)
--- a/plugins/sudoers/toke.c
+++ b/plugins/sudoers/toke.c
@@ -2549,8 +2549,8 @@ YY_RULE_SETUP
                            LEXTRACE("INCLUDEDIR\n");
 
                            /*
-                            * Push current buffer and switch to include file.
-                            * We simply ignore empty directories.
+                            * Push current buffer and switch to include file,
+                            * ignoring missing or empty directories.
                             */
                            if (!push_includedir(path))
                                yyterminate();
@@ -4185,6 +4185,12 @@ init_lexer(void)
     debug_return;
 }
 
+/*
+ * Open an include file (or file from a directory), push the old
+ * sudoers file buffer and switch to the new one.
+ * A missing or insecure include dir is simply ignored.
+ * Returns false on error, else true.
+ */
 static bool
 push_include_int(char *path, bool isdir)
 {
@@ -4212,40 +4218,35 @@ push_include_int(char *path, bool isdir)
     SLIST_INIT(&istack[idepth].more);
     if (isdir) {
        struct stat sb;
-       int count;
-       switch (sudo_secure_dir(path, sudoers_uid, sudoers_gid, &sb)) {
-           case SUDO_PATH_SECURE:
-               break;
-           case SUDO_PATH_MISSING:
-               debug_return_bool(false);
-           case SUDO_PATH_BAD_TYPE:
-               errno = ENOTDIR;
-               if (sudoers_warnings) {
+       int count, status;
+
+       status = sudo_secure_dir(path, sudoers_uid, sudoers_gid, &sb);
+       if (status != SUDO_PATH_SECURE) {
+           if (sudoers_warnings) {
+               switch (status) {
+               case SUDO_PATH_BAD_TYPE:
+                   errno = ENOTDIR;
                    sudo_warn("%s", path);
-               }
-               debug_return_bool(false);
-           case SUDO_PATH_WRONG_OWNER:
-               if (sudoers_warnings) {
+                   break;
+               case SUDO_PATH_WRONG_OWNER:
                    sudo_warnx(U_("%s is owned by uid %u, should be %u"),   
                        path, (unsigned int) sb.st_uid,
                        (unsigned int) sudoers_uid);
-               }
-               debug_return_bool(false);
-           case SUDO_PATH_WORLD_WRITABLE:
-               if (sudoers_warnings) {
+                   break;
+               case SUDO_PATH_WORLD_WRITABLE:
                    sudo_warnx(U_("%s is world writable"), path);
-               }
-               debug_return_bool(false);
-           case SUDO_PATH_GROUP_WRITABLE:
-               if (sudoers_warnings) {
+                   break;
+               case SUDO_PATH_GROUP_WRITABLE:
                    sudo_warnx(U_("%s is owned by gid %u, should be %u"),
                        path, (unsigned int) sb.st_gid,
                        (unsigned int) sudoers_gid);
+                   break;
+               default:
+                   break;
                }
-               debug_return_bool(false);
-           default:
-               /* NOTREACHED */
-               debug_return_bool(false);
+           }
+           /* A missing or insecure include dir is not a fatal error. */
+           debug_return_bool(true);
        }
        count = switch_dir(&istack[idepth], path);
        if (count <= 0) {
@@ -4285,6 +4286,11 @@ push_include_int(char *path, bool isdir)
     debug_return_bool(true);
 }
 
+/*
+ * Restore the previous sudoers file and buffer, or, in the case
+ * of an includedir, switch to the next file in the dir.
+ * Returns false if there is nothing to pop, else true.
+ */
 static bool
 pop_include(void)
 {

diff --git a/plugins/sudoers/toke.l b/plugins/sudoers/toke.l
index ae4ddf6441c0c9848bc55d63d33cc8b52068955f..a98fef0dc662b53dcc2777bc5071019cf19189d3 100644 (file)
--- a/plugins/sudoers/toke.l
+++ b/plugins/sudoers/toke.l
@@ -319,8 +319,8 @@ DEFVAR                      [a-z_]+
                            LEXTRACE("INCLUDEDIR\n");
 
                            /*
-                            * Push current buffer and switch to include file.
-                            * We simply ignore empty directories.
+                            * Push current buffer and switch to include file,
+                            * ignoring missing or empty directories.
                             */
                            if (!push_includedir(path))
                                yyterminate();
@@ -902,6 +902,12 @@ init_lexer(void)
     debug_return;
 }
 
+/*
+ * Open an include file (or file from a directory), push the old
+ * sudoers file buffer and switch to the new one.
+ * A missing or insecure include dir is simply ignored.
+ * Returns false on error, else true.
+ */
 static bool
 push_include_int(char *path, bool isdir)
 {
@@ -929,40 +935,35 @@ push_include_int(char *path, bool isdir)
     SLIST_INIT(&istack[idepth].more);
     if (isdir) {
        struct stat sb;
-       int count;
-       switch (sudo_secure_dir(path, sudoers_uid, sudoers_gid, &sb)) {
-           case SUDO_PATH_SECURE:
-               break;
-           case SUDO_PATH_MISSING:
-               debug_return_bool(false);
-           case SUDO_PATH_BAD_TYPE:
-               errno = ENOTDIR;
-               if (sudoers_warnings) {
+       int count, status;
+
+       status = sudo_secure_dir(path, sudoers_uid, sudoers_gid, &sb);
+       if (status != SUDO_PATH_SECURE) {
+           if (sudoers_warnings) {
+               switch (status) {
+               case SUDO_PATH_BAD_TYPE:
+                   errno = ENOTDIR;
                    sudo_warn("%s", path);
-               }
-               debug_return_bool(false);
-           case SUDO_PATH_WRONG_OWNER:
-               if (sudoers_warnings) {
+                   break;
+               case SUDO_PATH_WRONG_OWNER:
                    sudo_warnx(U_("%s is owned by uid %u, should be %u"),   
                        path, (unsigned int) sb.st_uid,
                        (unsigned int) sudoers_uid);
-               }
-               debug_return_bool(false);
-           case SUDO_PATH_WORLD_WRITABLE:
-               if (sudoers_warnings) {
+                   break;
+               case SUDO_PATH_WORLD_WRITABLE:
                    sudo_warnx(U_("%s is world writable"), path);
-               }
-               debug_return_bool(false);
-           case SUDO_PATH_GROUP_WRITABLE:
-               if (sudoers_warnings) {
+                   break;
+               case SUDO_PATH_GROUP_WRITABLE:
                    sudo_warnx(U_("%s is owned by gid %u, should be %u"),
                        path, (unsigned int) sb.st_gid,
                        (unsigned int) sudoers_gid);
+                   break;
+               default:
+                   break;
                }
-               debug_return_bool(false);
-           default:
-               /* NOTREACHED */
-               debug_return_bool(false);
+           }
+           /* A missing or insecure include dir is not a fatal error. */
+           debug_return_bool(true);
        }
        count = switch_dir(&istack[idepth], path);
        if (count <= 0) {
@@ -1002,6 +1003,11 @@ push_include_int(char *path, bool isdir)
     debug_return_bool(true);
 }
 
+/*
+ * Restore the previous sudoers file and buffer, or, in the case
+ * of an includedir, switch to the next file in the dir.
+ * Returns false if there is nothing to pop, else true.
+ */
 static bool
 pop_include(void)
 {