diff options
author | Andrew Bartlett <abartlet@samba.org> | 2006-08-03 08:02:54 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:15:20 -0500 |
commit | adefa4404cb612d8066b3a19f6fd545428e6441b (patch) | |
tree | 88c4ebd97e3fb4c3b4d9a2071cc5b14fd42b55e2 /source4/param | |
parent | 05aa6b85ce96eff028daef5b8275195dc1deed82 (diff) | |
download | samba-adefa4404cb612d8066b3a19f6fd545428e6441b.tar.gz samba-adefa4404cb612d8066b3a19f6fd545428e6441b.tar.bz2 samba-adefa4404cb612d8066b3a19f6fd545428e6441b.zip |
r17379: Pre-generate DH parameters, to avoid doing this at runtime in our testsuite.
Andrew Bartlett
(This used to be commit 23314c3953676124a2ad06e8b3a3b297c11f2800)
Diffstat (limited to 'source4/param')
-rw-r--r-- | source4/param/loadparm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 64713f74cf..6a47573932 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -139,6 +139,7 @@ typedef struct char *tls_certfile; char *tls_cafile; char *tls_crlfile; + char *tls_dhpfile; int max_mux; int max_xmit; int pwordlevel; @@ -451,6 +452,7 @@ static struct parm_struct parm_table[] = { {"tls certfile", P_STRING, P_GLOBAL, &Globals.tls_certfile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"tls cafile", P_STRING, P_GLOBAL, &Globals.tls_cafile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"tls crlfile", P_STRING, P_GLOBAL, &Globals.tls_crlfile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, + {"tls dh params file", P_STRING, P_GLOBAL, &Globals.tls_dhpfile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"swat directory", P_STRING, P_GLOBAL, &Globals.swat_directory, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"large readwrite", P_BOOL, P_GLOBAL, &Globals.bLargeReadwrite, NULL, NULL, FLAG_DEVELOPER}, {"server max protocol", P_ENUM, P_GLOBAL, &Globals.srv_maxprotocol, NULL, enum_protocol, FLAG_DEVELOPER}, @@ -830,6 +832,7 @@ _PUBLIC_ FN_GLOBAL_STRING(lp_tls_keyfile, &Globals.tls_keyfile) _PUBLIC_ FN_GLOBAL_STRING(lp_tls_certfile, &Globals.tls_certfile) _PUBLIC_ FN_GLOBAL_STRING(lp_tls_cafile, &Globals.tls_cafile) _PUBLIC_ FN_GLOBAL_STRING(lp_tls_crlfile, &Globals.tls_crlfile) +_PUBLIC_ FN_GLOBAL_STRING(lp_tls_dhpfile, &Globals.tls_dhpfile) _PUBLIC_ FN_GLOBAL_STRING(lp_unix_charset, &Globals.unix_charset) _PUBLIC_ FN_GLOBAL_STRING(lp_display_charset, &Globals.display_charset) _PUBLIC_ FN_GLOBAL_STRING(lp_configfile, &Globals.szConfigFile) |