diff options
| author | Volker Lendecke <vl@samba.org> | 2010-08-08 10:22:11 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-08-08 16:03:17 +0200 |
| commit | cb8f700855eb0867aad38c3b653c00e416cdd870 (patch) | |
| tree | 3ffb33bd632f54a4e9963e762c55e5a63999f6a0 /source3 | |
| parent | e4cd34926f3d8c8f0c567467de39d47cf4b816f7 (diff) | |
| download | samba-cb8f700855eb0867aad38c3b653c00e416cdd870.tar.gz samba-cb8f700855eb0867aad38c3b653c00e416cdd870.tar.bz2 samba-cb8f700855eb0867aad38c3b653c00e416cdd870.zip | |
s3: Lift the smbd_messaging_context from winreg_get_printer_dataex
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/printing/nt_printing_ads.c | 3 | ||||
| -rw-r--r-- | source3/rpc_server/srv_spoolss_nt.c | 1 | ||||
| -rw-r--r-- | source3/rpc_server/srv_spoolss_util.c | 3 | ||||
| -rw-r--r-- | source3/rpc_server/srv_spoolss_util.h | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/source3/printing/nt_printing_ads.c b/source3/printing/nt_printing_ads.c index 595da7fee1..316cf6c24a 100644 --- a/source3/printing/nt_printing_ads.c +++ b/source3/printing/nt_printing_ads.c @@ -408,7 +408,8 @@ bool is_printer_published(TALLOC_CTX *mem_ctx, /* fetching printer guids really ought to be a separate function. */ - result = winreg_get_printer_dataex(mem_ctx, server_info, printer, + result = winreg_get_printer_dataex(mem_ctx, server_info, + smbd_messaging_context(), printer, SPOOL_DSSPOOLER_KEY, "objectGUID", &type, &data, &data_size); 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 f58561dd1a..deabecb0f2 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -8661,6 +8661,7 @@ WERROR _spoolss_GetPrinterDataEx(struct pipes_struct *p, result = winreg_get_printer_dataex(p->mem_ctx, p->server_info, + p->msg_ctx, printer, r->in.key_name, r->in.value_name, diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c index 9f6ea90ca6..76f0d7826d 100644 --- a/source3/rpc_server/srv_spoolss_util.c +++ b/source3/rpc_server/srv_spoolss_util.c @@ -2626,6 +2626,7 @@ done: /* Get printer data over a winreg pipe. */ WERROR winreg_get_printer_dataex(TALLOC_CTX *mem_ctx, struct auth_serversupplied_info *server_info, + struct messaging_context *msg_ctx, const char *printer, const char *key, const char *value, @@ -2662,7 +2663,7 @@ WERROR winreg_get_printer_dataex(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 084f415b81..76ef6bd64b 100644 --- a/source3/rpc_server/srv_spoolss_util.h +++ b/source3/rpc_server/srv_spoolss_util.h @@ -232,6 +232,7 @@ WERROR winreg_set_printer_dataex(TALLOC_CTX *mem_ctx, */ WERROR winreg_get_printer_dataex(TALLOC_CTX *mem_ctx, struct auth_serversupplied_info *server_info, + struct messaging_context *msg_ctx, const char *printer, const char *key, const char *value, |