r7012: added smb.conf parameters

  web tls keyfile
  web tls certfile
  web tls cafile
  web tls crlfile
(This used to be commit abfa3e9179557cf1853f490a479a0003ce4e11f7)

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index af9c30d80e06eebc7a14a2e4b4f89119e7073c98..ab9dbdf47f873f287e4531ae7e815e4745347910 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -179,6 +179,10 @@ typedef struct
        char *szIDMapBackend;
        char *szGuestaccount;
        char *swat_directory;
+       char *web_keyfile;
+       char *web_certfile;
+       char *web_cafile;
+       char *web_crlfile;
        int max_mux;
        int max_xmit;
        int pwordlevel;
@@ -591,6 +595,10 @@ static struct parm_struct parm_table[] = {
        {"dgram port", P_INTEGER, P_GLOBAL, &Globals.dgram_port, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"cldap port", P_INTEGER, P_GLOBAL, &Globals.cldap_port, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
        {"web port", P_INTEGER, P_GLOBAL, &Globals.web_port, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+       {"web tls keyfile", P_STRING, P_GLOBAL, &Globals.web_keyfile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+       {"web tls certfile", P_STRING, P_GLOBAL, &Globals.web_certfile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+       {"web tls cafile", P_STRING, P_GLOBAL, &Globals.web_cafile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+       {"web tls crlfile", P_STRING, P_GLOBAL, &Globals.web_crlfile, 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},
        {"max protocol", P_ENUM, P_GLOBAL, &Globals.maxprotocol, NULL, enum_protocol, FLAG_DEVELOPER},
@@ -1035,6 +1043,10 @@ static void init_globals(void)
 
        do_parameter("max wins ttl", "432000");
        do_parameter("min wins ttl", "10");
+
+       do_parameter_var("web tls keyfile", "%s/tls/key.pem", dyn_PRIVATE_DIR);
+       do_parameter_var("web tls certfile", "%s/tls/cert.pem", dyn_PRIVATE_DIR);
+       do_parameter_var("web tls cafile", "%s/tls/ca.pem", dyn_PRIVATE_DIR);
 }
 
 static TALLOC_CTX *lp_talloc;
@@ -1136,6 +1148,10 @@ FN_GLOBAL_INTEGER(lp_cldap_port, &Globals.cldap_port)
 FN_GLOBAL_INTEGER(lp_web_port, &Globals.web_port)
 FN_GLOBAL_STRING(lp_dos_charset, &Globals.dos_charset)
 FN_GLOBAL_STRING(lp_swat_directory, &Globals.swat_directory)
+FN_GLOBAL_STRING(lp_web_keyfile, &Globals.web_keyfile)
+FN_GLOBAL_STRING(lp_web_certfile, &Globals.web_certfile)
+FN_GLOBAL_STRING(lp_web_cafile, &Globals.web_cafile)
+FN_GLOBAL_STRING(lp_web_crlfile, &Globals.web_crlfile)
 FN_GLOBAL_STRING(lp_unix_charset, &Globals.unix_charset)
 FN_GLOBAL_STRING(lp_display_charset, &Globals.display_charset)
 FN_GLOBAL_STRING(lp_logfile, &Globals.szLogFile)