summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Layton <jlayton@redhat.com>2010-02-16 09:16:42 -0500
committerGünther Deschner <gd@samba.org>2010-02-17 12:15:50 +0100
commita8cc2fa09ed43a167f62711bef363a5ac335dc78 (patch)
tree4df98efc653eb1af150f39fe4f0392cdb0a0a14b
parent8aef63d2430a3e96b1dbf3f6595bdf78f703c778 (diff)
downloadsamba-a8cc2fa09ed43a167f62711bef363a5ac335dc78.tar.gz
samba-a8cc2fa09ed43a167f62711bef363a5ac335dc78.tar.bz2
samba-a8cc2fa09ed43a167f62711bef363a5ac335dc78.zip
cifs.upcall: allocate a talloc context for smb_krb5_unparse_name
cifs.upcall calls smb_krb5_unparse_name with a NULL talloc context. Older versions of this function though will conditionally use SMB_REALLOC instead of TALLOC_REALLOC when a NULL context is passed in. To make it more consistent, just spawn a talloc context that we can pass into this function. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=565446 https://bugzilla.samba.org/show_bug.cgi?id=6868 Reported-by: Ludek Finstrle <luf@seznam.cz> Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Günther Deschner <gd@samba.org>
-rw-r--r--client/cifs.upcall.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/client/cifs.upcall.c b/client/cifs.upcall.c
index bfc70d15ed..42632a0da0 100644
--- a/client/cifs.upcall.c
+++ b/client/cifs.upcall.c
@@ -56,6 +56,7 @@ get_tgt_time(const char *ccname) {
krb5_principal principal;
time_t credtime = 0;
char *realm = NULL;
+ TALLOC_CTX *mem_ctx;
if (krb5_init_context(&context)) {
syslog(LOG_DEBUG, "%s: unable to init krb5 context", __func__);
@@ -87,9 +88,10 @@ get_tgt_time(const char *ccname) {
goto err_ccstart;
}
+ mem_ctx = talloc_init("cifs.upcall");
while (!credtime && !krb5_cc_next_cred(context, ccache, &cur, &creds)) {
char *name;
- if (smb_krb5_unparse_name(NULL, context, creds.server, &name)) {
+ if (smb_krb5_unparse_name(mem_ctx, context, creds.server, &name)) {
syslog(LOG_DEBUG, "%s: unable to unparse name", __func__);
goto err_endseq;
}
@@ -102,6 +104,7 @@ get_tgt_time(const char *ccname) {
TALLOC_FREE(name);
}
err_endseq:
+ TALLOC_FREE(mem_ctx);
krb5_cc_end_seq_get(context, ccache, &cur);
err_ccstart:
krb5_free_principal(context, principal);