From 35b309fa0cac9341f364243b03ebfcc80f74198e Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 1 Aug 2011 15:39:01 +1000 Subject: gensec: clarify memory ownership for gensec_session_info() and gensec_session_key() This is slightly less efficient, because we no longer keep a cache on the gensec structures, but much clearer in terms of memory ownership. Both gensec_session_info() and gensec_session_key() now take a mem_ctx and put the result only on that context. Some duplication of memory in the callers (who were rightly uncertain about who was the rightful owner of the returned memory) has been removed to compensate for the internal copy. Andrew Bartlett --- auth/gensec/gensec.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'auth/gensec/gensec.c') diff --git a/auth/gensec/gensec.c b/auth/gensec/gensec.c index 4736e73d5a..417b05cf06 100644 --- a/auth/gensec/gensec.c +++ b/auth/gensec/gensec.c @@ -148,7 +148,8 @@ _PUBLIC_ NTSTATUS gensec_unwrap(struct gensec_security *gensec_security, } _PUBLIC_ NTSTATUS gensec_session_key(struct gensec_security *gensec_security, - DATA_BLOB *session_key) + TALLOC_CTX *mem_ctx, + DATA_BLOB *session_key) { if (!gensec_security->ops->session_key) { return NT_STATUS_NOT_IMPLEMENTED; @@ -157,7 +158,7 @@ _PUBLIC_ NTSTATUS gensec_session_key(struct gensec_security *gensec_security, return NT_STATUS_NO_USER_SESSION_KEY; } - return gensec_security->ops->session_key(gensec_security, session_key); + return gensec_security->ops->session_key(gensec_security, mem_ctx, session_key); } /** @@ -171,12 +172,13 @@ _PUBLIC_ NTSTATUS gensec_session_key(struct gensec_security *gensec_security, */ _PUBLIC_ NTSTATUS gensec_session_info(struct gensec_security *gensec_security, - struct auth_session_info **session_info) + TALLOC_CTX *mem_ctx, + struct auth_session_info **session_info) { if (!gensec_security->ops->session_info) { return NT_STATUS_NOT_IMPLEMENTED; } - return gensec_security->ops->session_info(gensec_security, session_info); + return gensec_security->ops->session_info(gensec_security, mem_ctx, session_info); } /** -- cgit