[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  2f49981 printing/cups: pack requested-attributes with IPP_TAG_KEYWORD
       via  600b40d gencache: don't fail gencache_stabilize if there were records to delete.
      from  4143cba nfs4: Fix a confusing debug message

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 2f4998113e539ea4ba6fb0a72ba6ac25c9d74bd6
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

commit 600b40db9d95c20c04fd517165dff81b20e35e8e
Author: Michael Adam <obnox at samba.org>
Date:   Wed Feb 4 14:47:20 2015 +0100

    gencache: don't fail gencache_stabilize if there were records to delete.
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 source3/lib/gencache.c        | 2 +-
 source3/printing/print_cups.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/gencache.c b/source3/lib/gencache.c
index baedf85..d9cc081 100644
--- a/source3/lib/gencache.c
+++ b/source3/lib/gencache.c
@@ -691,7 +691,7 @@ bool gencache_stabilize(void)
 	}
 
 	res = tdb_traverse(cache_notrans->tdb, wipe_fn, NULL);
-	if (res != 0) {
+	if (res < 0) {
 		DEBUG(10, ("tdb_traverse with wipe_fn on gencache_notrans.tdb "
 			  "failed: %s\n",
 			   tdb_errorstr_compat(cache_notrans->tdb)));
diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c
index 68f367c..561e07d 100644
--- a/source3/printing/print_cups.c
+++ b/source3/printing/print_cups.c
@@ -1157,7 +1157,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