From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Fri, 18 Jun 2010 21:47:17 +0000 (-0400)
Subject: Call set_fqdn() after sudoers has parsed instead of inline as a callback.
X-Git-Tag: SUDO_1_7_3~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=897e7f4b094eb84a3f3737310d71ab48da83235b;p=sudo

Call set_fqdn() after sudoers has parsed instead of inline as a callback.

--HG--
branch : 1.7
---

diff --git a/defaults.c b/defaults.c
index daa30019f..67d638e39 100644
--- a/defaults.c
+++ b/defaults.c
@@ -327,10 +327,6 @@ set_default(var, val, op)
 		return(FALSE);
 	    }
 	    cur->sd_un.flag = op;
-
-	    /* Special action for I_FQDN.  Move to own switch if we get more */
-	    if (num == I_FQDN && op)
-		set_fqdn();
 	    break;
 	case T_LIST:
 	    if (!val) {
diff --git a/sudo.c b/sudo.c
index e1bc6c3bd..7fecdfc05 100644
--- a/sudo.c
+++ b/sudo.c
@@ -300,6 +300,9 @@ main(argc, argv, envp)
     if (!update_defaults(SETDEF_RUNAS))
 	log_error(NO_STDERR|NO_EXIT, "problem with defaults entries");
 
+    if (def_fqdn)
+	set_fqdn();	/* deferred until after sudoers is parsed */
+
     /* Set login class if applicable. */
     set_loginclass(sudo_user.pw);