svn commit: samba r19215 - in branches/SAMBA_4_0_RELEASE/source/lib/tls: .

[abartlet]

Author: abartlet
Date: 2006-10-10 04:17:43 +0000 (Tue, 10 Oct 2006)
New Revision: 19215

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19215

Log:
Re-enable TLS in the default configuration.  We passed on the build
farm because we have an explicit diffie-hilliman parameters file set.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0_RELEASE/source/lib/tls/tls.c


Changeset:
Modified: branches/SAMBA_4_0_RELEASE/source/lib/tls/tls.c
===================================================================
--- branches/SAMBA_4_0_RELEASE/source/lib/tls/tls.c     2006-10-10 04:16:53 UTC 
(rev 19214)
+++ branches/SAMBA_4_0_RELEASE/source/lib/tls/tls.c     2006-10-10 04:17:43 UTC 
(rev 19215)
@@ -417,12 +417,13 @@
        ret = gnutls_dh_params_init(&params->dh_params);
        if (ret < 0) goto init_failed;
 
-       if (dhpfile) {
+       if (dhpfile && *dhpfile) {
                gnutls_datum_t dhparms;
                size_t size;
                dhparms.data = (uint8_t *)file_load(dhpfile, &size, mem_ctx);
 
                if (!dhparms.data) {
+                       DEBUG(0,("Failed to read DH Parms from %s\n", dhpfile));
                        goto init_failed;
                }
                dhparms.size = size;