summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2011-07-25 21:31:32 +0200
committerAndreas Schneider <asn@samba.org>2011-07-27 08:50:00 +0200
commitff6294ef0f5dc9ba6d2b989377d825f0be01b509 (patch)
tree60b35bd17f73b8e121119b20fc94f4a2b5711898
parent72ac68e7467f9a28389f9487b93096bb2e7c1622 (diff)
downloadsamba-ff6294ef0f5dc9ba6d2b989377d825f0be01b509.tar.gz
samba-ff6294ef0f5dc9ba6d2b989377d825f0be01b509.tar.bz2
samba-ff6294ef0f5dc9ba6d2b989377d825f0be01b509.zip
s3-spoolss: Use tmp_ctx in winreg_del_driver_internal.
-rw-r--r--source3/rpc_server/spoolss/srv_spoolss_util.c23
1 files changed, 18 insertions, 5 deletions
diff --git a/source3/rpc_server/spoolss/srv_spoolss_util.c b/source3/rpc_server/spoolss/srv_spoolss_util.c
index a6a922e214..ecfbde6b22 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_util.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_util.c
@@ -461,13 +461,26 @@ WERROR winreg_del_driver_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_del_driver(mem_ctx, b,
- info8,
- version);
+ 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_del_driver(mem_ctx,
+ b,
+ info8,
+ version);
+
+ talloc_free(tmp_ctx);
+ return result;
}
WERROR winreg_add_driver_internal(TALLOC_CTX *mem_ctx,