Merged in LDAP Support

diff --git a/def_data.c b/def_data.c
index 8efc562cae1f136b3b6c6e97d923093a8af110f2..b54f262a27a50c0272b9daa419b783f506d6ff69 100644 (file)
--- a/def_data.c
+++ b/def_data.c
@@ -251,6 +251,10 @@ struct sudo_defs_types sudo_defs_table[] = {
        "env_keep", T_LIST|T_BOOL,
        "Environment variables to preserve:",
        NULL,
+    }, {
+       "ignore_local_sudoers", T_FLAG,
+       "If LDAP directory is up, do we ignore local sudoers file",
+       NULL,
     }, {
        NULL, 0, NULL
     }

diff --git a/def_data.h b/def_data.h
index 21284fe5a367b7a92fbe8c1135e6d8c906b75947..40cdb8fc76ea7712b372164902d433b82a00c9c7 100644 (file)
--- a/def_data.h
+++ b/def_data.h
@@ -112,6 +112,8 @@
 #define I_ENV_DELETE            55
 #define def_env_keep            (sudo_defs_table[56].sd_un.list)
 #define I_ENV_KEEP              56
+#define def_ignore_local_sudoers (sudo_defs_table[57].sd_un.flag)
+#define I_IGNORE_LOCAL_SUDOERS  57
 
 enum def_tupple {
        never,

diff --git a/def_data.in b/def_data.in
index 412021461187676d02ccb6619cdc8a52a18e4bd3..2c1b7a4f2065837d2526167371132c5a6cf8d8e6 100644 (file)
--- a/def_data.in
+++ b/def_data.in
@@ -182,3 +182,6 @@ env_delete
 env_keep
        T_LIST|T_BOOL
        "Environment variables to preserve:"
+ignore_local_sudoers
+       T_FLAG
+       "If LDAP directory is up, do we ignore local sudoers file"