r7016: - added smb.conf parm 'web tls = true/false'

- by default enable tls if the certfile is set in smb.conf and gnutls library
  was compiled in
(This used to be commit bbafdeae3a68c0ff1170b0a4ecc568664ec1a925)

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index ab9dbdf47f873f287e4531ae7e815e4745347910..10660ffde72c3b013cc2f1cafe59420e1f1882fd 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -179,6 +179,7 @@ typedef struct
        char *szIDMapBackend;
        char *szGuestaccount;
        char *swat_directory;
+       BOOL web_tls;
        char *web_keyfile;
        char *web_certfile;
        char *web_cafile;
@@ -595,6 +596,7 @@ 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", P_BOOL, P_GLOBAL, &Globals.web_tls, 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},
@@ -1044,6 +1046,7 @@ static void init_globals(void)
        do_parameter("max wins ttl", "432000");
        do_parameter("min wins ttl", "10");
 
+       do_parameter("web tls", "True");
        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);
@@ -1148,6 +1151,7 @@ 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_BOOL(lp_web_tls, &Globals.web_tls)
 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)

diff --git a/source4/web_server/tls.c b/source4/web_server/tls.c
index 4129d59355d66fba218d0d1c1aef39ba3cc262b7..2d71ac0c376ad5bfda2e96d1655bce64d4a44021 100644 (file)
--- a/source4/web_server/tls.c
+++ b/source4/web_server/tls.c
@@ -57,7 +57,7 @@ void tls_initialise(struct task_server *task)
        const char *cafile = lp_web_cafile();
        const char *crlfile = lp_web_crlfile();
 
-       if (!lp_parm_bool(-1, "web", "tls", False)) {
+       if (!lp_web_tls() || keyfile == NULL || *keyfile == 0) {
                return;
        }