diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-05-27 12:23:52 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:17:06 -0500 |
| commit | f466b722224d15a9674e04eca1175975d73e7d7a (patch) | |
| tree | 41798f96d6aeea189f0617d06bdd1ef91e3e972f /source4/web_server | |
| parent | 5ad5d0fb43d99748143cfee0ef60ae28b6654e31 (diff) | |
| download | samba-f466b722224d15a9674e04eca1175975d73e7d7a.tar.gz samba-f466b722224d15a9674e04eca1175975d73e7d7a.tar.bz2 samba-f466b722224d15a9674e04eca1175975d73e7d7a.zip | |
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)
Diffstat (limited to 'source4/web_server')
| -rw-r--r-- | source4/web_server/tls.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/web_server/tls.c b/source4/web_server/tls.c index 4129d59355..2d71ac0c37 100644 --- 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; } |