summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-08 09:37:43 +0200
committerVolker Lendecke <vl@samba.org>2010-08-08 16:03:16 +0200
commit9751d7613b3db543a2cdb515c597d9600531dd76 (patch)
tree5ab2b1e3f6ee8899655136aa42dfc6ec33f450af
parentd7f8a6f82d56d7d46a0bcf8ed833ad09b9d00f26 (diff)
downloadsamba-9751d7613b3db543a2cdb515c597d9600531dd76.tar.gz
samba-9751d7613b3db543a2cdb515c597d9600531dd76.tar.bz2
samba-9751d7613b3db543a2cdb515c597d9600531dd76.zip
s3: Lift the smbd_messaging_context from winreg_update_printer
-rw-r--r--source3/printing/nt_printing_ads.c1
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c3
-rw-r--r--source3/rpc_server/srv_spoolss_util.c4
-rw-r--r--source3/rpc_server/srv_spoolss_util.h1
4 files changed, 8 insertions, 1 deletions
diff --git a/source3/printing/nt_printing_ads.c b/source3/printing/nt_printing_ads.c
index fff5051308..66d66a30a1 100644
--- a/source3/printing/nt_printing_ads.c
+++ b/source3/printing/nt_printing_ads.c
@@ -264,6 +264,7 @@ WERROR nt_printer_publish(TALLOC_CTX *mem_ctx,
sinfo2->attributes = pinfo2->attributes;
win_rc = winreg_update_printer(mem_ctx, server_info,
+ smbd_messaging_context(),
pinfo2->sharename, info2_mask,
sinfo2, NULL, NULL);
if (!W_ERROR_IS_OK(win_rc)) {
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 545dae2c37..4d3d7565af 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -6002,6 +6002,7 @@ static WERROR update_printer(struct pipes_struct *p,
}
result = winreg_update_printer(tmp_ctx,
p->server_info,
+ p->msg_ctx,
printer->sharename,
printer_mask,
printer,
@@ -6085,6 +6086,7 @@ static WERROR update_printer_devmode(struct pipes_struct *p,
return winreg_update_printer(p->mem_ctx,
p->server_info,
+ p->msg_ctx,
lp_const_servicename(snum),
info2_mask,
NULL,
@@ -7314,6 +7316,7 @@ static WERROR spoolss_addprinterex_level_2(struct pipes_struct *p,
err = winreg_update_printer(p->mem_ctx,
p->server_info,
+ p->msg_ctx,
info2->sharename,
info2_mask,
info2,
diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c
index c96c19b1be..2f28f36118 100644
--- a/source3/rpc_server/srv_spoolss_util.c
+++ b/source3/rpc_server/srv_spoolss_util.c
@@ -1603,6 +1603,7 @@ WERROR winreg_create_printer(TALLOC_CTX *mem_ctx,
result = winreg_update_printer(tmp_ctx,
server_info,
+ msg_ctx,
sharename,
info2_mask,
info2,
@@ -1625,6 +1626,7 @@ done:
WERROR winreg_update_printer(TALLOC_CTX *mem_ctx,
struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
const char *sharename,
uint32_t info2_mask,
struct spoolss_SetPrinterInfo2 *info2,
@@ -1657,7 +1659,7 @@ WERROR winreg_update_printer(TALLOC_CTX *mem_ctx,
result = winreg_printer_openkey(tmp_ctx,
server_info,
- smbd_messaging_context(),
+ msg_ctx,
&winreg_pipe,
path,
"",
diff --git a/source3/rpc_server/srv_spoolss_util.h b/source3/rpc_server/srv_spoolss_util.h
index e3165a07fa..6468b8b2d0 100644
--- a/source3/rpc_server/srv_spoolss_util.h
+++ b/source3/rpc_server/srv_spoolss_util.h
@@ -101,6 +101,7 @@ WERROR winreg_create_printer(TALLOC_CTX *mem_ctx,
*/
WERROR winreg_update_printer(TALLOC_CTX *mem_ctx,
struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
const char *sharename,
uint32_t info2_mask,
struct spoolss_SetPrinterInfo2 *info2,