diff options
| author | Volker Lendecke <vl@samba.org> | 2010-08-08 10:11:00 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-08-08 16:03:16 +0200 |
| commit | 4fb993f61346b783e100839879211825b5568336 (patch) | |
| tree | 256d0c1b84a2f1efcfe70d65907f2449b0e8f109 | |
| parent | bd8a1d8a8601474e1cf7cec459d05e2fe45b28b0 (diff) | |
| download | samba-4fb993f61346b783e100839879211825b5568336.tar.gz samba-4fb993f61346b783e100839879211825b5568336.tar.bz2 samba-4fb993f61346b783e100839879211825b5568336.zip | |
s3: Lift the smbd_messaging_context from winreg_get_printer_secdesc
| -rw-r--r-- | source3/printing/nt_printing.c | 1 | ||||
| -rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 1 | ||||
| -rw-r--r-- | source3/rpc_server/srv_spoolss_util.c | 5 | ||||
| -rw-r--r-- | source3/rpc_server/srv_spoolss_util.h | 1 |
4 files changed, 7 insertions, 1 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index 3a35522e29..72a57a7df7 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -2100,6 +2100,7 @@ bool print_access_check(struct auth_serversupplied_info *server_info, int snum, result = winreg_get_printer_secdesc(mem_ctx, server_info, + smbd_messaging_context(), pname, &secdesc); if (!W_ERROR_IS_OK(result)) { diff --git a/source3/rpc_server/srv_spoolss_nt.c b/source3/rpc_server/srv_spoolss_nt.c index 36b2746cb6..1c9b25cd7e 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -5406,6 +5406,7 @@ static WERROR update_printer_sec(struct policy_handle *handle, nothing may have actually changed. */ result = winreg_get_printer_secdesc(p->mem_ctx, p->server_info, + p->msg_ctx, printer, &old_secdesc); if (!W_ERROR_IS_OK(result)) { diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c index 9f8d21f62d..b8716c9e04 100644 --- a/source3/rpc_server/srv_spoolss_util.c +++ b/source3/rpc_server/srv_spoolss_util.c @@ -2222,6 +2222,7 @@ WERROR winreg_get_printer(TALLOC_CTX *mem_ctx, result = winreg_get_printer_secdesc(info2, server_info, + msg_ctx, printer, &info2->secdesc); if (!W_ERROR_IS_OK(result)) { @@ -2254,6 +2255,7 @@ done: WERROR winreg_get_printer_secdesc(TALLOC_CTX *mem_ctx, struct auth_serversupplied_info *server_info, + struct messaging_context *msg_ctx, const char *sharename, struct spoolss_security_descriptor **psecdesc) { @@ -2283,7 +2285,7 @@ WERROR winreg_get_printer_secdesc(TALLOC_CTX *mem_ctx, result = winreg_printer_openkey(tmp_ctx, server_info, - smbd_messaging_context(), + msg_ctx, &winreg_pipe, path, "", @@ -2448,6 +2450,7 @@ WERROR winreg_set_printer_secdesc(TALLOC_CTX *mem_ctx, result = winreg_get_printer_secdesc(tmp_ctx, server_info, + smbd_messaging_context(), sharename, &old_secdesc); if (!W_ERROR_IS_OK(result)) { diff --git a/source3/rpc_server/srv_spoolss_util.h b/source3/rpc_server/srv_spoolss_util.h index fc0f0cff54..dd50884db4 100644 --- a/source3/rpc_server/srv_spoolss_util.h +++ b/source3/rpc_server/srv_spoolss_util.h @@ -148,6 +148,7 @@ WERROR winreg_get_printer(TALLOC_CTX *mem_ctx, */ WERROR winreg_get_printer_secdesc(TALLOC_CTX *mem_ctx, struct auth_serversupplied_info *server_info, + struct messaging_context *msg_ctx, const char *sharename, struct spoolss_security_descriptor **psecdesc); |