Changeset 429 for trunk/server/source3/printing

Timestamp:

Apr 9, 2010, 3:51:41 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5.x: trunk update to 3.5.2

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/printing/nt_printing.c (modified) (1 diff)
• source3/printing/print_cups.c (modified) (3 diffs)

trunk/server/source3/printing/nt_printing.c

@@ -5718 +5718 @@
         /* see if we need to try the printer admin list */
 
-        if ((access_granted == 0) &&
+        if (!NT_STATUS_IS_OK(status) &&
             (token_contains_name_in_list(uidtoname(server_info->utok.uid),
                                          NULL, NULL, server_info->ptok,

trunk/server/source3/printing/print_cups.c

@@ -906 +906 @@
         ipp_t           *request = NULL,        /* IPP Request */
                         *response = NULL;       /* IPP Response */
+        ipp_attribute_t *attr_job_id = NULL;    /* IPP Attribute "job-id" */
         cups_lang_t     *language = NULL;       /* Default language */
         char            uri[HTTP_MAX_URI]; /* printer-uri attribute */
@@ -920 +921 @@
         char addr[INET6_ADDRSTRLEN];
 
-        DEBUG(5,("cups_job_submit(%d, %p (%d))\n", snum, pjob, pjob->sysjob));
+        DEBUG(5,("cups_job_submit(%d, %p)\n", snum, pjob));
 
        /*
@@ -1027 +1028 @@
                 } else {
                         ret = 0;
+                        attr_job_id = ippFindAttribute(response, "job-id", IPP_TAG_INTEGER);
+                        if(attr_job_id) {
+                                pjob->sysjob = attr_job_id->values[0].integer;
+                                DEBUG(5,("cups_job_submit: job-id %d\n", pjob->sysjob));
+                        } else {
+                                DEBUG(0,("Missing job-id attribute in IPP response"));
+                        }
                 }
         } else {