diff options
| author | Volker Lendecke <vl@samba.org> | 2010-08-08 10:23:49 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-08-08 16:03:17 +0200 |
| commit | 9346df6289b17c4c4e53e77922788ec8fcc071df (patch) | |
| tree | 221f283e1d9e73ff080ba83474f71d29efdfb0af | |
| parent | cb8f700855eb0867aad38c3b653c00e416cdd870 (diff) | |
| download | samba-9346df6289b17c4c4e53e77922788ec8fcc071df.tar.gz samba-9346df6289b17c4c4e53e77922788ec8fcc071df.tar.bz2 samba-9346df6289b17c4c4e53e77922788ec8fcc071df.zip | |
s3: Lift the smbd_messaging_context from winreg_enum_printer_dataex
| -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 |
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 deabecb0f2..1d7bb16df4 100644 --- a/source3/rpc_server/srv_spoolss_nt.c +++ b/source3/rpc_server/srv_spoolss_nt.c @@ -9006,6 +9006,7 @@ WERROR _spoolss_EnumPrinterDataEx(struct pipes_struct *p, /* now look for a match on the key name */ result = winreg_enum_printer_dataex(p->mem_ctx, p->server_info, + p->msg_ctx, lp_const_servicename(snum), r->in.key_name, &count, diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c index 76f0d7826d..38dd125b05 100644 --- a/source3/rpc_server/srv_spoolss_util.c +++ b/source3/rpc_server/srv_spoolss_util.c @@ -2752,6 +2752,7 @@ done: /* Enumerate on the values of a given key and provide the data. */ WERROR winreg_enum_printer_dataex(TALLOC_CTX *mem_ctx, struct auth_serversupplied_info *server_info, + struct messaging_context *msg_ctx, const char *printer, const char *key, uint32_t *pnum_values, @@ -2781,7 +2782,7 @@ WERROR winreg_enum_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 76ef6bd64b..71c6f3c70c 100644 --- a/source3/rpc_server/srv_spoolss_util.h +++ b/source3/rpc_server/srv_spoolss_util.h @@ -262,6 +262,7 @@ WERROR winreg_get_printer_dataex(TALLOC_CTX *mem_ctx, */ WERROR winreg_enum_printer_dataex(TALLOC_CTX *mem_ctx, struct auth_serversupplied_info *server_info, + struct messaging_context *msg_ctx, const char *printer, const char *key, uint32_t *pnum_values, |