>From 955f24c1ec3c690ea19483b52243287415d15112 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Mon, 4 Nov 2013 12:07:55 +0100
Subject: [PATCH] review fixes

---
 src/db/sysdb_autofs.h            |  1 -
 src/providers/ad/ad_opts.h       |  2 +-
 src/providers/ipa/ipa_opts.h     |  2 +-
 src/providers/ldap/ldap_common.c | 14 --------------
 src/providers/ldap/ldap_common.h |  2 --
 src/providers/ldap/ldap_opts.h   |  2 +-
 6 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/src/db/sysdb_autofs.h b/src/db/sysdb_autofs.h
index 97edaea03179d89d37073df41ca95cd544a53a29..1c334cf796c3cbde7ddb636ca963845c5054eeae 100644
--- a/src/db/sysdb_autofs.h
+++ b/src/db/sysdb_autofs.h
@@ -28,7 +28,6 @@
 #define AUTOFS_MAP_SUBDIR   "autofsmaps"
 #define AUTOFS_ENTRY_SUBDIR "autofsentries"
 
-#define SYSDB_AUTOFS_MAP_MASTER_NAME   "automountMapMasterName"
 #define SYSDB_AUTOFS_MAP_OC            "automountMap"
 #define SYSDB_AUTOFS_MAP_NAME          "automountMapName"
 
diff --git a/src/providers/ad/ad_opts.h b/src/providers/ad/ad_opts.h
index 754938e1b1f7b4442d4bdc24777c968ebbf450b6..9055b4516c7e5834f0540f30c28f2accb3111e9f 100644
--- a/src/providers/ad/ad_opts.h
+++ b/src/providers/ad/ad_opts.h
@@ -66,7 +66,7 @@ struct dp_option ad_def_ldap_opts[] = {
     { "ldap_sudo_include_netgroups", DP_OPT_BOOL, BOOL_TRUE, BOOL_TRUE },
     { "ldap_sudo_include_regexp", DP_OPT_BOOL, BOOL_TRUE, BOOL_TRUE },
     { "ldap_autofs_search_base", DP_OPT_STRING, NULL_STRING, NULL_STRING },
-    { "ldap_autofs_map_master_name", DP_OPT_STRING, NULL_STRING, NULL_STRING },
+    { "ldap_autofs_map_master_name", DP_OPT_STRING, { "auto.master" }, NULL_STRING },
     { "ldap_schema", DP_OPT_STRING, { "ad" }, NULL_STRING },
     { "ldap_offline_timeout", DP_OPT_NUMBER, { .number = 60 }, NULL_NUMBER },
     { "ldap_force_upper_case_realm", DP_OPT_BOOL, BOOL_TRUE, BOOL_TRUE },
diff --git a/src/providers/ipa/ipa_opts.h b/src/providers/ipa/ipa_opts.h
index 43b515d45d2535613298fcfedda965793ae78824..b3eef456c071792bdcbefe975176c6102a252d6e 100644
--- a/src/providers/ipa/ipa_opts.h
+++ b/src/providers/ipa/ipa_opts.h
@@ -90,7 +90,7 @@ struct dp_option ipa_def_ldap_opts[] = {
     { "ldap_sudo_include_netgroups", DP_OPT_BOOL, BOOL_TRUE, BOOL_TRUE },
     { "ldap_sudo_include_regexp", DP_OPT_BOOL, BOOL_TRUE, BOOL_TRUE },
     { "ldap_autofs_search_base", DP_OPT_STRING, NULL_STRING, NULL_STRING },
-    { "ldap_autofs_map_master_name", DP_OPT_STRING, NULL_STRING, NULL_STRING },
+    { "ldap_autofs_map_master_name", DP_OPT_STRING, { "auto.master" }, NULL_STRING },
     { "ldap_schema", DP_OPT_STRING, { "ipa_v1" }, NULL_STRING },
     { "ldap_offline_timeout", DP_OPT_NUMBER, { .number = 60 }, NULL_NUMBER },
     { "ldap_force_upper_case_realm", DP_OPT_BOOL, BOOL_TRUE, BOOL_TRUE },
diff --git a/src/providers/ldap/ldap_common.c b/src/providers/ldap/ldap_common.c
index 161265dedf1121dca6f8b93764d06b47e3652de5..cd38ac35adf2f6bf3013487c36a63d7cf35aa851 100644
--- a/src/providers/ldap/ldap_common.c
+++ b/src/providers/ldap/ldap_common.c
@@ -576,20 +576,6 @@ int ldap_get_autofs_options(TALLOC_CTX *memctx,
     struct sdap_attr_map *default_mobject_map;
     int ret;
 
-    /* automount master map name */
-    master_map = dp_opt_get_string(opts->basic, SDAP_AUTOFS_MAP_MASTER_NAME);
-    if (master_map == NULL) {
-        ret = dp_opt_set_string(opts->basic, SDAP_AUTOFS_MAP_MASTER_NAME,
-            AUTOFS_MAP_MASTER_NAME);
-        if (ret != EOK) {
-            DEBUG(SSSDBG_OP_FAILURE, ("Could not set autofs master map name"
-                  " to default value\n"));
-            return ret;
-        }
-        master_map = dp_opt_get_string(opts->basic, SDAP_AUTOFS_MAP_MASTER_NAME);
-    }
-    DEBUG(SSSDBG_FUNC_DATA, ("Option ldap_autofs_map_master_name set to %s\n", master_map));
-
     /* search base */
     search_base = dp_opt_get_string(opts->basic, SDAP_SEARCH_BASE);
     if (search_base != NULL) {
diff --git a/src/providers/ldap/ldap_common.h b/src/providers/ldap/ldap_common.h
index 1fbca488b63737c2cd6fa380bbb71f654a447635..b3bd950e1dca6df0f5668397d5e5a0796e519862 100644
--- a/src/providers/ldap/ldap_common.h
+++ b/src/providers/ldap/ldap_common.h
@@ -39,8 +39,6 @@
 #define LDAP_SSL_URI "ldaps://"
 #define LDAP_LDAPI_URI "ldapi://"
 
-#define AUTOFS_MAP_MASTER_NAME "auto.master"
-
 /* a fd the child process would log into */
 extern int ldap_child_debug_fd;
 
diff --git a/src/providers/ldap/ldap_opts.h b/src/providers/ldap/ldap_opts.h
index dca7c3930d27ba185e9c055f27e7317581dc9334..d6a2fc501d180c6db1f72de19d5a116c997d7b09 100644
--- a/src/providers/ldap/ldap_opts.h
+++ b/src/providers/ldap/ldap_opts.h
@@ -56,7 +56,7 @@ struct dp_option default_basic_opts[] = {
     { "ldap_sudo_include_netgroups", DP_OPT_BOOL, BOOL_TRUE, BOOL_TRUE },
     { "ldap_sudo_include_regexp", DP_OPT_BOOL, BOOL_TRUE, BOOL_TRUE },
     { "ldap_autofs_search_base", DP_OPT_STRING, NULL_STRING, NULL_STRING },
-    { "ldap_autofs_map_master_name", DP_OPT_STRING, NULL_STRING, NULL_STRING },
+    { "ldap_autofs_map_master_name", DP_OPT_STRING, { "auto.master" }, NULL_STRING },
     { "ldap_schema", DP_OPT_STRING, { "rfc2307" }, NULL_STRING },
     { "ldap_offline_timeout", DP_OPT_NUMBER, { .number = 60 }, NULL_NUMBER },
     { "ldap_force_upper_case_realm", DP_OPT_BOOL, BOOL_FALSE, BOOL_FALSE },
-- 
1.8.4.2