The Samba-Bugzilla – Attachment 13620 Details for
Bug 12993
AD published printers are pruned from directory
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for master
0001-s3-spoolss-Fix-GUID-string-format-on-GetPrinter-info.patch (text/plain), 1.93 KB, created by
Samuel Cabrero
on 2017-09-21 13:35:35 UTC
(
hide
)
Description:
Patch for master
Filename:
MIME Type:
Creator:
Samuel Cabrero
Created:
2017-09-21 13:35:35 UTC
Size:
1.93 KB
patch
obsolete
>From 41590038643649f50f4a46dee427b9790e3b6c70 Mon Sep 17 00:00:00 2001 >From: Samuel Cabrero <scabrero@suse.de> >Date: Thu, 21 Sep 2017 09:53:35 +0200 >Subject: [PATCH] s3: spoolss: Fix GUID string format on GetPrinter info > >Fix regression introduced by commit a4157e7c5d75 which removed the braces >around the printer GUID in the printer info level 7 structure. > >MS-RPRN section 2.2 says this protocol uses curly-braced GUIDs so printers >are deleted from the directory by the domain controller's pruning service. > >Signed-off-by: Samuel Cabrero <scabrero@suse.de> >--- > source3/rpc_server/spoolss/srv_spoolss_nt.c | 16 +++++++++++++--- > 1 file changed, 13 insertions(+), 3 deletions(-) > >diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c b/source3/rpc_server/spoolss/srv_spoolss_nt.c >index 06f704de371..a9e778ee023 100644 >--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c >+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c >@@ -4263,7 +4263,7 @@ static WERROR construct_printer_info7(TALLOC_CTX *mem_ctx, > if (is_printer_published(tmp_ctx, session_info, msg_ctx, > servername, printer, &pinfo2)) { > struct GUID guid; >- struct GUID_txt_buf guid_txt; >+ char *guidstr; > werr = nt_printer_guid_get(tmp_ctx, session_info, msg_ctx, > printer, &guid); > if (!W_ERROR_IS_OK(werr)) { >@@ -4310,9 +4310,19 @@ static WERROR construct_printer_info7(TALLOC_CTX *mem_ctx, > printer)); > } > } >- r->guid = talloc_strdup_upper(mem_ctx, >- GUID_buf_string(&guid, &guid_txt)); >+ >+ /* [MS-RPRN] section 2.2: must use curly-braced GUIDs */ >+ guidstr = GUID_string2(mem_ctx, &guid); >+ if (guidstr == NULL) { >+ werr = WERR_NOT_ENOUGH_MEMORY; >+ goto out_tmp_free; >+ } >+ /* Convert GUID string to uppercase otherwise printers >+ * are pruned */ >+ r->guid = talloc_strdup_upper(mem_ctx, guidstr); > r->action = DSPRINT_PUBLISH; >+ >+ TALLOC_FREE(guidstr); > } else { > r->guid = talloc_strdup(mem_ctx, ""); > r->action = DSPRINT_UNPUBLISH; >-- >2.14.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 12993
:
13509
| 13620 |
13661
|
13662
|
13663
|
13664