diff options
| author | Günther Deschner <gd@samba.org> | 2010-09-29 04:51:56 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-09-30 02:59:35 +0200 |
| commit | 3797d48b76fadb988c40d056751be8671c9e6906 (patch) | |
| tree | 06555231fd8974ba189c57c2f4f1c657e140ef47 /source3/printing | |
| parent | 156ab4ec104adf20257b2ef1e361382eac457ee3 (diff) | |
| download | samba-3797d48b76fadb988c40d056751be8671c9e6906.tar.gz samba-3797d48b76fadb988c40d056751be8671c9e6906.tar.bz2 samba-3797d48b76fadb988c40d056751be8671c9e6906.zip | |
s3-spoolss: Fix servername/printername handling which turns out to be very important to get right.
Guenther
Diffstat (limited to 'source3/printing')
| -rw-r--r-- | source3/printing/nt_printing.c | 4 | ||||
| -rw-r--r-- | source3/printing/nt_printing_ads.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index a8c30a1f27..b12d2b9f56 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -1577,7 +1577,7 @@ bool printer_driver_in_use(TALLOC_CTX *mem_ctx, } result = winreg_get_printer(mem_ctx, server_info, msg_ctx, - NULL, lp_servicename(snum), + lp_servicename(snum), &pinfo2); if (!W_ERROR_IS_OK(result)) { continue; /* skip */ @@ -2178,7 +2178,7 @@ bool print_time_access_check(const struct auth_serversupplied_info *server_info, uint32 mins; result = winreg_get_printer(NULL, server_info, msg_ctx, - NULL, servicename, &pinfo2); + servicename, &pinfo2); if (!W_ERROR_IS_OK(result)) { return False; } diff --git a/source3/printing/nt_printing_ads.c b/source3/printing/nt_printing_ads.c index 56086c9e89..3ccaeef014 100644 --- a/source3/printing/nt_printing_ads.c +++ b/source3/printing/nt_printing_ads.c @@ -362,7 +362,7 @@ WERROR check_published_printers(struct messaging_context *msg_ctx) } result = winreg_get_printer(tmp_ctx, server_info, msg_ctx, - NULL, lp_servicename(snum), + lp_servicename(snum), &pinfo2); if (!W_ERROR_IS_OK(result)) { continue; @@ -386,7 +386,7 @@ done: bool is_printer_published(TALLOC_CTX *mem_ctx, const struct auth_serversupplied_info *server_info, struct messaging_context *msg_ctx, - char *servername, char *printer, struct GUID *guid, + const char *servername, char *printer, struct GUID *guid, struct spoolss_PrinterInfo2 **info2) { struct spoolss_PrinterInfo2 *pinfo2 = NULL; @@ -397,7 +397,7 @@ bool is_printer_published(TALLOC_CTX *mem_ctx, NTSTATUS status; result = winreg_get_printer(mem_ctx, server_info, msg_ctx, - servername, printer, &pinfo2); + printer, &pinfo2); if (!W_ERROR_IS_OK(result)) { return false; } |