summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2011-07-25 21:41:14 +0200
committerAndreas Schneider <asn@samba.org>2011-07-27 08:50:01 +0200
commitfea4a3111be2550550194dfa56272feb5688407b (patch)
tree7871b1fd8d6ba30c85b4fe48b49ea167fe3c6e8e
parentc58c0ba0bdf470233a35bb105abf7e3ad9e927f1 (diff)
downloadsamba-fea4a3111be2550550194dfa56272feb5688407b.tar.gz
samba-fea4a3111be2550550194dfa56272feb5688407b.tar.bz2
samba-fea4a3111be2550550194dfa56272feb5688407b.zip
s3-spoolss: Use tmp_ctx in winreg_enum_printer_key_internal.
-rw-r--r--source3/rpc_server/spoolss/srv_spoolss_util.c27
1 files changed, 20 insertions, 7 deletions
diff --git a/source3/rpc_server/spoolss/srv_spoolss_util.c b/source3/rpc_server/spoolss/srv_spoolss_util.c
index 9130e7fcc3..8f346a9eef 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_util.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_util.c
@@ -731,13 +731,26 @@ WERROR winreg_enum_printer_key_internal(TALLOC_CTX *mem_ctx,
{
WERROR result;
struct dcerpc_binding_handle *b;
+ TALLOC_CTX *tmp_ctx;
- result = winreg_printer_binding_handle(mem_ctx, session_info, msg_ctx, &b);
- W_ERROR_NOT_OK_RETURN(result);
+ tmp_ctx = talloc_stackframe();
+ if (tmp_ctx == NULL) {
+ return WERR_NOMEM;
+ }
- return winreg_enum_printer_key(mem_ctx, b,
- printer,
- key,
- pnum_subkeys,
- psubkeys);
+ result = winreg_printer_binding_handle(tmp_ctx, session_info, msg_ctx, &b);
+ if (!W_ERROR_IS_OK(result)) {
+ talloc_free(tmp_ctx);
+ return result;
+ }
+
+ result = winreg_enum_printer_key(mem_ctx,
+ b,
+ printer,
+ key,
+ pnum_subkeys,
+ psubkeys);
+
+ talloc_free(tmp_ctx);
+ return result;
}