Check sudo_conf_read() return value and exit on fatal error (a

warning was already printed by sudo_conf_read()).

diff --git a/lib/util/regress/sudo_conf/conf_test.c b/lib/util/regress/sudo_conf/conf_test.c
index 4a03f317951cbdb8ebb0d0f48df0e9126b624932..97995e25620d54189191ee688a52180386932c93 100644 (file)
--- a/lib/util/regress/sudo_conf/conf_test.c
+++ b/lib/util/regress/sudo_conf/conf_test.c
@@ -51,12 +51,13 @@ main(int argc, char *argv[])
     initprogname(argc > 0 ? argv[0] : "conf_test");
     if (argc != 2) {
        fprintf(stderr, "usage: %s conf_file\n", getprogname());
-       exit(1);
+       exit(EXIT_FAILURE);
     }
-    sudo_conf_read(argv[1], SUDO_CONF_ALL);
+    if (sudo_conf_read(argv[1], SUDO_CONF_ALL) == -1)
+       exit(EXIT_FAILURE);
     sudo_conf_dump();
 
-    exit(0);
+    exit(EXIT_SUCCESS);
 }
 
 static void

diff --git a/plugins/sudoers/sudoreplay.c b/plugins/sudoers/sudoreplay.c
index 2aed0a104b3fa8135e4870d3cd83692d6726b884..5808d2b47101c34215a443f23f89a407562b8a29 100644 (file)
--- a/plugins/sudoers/sudoreplay.c
+++ b/plugins/sudoers/sudoreplay.c
@@ -211,7 +211,8 @@ main(int argc, char *argv[])
     sudo_fatal_callback_register(sudoreplay_cleanup);
 
     /* Read sudo.conf and initialize the debug subsystem. */
-    sudo_conf_read(NULL, SUDO_CONF_DEBUG);
+    if (sudo_conf_read(NULL, SUDO_CONF_DEBUG) == -1)
+       exit(EXIT_FAILURE);
     sudo_debug_register(getprogname(), NULL, NULL,
        sudo_conf_debug_files(getprogname()));
 

diff --git a/plugins/sudoers/testsudoers.c b/plugins/sudoers/testsudoers.c
index 20124a0f0179a7aba7d95cc489239df4572502aa..13fade71887fac424028821dbc6a06bd9f2aeb49 100644 (file)
--- a/plugins/sudoers/testsudoers.c
+++ b/plugins/sudoers/testsudoers.c
@@ -132,7 +132,8 @@ main(int argc, char *argv[])
     textdomain("sudoers");
 
     /* Initialize the debug subsystem. */
-    sudo_conf_read(NULL, SUDO_CONF_DEBUG);
+    if (sudo_conf_read(NULL, SUDO_CONF_DEBUG) == -1)
+       exit(EXIT_FAILURE);
     sudoers_debug_register(getprogname(), sudo_conf_debug_files(getprogname()));
 
     dflag = 0;

diff --git a/plugins/sudoers/visudo.c b/plugins/sudoers/visudo.c
index a8ea9cf3fa0c3c0d8cb4a0e9bc5de1be08fcc711..8e630b37921d3f921c366e1f5fba3701ab054e12 100644 (file)
--- a/plugins/sudoers/visudo.c
+++ b/plugins/sudoers/visudo.c
@@ -163,7 +163,8 @@ main(int argc, char *argv[])
     sudo_fatal_callback_register(visudo_cleanup);
 
     /* Read debug and plugin sections of sudo.conf. */
-    sudo_conf_read(NULL, SUDO_CONF_DEBUG|SUDO_CONF_PLUGINS);
+    if (sudo_conf_read(NULL, SUDO_CONF_DEBUG|SUDO_CONF_PLUGINS) == -1)
+       exit(EXIT_FAILURE);
 
     /* Initialize the debug subsystem. */
     sudoers_debug_register(getprogname(), sudo_conf_debug_files(getprogname()));

diff --git a/src/sesh.c b/src/sesh.c
index c76609332df92135275849f282bdef67cd8c9640..89e8f7c26c1f1051788b92e6bcd08eb54c2506ae 100644 (file)
--- a/src/sesh.c
+++ b/src/sesh.c
@@ -77,7 +77,8 @@ main(int argc, char *argv[], char *envp[])
        sudo_fatalx(U_("requires at least one argument"));
 
     /* Read sudo.conf and initialize the debug subsystem. */
-    sudo_conf_read(NULL, SUDO_CONF_DEBUG);
+    if (sudo_conf_read(NULL, SUDO_CONF_DEBUG) == -1)
+       exit(EXIT_FAILURE);
     sudo_debug_register(getprogname(), NULL, NULL,
        sudo_conf_debug_files(getprogname()));
 

diff --git a/src/sudo.c b/src/sudo.c
index aac0cc0c7b8caf3e0b438368f09faa1b7075a439..9a80c2df2b6607192104a88dcb2c7519b7837742 100644 (file)
--- a/src/sudo.c
+++ b/src/sudo.c
@@ -161,7 +161,8 @@ main(int argc, char *argv[], char *envp[])
 #endif /* HAVE_GETPRPWNAM && HAVE_SET_AUTH_PARAMETERS */
 
     /* Initialize the debug subsystem. */
-    sudo_conf_read(NULL, SUDO_CONF_DEBUG);
+    if (sudo_conf_read(NULL, SUDO_CONF_DEBUG) == -1)
+       exit(EXIT_FAILURE);
     sudo_debug_instance = sudo_debug_register(getprogname(),
        NULL, NULL, sudo_conf_debug_files(getprogname()));