summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2011-07-25 21:11:50 +0200
committerAndreas Schneider <asn@samba.org>2011-07-27 08:49:59 +0200
commit7aef2f63085557d473a26bb52efb9896a2c885a9 (patch)
treebd5aea512bedd48ab117db54a04be50d1b0ba62e
parent311d6dbeb7f6bd72ba26020d39d2ddb04f15546d (diff)
downloadsamba-7aef2f63085557d473a26bb52efb9896a2c885a9.tar.gz
samba-7aef2f63085557d473a26bb52efb9896a2c885a9.tar.bz2
samba-7aef2f63085557d473a26bb52efb9896a2c885a9.zip
s3-spoolss: Use tmp_ctx in winreg_enum_printer_dataex_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 d924078c6c..ea46df2fc4 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_util.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_util.c
@@ -291,15 +291,28 @@ WERROR winreg_enum_printer_dataex_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;
+ }
+
+ result = winreg_printer_binding_handle(tmp_ctx, session_info, msg_ctx, &b);
+ if (!W_ERROR_IS_OK(result)) {
+ talloc_free(tmp_ctx);
+ return result;
+ }
- return winreg_enum_printer_dataex(mem_ctx, b,
- printer,
- key,
- pnum_values,
- penum_values);
+ result = winreg_enum_printer_dataex(mem_ctx,
+ b,
+ printer,
+ key,
+ pnum_values,
+ penum_values);
+
+ talloc_free(tmp_ctx);
+ return result;
}
WERROR winreg_get_printer_dataex_internal(TALLOC_CTX *mem_ctx,