svn commit: samba r19217 - in branches/SAMBA_4_0/source/lib/tls: .
abartlet at samba.org
abartlet at samba.org
Tue Oct 10 04:22:01 GMT 2006
Author: abartlet
Date: 2006-10-10 04:22:00 +0000 (Tue, 10 Oct 2006)
New Revision: 19217
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19217
Log:
Merge from SAMBA_4_0_RELEASE:
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/source/lib/tls/tls.c
Changeset:
Modified: branches/SAMBA_4_0/source/lib/tls/tls.c
===================================================================
--- branches/SAMBA_4_0/source/lib/tls/tls.c 2006-10-10 04:20:50 UTC (rev 19216)
+++ branches/SAMBA_4_0/source/lib/tls/tls.c 2006-10-10 04:22:00 UTC (rev 19217)
@@ -417,12 +417,13 @@
ret = gnutls_dh_params_init(¶ms->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;
More information about the samba-cvs
mailing list