summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-08-08 10:14:31 +0200
committerVolker Lendecke <vl@samba.org>2010-08-08 16:03:16 +0200
commit7471ecb27f1bcec6f75b58bd34d4c42fd9434f14 (patch)
treebe6acf991d0246147b98fd9f5fb808c71e3f2a0c
parent4fb993f61346b783e100839879211825b5568336 (diff)
downloadsamba-7471ecb27f1bcec6f75b58bd34d4c42fd9434f14.tar.gz
samba-7471ecb27f1bcec6f75b58bd34d4c42fd9434f14.tar.bz2
samba-7471ecb27f1bcec6f75b58bd34d4c42fd9434f14.zip
s3: Lift the smbd_messaging_context from winreg_set_printer_secdesc
-rw-r--r--source3/rpc_server/srv_spoolss_nt.c1
-rw-r--r--source3/rpc_server/srv_spoolss_util.c6
-rw-r--r--source3/rpc_server/srv_spoolss_util.h1
3 files changed, 6 insertions, 2 deletions
diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c
index 1c9b25cd7e..efd607c75a 100644
--- a/source3/rpc_server/srv_spoolss_nt.c
+++ b/source3/rpc_server/srv_spoolss_nt.c
@@ -5458,6 +5458,7 @@ static WERROR update_printer_sec(struct policy_handle *handle,
result = winreg_set_printer_secdesc(p->mem_ctx,
p->server_info,
+ p->msg_ctx,
printer,
new_secdesc);
diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c
index b8716c9e04..a54cf1d424 100644
--- a/source3/rpc_server/srv_spoolss_util.c
+++ b/source3/rpc_server/srv_spoolss_util.c
@@ -1869,6 +1869,7 @@ WERROR winreg_update_printer(TALLOC_CTX *mem_ctx,
}
result = winreg_set_printer_secdesc(tmp_ctx,
server_info,
+ msg_ctx,
sharename,
secdesc);
if (!W_ERROR_IS_OK(result)) {
@@ -2412,6 +2413,7 @@ done:
WERROR winreg_set_printer_secdesc(TALLOC_CTX *mem_ctx,
struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
const char *sharename,
const struct spoolss_security_descriptor *secdesc)
{
@@ -2450,7 +2452,7 @@ WERROR winreg_set_printer_secdesc(TALLOC_CTX *mem_ctx,
result = winreg_get_printer_secdesc(tmp_ctx,
server_info,
- smbd_messaging_context(),
+ msg_ctx,
sharename,
&old_secdesc);
if (!W_ERROR_IS_OK(result)) {
@@ -2495,7 +2497,7 @@ WERROR winreg_set_printer_secdesc(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 dd50884db4..bad48fca32 100644
--- a/source3/rpc_server/srv_spoolss_util.h
+++ b/source3/rpc_server/srv_spoolss_util.h
@@ -168,6 +168,7 @@ WERROR winreg_get_printer_secdesc(TALLOC_CTX *mem_ctx,
*/
WERROR winreg_set_printer_secdesc(TALLOC_CTX *mem_ctx,
struct auth_serversupplied_info *server_info,
+ struct messaging_context *msg_ctx,
const char *sharename,
const struct spoolss_security_descriptor *secdesc);