diff options
author | Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de> | 2009-06-18 11:16:16 +0200 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2009-06-19 11:32:01 +1000 |
commit | 2627c6c0c2d3d96b3d458092ba8b090447a76a61 (patch) | |
tree | 9b3beebf9c689901eed3cd71a344809e36ca5436 /source4/lib | |
parent | 0376d056e58d76b7792a5512d84c07f703838b4d (diff) | |
download | samba-2627c6c0c2d3d96b3d458092ba8b090447a76a61.tar.gz samba-2627c6c0c2d3d96b3d458092ba8b090447a76a61.tar.bz2 samba-2627c6c0c2d3d96b3d458092ba8b090447a76a61.zip |
Fixed some uninitialised variables
I tried hard to not change the program logic. Should fix bug #6439.
Diffstat (limited to 'source4/lib')
-rw-r--r-- | source4/lib/registry/regf.c | 3 | ||||
-rw-r--r-- | source4/lib/tls/tls.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/registry/regf.c b/source4/lib/registry/regf.c index fbb9cd9de9..6d4ea1b688 100644 --- a/source4/lib/registry/regf.c +++ b/source4/lib/registry/regf.c @@ -1727,7 +1727,8 @@ static WERROR regf_add_key(TALLOC_CTX *ctx, const struct hive_key *parent, if (!hbin_get_tdr(regf, regf->header->data_offset, root, (tdr_pull_fn_t)tdr_pull_nk_block, root)) { - DEBUG(0, ("Unable to find HBIN data for offset %d\n", offset)); + DEBUG(0, ("Unable to find HBIN data for offset %d\n", + regf->header->data_offset)); return WERR_GENERAL_FAILURE; } nk.sk_offset = root->sk_offset; diff --git a/source4/lib/tls/tls.c b/source4/lib/tls/tls.c index 1014ab07a8..8a5ee89b87 100644 --- a/source4/lib/tls/tls.c +++ b/source4/lib/tls/tls.c @@ -547,7 +547,6 @@ struct socket_context *tls_init_client(struct socket_context *socket_ctx, struct tls_context *tls; int ret = 0; const int cert_type_priority[] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 }; - char *cafile; struct socket_context *new_sock; NTSTATUS nt_status; @@ -574,7 +573,7 @@ struct socket_context *tls_init_client(struct socket_context *socket_ctx, gnutls_global_init(); gnutls_certificate_allocate_credentials(&tls->xcred); - gnutls_certificate_set_x509_trust_file(tls->xcred, cafile, GNUTLS_X509_FMT_PEM); + gnutls_certificate_set_x509_trust_file(tls->xcred, ca_path, GNUTLS_X509_FMT_PEM); TLSCHECK(gnutls_init(&tls->session, GNUTLS_CLIENT)); TLSCHECK(gnutls_set_default_priority(tls->session)); gnutls_certificate_type_set_priority(tls->session, cert_type_priority); |