From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Wed, 23 May 2012 18:57:18 +0000 (-0400)
Subject: Fix compilation when I/O logging support is not compiled in.
X-Git-Tag: SUDO_1_7_10~90
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56095b2d545b9991ef024fea3b385f6e1bdc60c8;p=sudo

Fix compilation when I/O logging support is not compiled in.

--HG--
branch : 1.7
---

diff --git a/defaults.c b/defaults.c
index dfe668d5f..f311a1bf1 100644
--- a/defaults.c
+++ b/defaults.c
@@ -439,7 +439,9 @@ init_defaults()
 #ifdef _PATH_SUDO_ASKPASS
     def_askpass = estrdup(_PATH_SUDO_ASKPASS);
 #endif
+#ifdef _PATH_SUDO_IO_LOGDIR
     def_iolog_dir = estrdup(_PATH_SUDO_IO_LOGDIR);
+#endif
     def_sudoers_locale = estrdup("C");
     def_env_reset = ENV_RESET;
     def_set_logname = TRUE;
diff --git a/exec.c b/exec.c
index 6bb984000..766302ded 100644
--- a/exec.c
+++ b/exec.c
@@ -406,12 +406,12 @@ sudo_execve(path, argv, envp, uid, cstat, dowait, bgmode)
 			cstat->val = errno;
 			break;
 		    }
+#endif
 		} else {
 		    /* Short read or EOF. */
 		    /* XXX - should set cstat */
 		    break;
 		}
-#endif
 	    }
 #ifdef _PATH_SUDO_IO_LOGDIR /* XXX */
 	    if (cstat->type == CMD_WSTATUS) {