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 daa30019f46d759a01d524025a5f167df347add4..67d638e39b457ae83931fc0f8a40085ccdbba5e1 100644 (file)
--- 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 e1bc6c3bd436867a24ed5c32df5a958f870fed12..7fecdfc051db66d5b1aa6bc3bf0977e7ecd33c9c 100644 (file)
--- 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);