diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-01-24 17:39:41 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-02-20 10:11:24 +1300 |
| commit | 8246e53bb693231213d5f9586ff4baefbc3ec6a8 (patch) | |
| tree | 60a9f3f1e0f265b17bfd8996feace021d56dc3b4 | |
| parent | a7d2f9a08ed11dba157d6fe5c03581114478e3d3 (diff) | |
| download | samba-8246e53bb693231213d5f9586ff4baefbc3ec6a8.tar.gz samba-8246e53bb693231213d5f9586ff4baefbc3ec6a8.tar.xz samba-8246e53bb693231213d5f9586ff4baefbc3ec6a8.zip | |
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>
| -rw-r--r-- | lib/param/s3_param.h | 1 | ||||
| -rw-r--r-- | source3/include/proto.h | 1 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 1 | ||||
| -rw-r--r-- | source3/param/loadparm_ctx.c | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/lib/param/s3_param.h b/lib/param/s3_param.h index 9358617dd3..106c48007d 100644 --- 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 28c26a9626..a6a6815355 100644 --- 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 2f58a9c99e..2114fa33a0 100644 --- 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 ee999dccfd..efae8cbbaf 100644 --- 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) |