sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

r19217: Merge from SAMBA_4_0_RELEASE:

Browse Source 
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
This commit is contained in:
Andrew Bartlett 2006-10-10 04:22:00 +00:00 committed by Gerald (Jerry) Carter
parent a4aafe307d
commit d20ab6a5ed
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/lib/tls/tls.c
View File

@ -417,12 +417,13 @@ struct tls_params *tls_initialise(TALLOC_CTX *mem_ctx)
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;