summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2011-07-25 21:13:46 +0200
committerAndreas Schneider <asn@samba.org>2011-07-27 08:49:59 +0200
commit106829545c1d4a687c5c45e51d7d38a04fa4b0d4 (patch)
treef35b8910c671dbc821f31a3bd6990799f872734b
parente6e80ea137c5d3c936803303c7527d2ae075de0d (diff)
downloadsamba-106829545c1d4a687c5c45e51d7d38a04fa4b0d4.tar.gz
s3-spoolss: Use tmp_ctx in winreg_delete_printer_dataex_internal.
-rw-r--r--source3/rpc_server/spoolss/srv_spoolss_util.c25
1 files changed, 19 insertions, 6 deletions
diff --git a/source3/rpc_server/spoolss/srv_spoolss_util.c b/source3/rpc_server/spoolss/srv_spoolss_util.c
index 1c6dcc5e30e..d536a391054 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_util.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_util.c
@@ -362,14 +362,27 @@ WERROR winreg_delete_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;
+ }
- return winreg_delete_printer_dataex(mem_ctx, b,
- printer,
- key,
- value);
+ 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_delete_printer_dataex(mem_ctx,
+ b,
+ printer,
+ key,
+ value);
+
+ talloc_free(tmp_ctx);
+ return result;
}
WERROR winreg_get_driver_internal(TALLOC_CTX *mem_ctx,