diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-01-16 13:13:11 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-02-12 13:17:14 +1300 |
| commit | 89ff7b0d851a971a8bdca7f9ff2200db61be4e03 (patch) | |
| tree | 4ce69565efa06d2e158e41c712b595d5f61c8a6e /lib | |
| parent | 2bf17a9d75fed68dd41c770ea9e0c284599f1a82 (diff) | |
| download | samba-89ff7b0d851a971a8bdca7f9ff2200db61be4e03.tar.gz samba-89ff7b0d851a971a8bdca7f9ff2200db61be4e03.tar.xz samba-89ff7b0d851a971a8bdca7f9ff2200db61be4e03.zip | |
param: remove special cases for tls files
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/param/loadparm.c | 17 | ||||
| -rw-r--r-- | lib/param/param_table.c | 10 |
2 files changed, 11 insertions, 16 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index f9092c6b8e..9795614aff 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -87,12 +87,7 @@ static bool defaults_saved = false; char *szIdmapGID; \ char *szIdmapBackend; \ int winbindMaxDomainConnections; \ - int ismb2_max_credits; \ - char *tls_keyfile; \ - char *tls_certfile; \ - char *tls_cafile; \ - char *tls_crlfile; \ - char *tls_dhpfile; + int ismb2_max_credits; #include "lib/param/param_global.h" @@ -2710,27 +2705,27 @@ _PUBLIC_ void reload_charcnv(struct loadparm_context *lp_ctx) _PUBLIC_ char *lpcfg_tls_keyfile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx) { - return lpcfg_private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_keyfile); + return lpcfg_private_path(mem_ctx, lp_ctx, lpcfg__tls_keyfile(lp_ctx)); } _PUBLIC_ char *lpcfg_tls_certfile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx) { - return lpcfg_private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_certfile); + return lpcfg_private_path(mem_ctx, lp_ctx, lpcfg__tls_certfile(lp_ctx)); } _PUBLIC_ char *lpcfg_tls_cafile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx) { - return lpcfg_private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_cafile); + return lpcfg_private_path(mem_ctx, lp_ctx, lpcfg__tls_cafile(lp_ctx)); } _PUBLIC_ char *lpcfg_tls_crlfile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx) { - return lpcfg_private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_crlfile); + return lpcfg_private_path(mem_ctx, lp_ctx, lpcfg__tls_crlfile(lp_ctx)); } _PUBLIC_ char *lpcfg_tls_dhpfile(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx) { - return lpcfg_private_path(mem_ctx, lp_ctx, lp_ctx->globals->tls_dhpfile); + return lpcfg_private_path(mem_ctx, lp_ctx, lpcfg__tls_dhpfile(lp_ctx)); } struct gensec_settings *lpcfg_gensec_settings(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index d108833aba..ad929ec16b 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -4349,7 +4349,7 @@ static struct parm_struct parm_table[] = { .label = "tls keyfile", .type = P_STRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(tls_keyfile), + .offset = GLOBAL_VAR(_tls_keyfile), .special = NULL, .enum_list = NULL }, @@ -4357,7 +4357,7 @@ static struct parm_struct parm_table[] = { .label = "tls certfile", .type = P_STRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(tls_certfile), + .offset = GLOBAL_VAR(_tls_certfile), .special = NULL, .enum_list = NULL }, @@ -4365,7 +4365,7 @@ static struct parm_struct parm_table[] = { .label = "tls cafile", .type = P_STRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(tls_cafile), + .offset = GLOBAL_VAR(_tls_cafile), .special = NULL, .enum_list = NULL }, @@ -4373,7 +4373,7 @@ static struct parm_struct parm_table[] = { .label = "tls crlfile", .type = P_STRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(tls_crlfile), + .offset = GLOBAL_VAR(_tls_crlfile), .special = NULL, .enum_list = NULL }, @@ -4381,7 +4381,7 @@ static struct parm_struct parm_table[] = { .label = "tls dh params file", .type = P_STRING, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(tls_dhpfile), + .offset = GLOBAL_VAR(_tls_dhpfile), .special = NULL, .enum_list = NULL }, |