diff options
| author | Volker Lendecke <vl@samba.org> | 2010-08-08 14:31:14 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-08-08 16:03:25 +0200 |
| commit | e43ffde91f6781c135d4125b91911e79c06a7409 (patch) | |
| tree | 59828ee8560e2d5136e6c1c67d54c8a53cc48470 | |
| parent | 39ce462043d32e94b71a98001a43a95360017528 (diff) | |
| download | samba-e43ffde91f6781c135d4125b91911e79c06a7409.tar.gz samba-e43ffde91f6781c135d4125b91911e79c06a7409.tar.bz2 samba-e43ffde91f6781c135d4125b91911e79c06a7409.zip | |
s3: Lift the smbd_messaging_context from nt_printer_remove
| -rw-r--r-- | source3/include/nt_printing.h | 1 | ||||
| -rw-r--r-- | source3/printing/nt_printing.c | 4 | ||||
| -rw-r--r-- | source3/smbd/server_reload.c | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h index e7e2536ce6..c98085b421 100644 --- a/source3/include/nt_printing.h +++ b/source3/include/nt_printing.h @@ -285,6 +285,7 @@ bool print_time_access_check(struct auth_serversupplied_info *server_info, void nt_printer_remove(TALLOC_CTX *mem_ctx, struct auth_serversupplied_info *server_info, + struct messaging_context *msg_ctx, const char *printer); #endif /* NT_PRINTING_H_ */ diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index 4afddd31c2..c44a0ec2c7 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -2205,12 +2205,12 @@ bool print_time_access_check(struct auth_serversupplied_info *server_info, void nt_printer_remove(TALLOC_CTX *mem_ctx, struct auth_serversupplied_info *server_info, + struct messaging_context *msg_ctx, const char *printer) { WERROR result; - result = winreg_delete_printer_key(mem_ctx, server_info, - smbd_messaging_context(), + result = winreg_delete_printer_key(mem_ctx, server_info, msg_ctx, printer, ""); if (!W_ERROR_IS_OK(result)) { DEBUG(0, ("nt_printer_remove: failed to remove rpinter %s", diff --git a/source3/smbd/server_reload.c b/source3/smbd/server_reload.c index a4646462b0..601f83fb15 100644 --- a/source3/smbd/server_reload.c +++ b/source3/smbd/server_reload.c @@ -70,7 +70,8 @@ void reload_printers(void) DSPRINT_UNPUBLISH); TALLOC_FREE(pinfo2); } - nt_printer_remove(server_info, server_info, pname); + nt_printer_remove(server_info, server_info, + smbd_messaging_context(), pname); lp_killservice(snum); } } |