param: remove lp_dnsdomain from s3

With the use of the shared globals structure, lp_dnsdomain is no longer used in the code and removing it would remove a notable special case

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Change-Id: I59526c40c58e132a134d67fa7944dfeacd05f4c6
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Nadezhda Ivanova <nivanova@samba.org>

diff --git a/lib/param/s3_param.h b/lib/param/s3_param.h
index 9358617dd30c9d5fb290cd83d0d0c6ca78bc7a6d..106c48007dd985a0c5353e29ab550b0131da5be1 100644 (file)
--- a/lib/param/s3_param.h
+++ b/lib/param/s3_param.h
@@ -13,7 +13,6 @@ struct loadparm_s3_helpers
        bool (*load)(const char *filename);
        bool (*set_cmdline)(const char *pszParmName, const char *pszParmValue);
        void (*dump)(FILE *f, bool show_defaults, int maxtoprint);
-       const char * (*dnsdomain)(void);
        char * (*lp_string)(TALLOC_CTX *ctx, const char *in);
        struct loadparm_global *globals;
 };

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 28c26a9626fd965ec62a16168b2a48eeec594e99..a6a68153558cdcafa0e7016880f74bdb376f3a80 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -989,7 +989,6 @@ NTSTATUS trust_pw_change(struct netlogon_creds_cli_context *context,
 char *lp_servicename(TALLOC_CTX *ctx, int);
 const char *lp_const_servicename(int);
 bool lp_autoloaded(int);
-const char *lp_dnsdomain(void);
 int lp_winbind_max_domain_connections(void);
 bool lp_idmap_range(const char *domain_name, uint32_t *low, uint32_t *high);
 bool lp_idmap_default_range(uint32_t *low, uint32_t *high);

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 2f58a9c99ea8624f1d6a167e5d0fd01b2a8919f5..2114fa33a0959a7269ee8be722675de0bbf74f89 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1189,7 +1189,6 @@ FN_LOCAL_CONST_STRING(const_servicename, szService)
 
 /* These functions cannot be auto-generated */
 FN_LOCAL_BOOL(autoloaded, autoloaded)
-FN_GLOBAL_CONST_STRING(dnsdomain, dnsdomain)
 
 /* local prototypes */
 

diff --git a/source3/param/loadparm_ctx.c b/source3/param/loadparm_ctx.c
index ee999dccfdc4d3641a4c37d25de47d091f77f384..efae8cbbaf37d5a74b7a3dd6371c27a8cfeebd44 100644 (file)
--- a/source3/param/loadparm_ctx.c
+++ b/source3/param/loadparm_ctx.c
@@ -68,7 +68,6 @@ static struct loadparm_s3_helpers s3_fns =
        .load = lp_load_for_s4_ctx,
        .set_cmdline = lp_set_cmdline,
        .dump = lp_dump,
-       .dnsdomain = lp_dnsdomain,
 };
 
 const struct loadparm_s3_helpers *loadparm_s3_helpers(void)