From 1e87fb407f4f2c1dac208f8c29baea47e937a9dd Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Tue, 3 Feb 2015 19:26:42 +0100 Subject: [PATCH] printing/cups: pack requested-attributes with IPP_TAG_KEYWORD The CUPS IPP_GET_JOBS requested-attributes array indicates which job attributes the caller would like in the cupsd response. Until now, Samba has packed these attributes with a IPP_TAG_NAME format tag. In recent versions of CUPS, this results in the IPP_GET_JOBS response only including the job-id and job-printer-uri fields, even with JobPrivateValues=none configured. Bug: https://bugzilla.samba.org/show_bug.cgi?id=10808 Signed-off-by: David Disseldorp Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Tue Feb 10 01:38:58 CET 2015 on sn-devel-104 (cherry picked from commit 2f4998113e539ea4ba6fb0a72ba6ac25c9d74bd6) --- source3/printing/print_cups.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c index 0ec71ab..b67464a 100644 --- a/source3/printing/print_cups.c +++ b/source3/printing/print_cups.c @@ -1156,7 +1156,7 @@ static int cups_queue_get(const char *sharename, ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "attributes-natural-language", NULL, language->language); - ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_NAME, + ippAddStrings(request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD, "requested-attributes", (sizeof(jattrs) / sizeof(jattrs[0])), NULL, jattrs); -- 2.1.4