summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2011-07-25 21:09:17 +0200
committerAndreas Schneider <asn@samba.org>2011-07-27 08:49:59 +0200
commit2b0adab76ea6dc366ed1672f98a035a0e1c9e088 (patch)
treecd4c1a64f51634ac05504dbd13e36637587c91fa /source3
parent34dc5a57f942a9e24e7b5ed7886f9f78c932ff0d (diff)
downloadsamba-2b0adab76ea6dc366ed1672f98a035a0e1c9e088.tar.gz
samba-2b0adab76ea6dc366ed1672f98a035a0e1c9e088.tar.bz2
samba-2b0adab76ea6dc366ed1672f98a035a0e1c9e088.zip
s3-spoolss: Use tmp_ctx in winreg_update_printer_internal.
Diffstat (limited to 'source3')
-rw-r--r--source3/rpc_server/spoolss/srv_spoolss_util.c29
1 files changed, 21 insertions, 8 deletions
diff --git a/source3/rpc_server/spoolss/srv_spoolss_util.c b/source3/rpc_server/spoolss/srv_spoolss_util.c
index d6c3b46c76..3a14039be5 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_util.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_util.c
@@ -218,16 +218,29 @@ WERROR winreg_update_printer_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_update_printer(mem_ctx, b,
- sharename,
- info2_mask,
- info2,
- devmode,
- secdesc);
+ 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_update_printer(mem_ctx,
+ b,
+ sharename,
+ info2_mask,
+ info2,
+ devmode,
+ secdesc);
+
+ talloc_free(tmp_ctx);
+ return result;
}
WERROR winreg_set_printer_dataex_internal(TALLOC_CTX *mem_ctx,