summaryrefslogtreecommitdiffstats
path: root/source3/param/loadparm.c
diff options
context:
space:
mode:
authorGarming Sam <garming@catalyst.net.nz>2014-01-16 13:13:11 +1300
committerAndrew Bartlett <abartlet@samba.org>2014-02-12 13:17:14 +1300
commit89ff7b0d851a971a8bdca7f9ff2200db61be4e03 (patch)
tree4ce69565efa06d2e158e41c712b595d5f61c8a6e /source3/param/loadparm.c
parent2bf17a9d75fed68dd41c770ea9e0c284599f1a82 (diff)
downloadsamba-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 'source3/param/loadparm.c')
-rw-r--r--source3/param/loadparm.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index be18f10921f..c780f4e72ca 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -123,12 +123,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"
@@ -1036,9 +1031,9 @@ static void init_globals(bool reinit_globals)
Globals.tls_enabled = true;
- string_set(&Globals.tls_keyfile, "tls/key.pem");
- string_set(&Globals.tls_certfile, "tls/cert.pem");
- string_set(&Globals.tls_cafile, "tls/ca.pem");
+ string_set(&Globals._tls_keyfile, "tls/key.pem");
+ string_set(&Globals._tls_certfile, "tls/cert.pem");
+ string_set(&Globals._tls_cafile, "tls/ca.pem");
string_set(&Globals.share_backend, "classic");