diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-09-09 10:05:58 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:18:04 -0500 |
| commit | 30ee8beb9316a99e8a49993306252591106cb349 (patch) | |
| tree | a00d384bb7e1e9c09a800f4e3de00b2c9450e17b /source4/lib/tls/tls.c | |
| parent | 85e24e54d29ca8a08ad833831052e41a0bb257b6 (diff) | |
| download | samba-30ee8beb9316a99e8a49993306252591106cb349.tar.gz samba-30ee8beb9316a99e8a49993306252591106cb349.tar.bz2 samba-30ee8beb9316a99e8a49993306252591106cb349.zip | |
r18301: I discovered how to load the warnings from a build farm build into
emacs compile mode (hint, paste to a file, and compile as "cat
filename").
This allowed me to fix nearly all the warnings for a IA_64 SuSE build
very quickly.
(This used to be commit eba6c84efff735bb0ca941ac4b755ce2b0591667)
Diffstat (limited to 'source4/lib/tls/tls.c')
| -rw-r--r-- | source4/lib/tls/tls.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source4/lib/tls/tls.c b/source4/lib/tls/tls.c index cd65e22bcb..8c885543ee 100644 --- a/source4/lib/tls/tls.c +++ b/source4/lib/tls/tls.c @@ -339,7 +339,7 @@ static NTSTATUS tls_socket_send(struct socket_context *sock, return STATUS_MORE_ENTRIES; } if (ret < 0) { - DEBUG(0,("gnutls_record_send of %d failed - %s\n", blob->length, gnutls_strerror(ret))); + DEBUG(0,("gnutls_record_send of %d failed - %s\n", (int)blob->length, gnutls_strerror(ret))); return NT_STATUS_UNEXPECTED_NETWORK_ERROR; } *sendlen = ret; @@ -419,11 +419,13 @@ struct tls_params *tls_initialise(TALLOC_CTX *mem_ctx) if (dhpfile) { gnutls_datum_t dhparms; - dhparms.data = (uint8_t *)file_load(dhpfile, &dhparms.size, mem_ctx); + size_t size; + dhparms.data = (uint8_t *)file_load(dhpfile, &size, mem_ctx); if (!dhparms.data) { goto init_failed; } + dhparms.size = size; ret = gnutls_dh_params_import_pkcs3(params->dh_params, &dhparms, GNUTLS_X509_FMT_PEM); if (ret < 0) goto init_failed; |