summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-06-20 04:18:23 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:18:34 -0500
commit30b68a0af2df78958aa6ec73b00014e55711a777 (patch)
tree9ed10b1bfd45a6bd4aecf599ee5e8c8158f8a766 /source4/lib
parent44e7892131730f607015c65a88f4d1e31e889822 (diff)
downloadsamba-30b68a0af2df78958aa6ec73b00014e55711a777.tar.gz
samba-30b68a0af2df78958aa6ec73b00014e55711a777.tar.bz2
samba-30b68a0af2df78958aa6ec73b00014e55711a777.zip
r7773: fixed the tls code for the non-GNUTLS case
(This used to be commit bc6bc84ef4ad3434c6cb8d94a8d7a105ad2fd8c2)
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/tls/tls.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/lib/tls/tls.c b/source4/lib/tls/tls.c
index 49f7b758c0..f89e2f1028 100644
--- a/source4/lib/tls/tls.c
+++ b/source4/lib/tls/tls.c
@@ -519,7 +519,7 @@ struct tls_context *tls_init_server(struct tls_params *params,
const char *plain_chars,
BOOL tls_enable)
{
- if (plain_chars == NULL) return NULL;
+ if (tls_enable && plain_chars == NULL) return NULL;
return (struct tls_context *)sock;
}