[SCM] Samba Shared Repository - branch v4-2-test updated

Karolin Seeger kseeger at samba.org
Wed Feb 11 15:31:07 MST 2015


The branch, v4-2-test has been updated
       via  9cfaed4 printing/cups: pack requested-attributes with IPP_TAG_KEYWORD
      from  26f58b7 s3:smb2_server: protect against integer wrap with "smb2 max credits = 65535"

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-2-test


- Log -----------------------------------------------------------------
commit 9cfaed439880376dc9d6f0368fe1b682e07a06d4
Author: David Disseldorp <ddiss at samba.org>
Date:   Tue Feb 3 19:26:42 2015 +0100

    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 <ddiss at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Tue Feb 10 01:38:58 CET 2015 on sn-devel-104
    
    (cherry picked from commit 2f4998113e539ea4ba6fb0a72ba6ac25c9d74bd6)
    
    Autobuild-User(v4-2-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-2-test): Wed Feb 11 23:30:21 CET 2015 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/printing/print_cups.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

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);


-- 
Samba Shared Repository


More information about the samba-cvs mailing list