summaryrefslogtreecommitdiff
path: root/source3/rpc_server
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-08 10:27:40 +0200
committerVolker Lendecke <vl@samba.org>2010-08-08 16:03:17 +0200
commit3ccdbc4119ca50b4a745b820f05f0a0f0965e827 (patch)
treea9a8e36b99fa96741bf07ed3204ca723b2fd8849 /source3/rpc_server
parent30d64d2f92a0edd8c62ed0b0fb14ff695b808714 (diff)
downloadsamba-3ccdbc4119ca50b4a745b820f05f0a0f0965e827.tar.gz
samba-3ccdbc4119ca50b4a745b820f05f0a0f0965e827.tar.bz2
samba-3ccdbc4119ca50b4a745b820f05f0a0f0965e827.zip
s3: Lift the smbd_messaging_context from winreg_enum_printer_key
Diffstat (limited to 'source3/rpc_server')
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c1
-rw-r--r--source3/rpc_server/srv_spoolss_util.c3
-rw-r--r--source3/rpc_server/srv_spoolss_util.h1
3 files changed, 4 insertions, 1 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index c8c472f350..31dca0458a 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -8879,6 +8879,7 @@ WERROR _spoolss_EnumPrinterKey(struct pipes_struct *p,
result = winreg_enum_printer_key(p->mem_ctx,
p->server_info,
+ p->msg_ctx,
lp_const_servicename(snum),
r->in.key_name,
&num_keys,
diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c
index 61ce6bf6c5..22c6ad0d5f 100644
--- a/source3/rpc_server/srv_spoolss_util.c
+++ b/source3/rpc_server/srv_spoolss_util.c
@@ -2909,6 +2909,7 @@ done:
/* Enumerate on the subkeys of a given key and provide the data. */
WERROR winreg_enum_printer_key(TALLOC_CTX *mem_ctx,
struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
const char *printer,
const char *key,
uint32_t *pnum_subkeys,
@@ -2941,7 +2942,7 @@ WERROR winreg_enum_printer_key(TALLOC_CTX *mem_ctx,
result = winreg_printer_openkey(tmp_ctx,
server_info,
- smbd_messaging_context(),
+ msg_ctx,
&winreg_pipe,
path,
key,
diff --git a/source3/rpc_server/srv_spoolss_util.h b/source3/rpc_server/srv_spoolss_util.h
index 6724e24178..e2abf00486 100644
--- a/source3/rpc_server/srv_spoolss_util.h
+++ b/source3/rpc_server/srv_spoolss_util.h
@@ -316,6 +316,7 @@ WERROR winreg_delete_printer_dataex(TALLOC_CTX *mem_ctx,
*/
WERROR winreg_enum_printer_key(TALLOC_CTX *mem_ctx,
struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
const char *printer,
const char *key,
uint32_t *pnum_subkeys,