Changeset 751 for trunk/server/source3/printing

Timestamp:

Nov 29, 2012, 1:59:04 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9

Location:

trunk/server/source3/printing

Files:

• load.c (modified) (2 diffs)
• lpq_parse.c (modified) (12 diffs)
• nt_printing.c (modified) (4 diffs)
• nt_printing_migrate.c (modified) (5 diffs)
• print_cups.c (modified) (36 diffs)
• print_generic.c (modified) (4 diffs)
• print_iprint.c (modified) (34 diffs)
• printer_list.c (modified) (2 diffs)
• printing.c (modified) (70 diffs)
• printspoolss.c (modified) (3 diffs)
• tests/vlp.c (modified) (1 diff)

trunk/server/source3/printing/load.c

@@ -31 +31 @@
         char *str;
         char *saveptr;
+        char *auto_serv = NULL;
 
         if (pnum < 0)
@@ -39 +40 @@
                 return;
 
-        if ((str = SMB_STRDUP(lp_auto_services())) == NULL)
+        auto_serv = lp_auto_services();
+        str = SMB_STRDUP(auto_serv);
+        TALLOC_FREE(auto_serv);
+        if (str == NULL) {
                 return;
+        }
 
         for (p = strtok_r(str, LIST_SEP, &saveptr); p;

trunk/server/source3/printing/lpq_parse.c

@@ -165 +165 @@
         }
 
-        buf->job = atoi(tok[JOBTOK]);
+        buf->sysjob = atoi(tok[JOBTOK]);
         buf->size = atoi(tok[TOTALTOK]);
         buf->status = strequal(tok[RANKTOK],"active")?LPQ_PRINTING:LPQ_QUEUED;
@@ -282 +282 @@
         }
 
-        buf->job  = atoi(tokarr[LPRNG_JOBTOK]);
+        buf->sysjob = atoi(tokarr[LPRNG_JOBTOK]);
         buf->size = atoi(tokarr[LPRNG_TOTALTOK]);
 
@@ -385 +385 @@
                         }
 
-                        buf->job = atoi(tok[1]);
+                        buf->sysjob = atoi(tok[1]);
                         buf->status = strequal(tok[0],"HELD")?LPQ_PAUSED:LPQ_QUEUED;
                         buf->priority = 0;
@@ -421 +421 @@
                 }
 
-                buf->job = atoi(tok[3]);
+                buf->sysjob = atoi(tok[3]);
                 buf->status = strequal(tok[2],"RUNNING")?LPQ_PRINTING:LPQ_QUEUED;
                 buf->priority = 0;
@@ -512 +512 @@
                 /* fill things from header line */
                 buf->time = jobtime;
-                buf->job = jobid;
+                buf->sysjob = jobid;
                 buf->status = jobstat;
                 buf->priority = jobprio;
@@ -652 +652 @@
         }
 
-        buf->job = atoi(tok[1]);
+        buf->sysjob = atoi(tok[1]);
         buf->size = atoi(tok[3]);
         if (count > 7 && strequal(tok[7],"on")) {
@@ -727 +727 @@
         }
 
-        buf->job = atoi(tok[2]);
+        buf->sysjob = atoi(tok[2]);
         buf->size = atoi(tok[4]);
         buf->status = strequal(tok[3],"active")?LPQ_PRINTING:LPQ_QUEUED;
@@ -807 +807 @@
         }
 
-        buf->job = atoi(tok[4]);
+        buf->sysjob = atoi(tok[4]);
 
         buf->size = atoi(tok[7]);
@@ -897 +897 @@
         trim_char(parse_line->jobname, '\0', ' ');
 
-        buf->job = atoi(parse_line->jobid);
+        buf->sysjob = atoi(parse_line->jobid);
         buf->priority = 0;
         buf->size = atoi(parse_line->size);
@@ -958 +958 @@
 
         /* Get the jobid */
-        buf->job = atoi(parse_line->jobid);
+        buf->sysjob = atoi(parse_line->jobid);
 
         /* Get the job name */
@@ -1024 +1024 @@
                 switch (toknum) {
                 case 0:
-                        buf->job = atoi(tok);
+                        buf->sysjob = atoi(tok);
                         break;
                 case 1:
@@ -1153 +1153 @@
 }
 
-/****************************************************************************
- Parse a file name from the system spooler to generate a jobid.
-****************************************************************************/
-
-uint32_t print_parse_jobid(const char *fname)
-{
-        int jobid;
-        const char *p = strstr_m(fname,PRINT_SPOOL_PREFIX);
-
-        if (!p) {
-                return (uint32_t)-1;
-        }
-        p += strlen(PRINT_SPOOL_PREFIX);
-        jobid = atoi(p);
-        if (jobid <= 0) {
-                return (uint32_t)-1;
-        }
-        return (uint32_t)jobid;
-}

trunk/server/source3/printing/nt_printing.c

@@ -1494 +1494 @@
 
 static NTSTATUS driver_unlink_internals(connection_struct *conn,
-                                        const char *name)
-{
+                                        const char *short_arch,
+                                        int vers,
+                                        const char *fname)
+{
+        TALLOC_CTX *tmp_ctx = talloc_new(conn);
         struct smb_filename *smb_fname = NULL;
-        NTSTATUS status;
-
-        status = create_synthetic_smb_fname(talloc_tos(), name, NULL, NULL,
-            &smb_fname);
+        char *print_dlr_path;
+        NTSTATUS status = NT_STATUS_NO_MEMORY;
+
+        print_dlr_path = talloc_asprintf(tmp_ctx, "%s/%d/%s",
+                                         short_arch, vers, fname);
+        if (print_dlr_path == NULL) {
+                goto err_out;
+        }
+
+        status = create_synthetic_smb_fname(tmp_ctx, print_dlr_path,
+                                            NULL, NULL, &smb_fname);
         if (!NT_STATUS_IS_OK(status)) {
-                return status;
+                goto err_out;
         }
 
         status = unlink_internals(conn, NULL, 0, smb_fname, false);
-
-        TALLOC_FREE(smb_fname);
+err_out:
+        talloc_free(tmp_ctx);
         return status;
 }
@@ -1520 +1530 @@
                          const struct spoolss_DriverInfo8 *r)
 {
-        int i = 0;
-        char *s;
-        const char *file;
+        const char *short_arch;
         connection_struct *conn;
         NTSTATUS nt_status;
@@ -1573 +1581 @@
         }
 
-        /* now delete the files; must strip the '\print$' string from
-           fron of path                                                */
+        short_arch = get_short_archi(r->architecture);
+        if (short_arch == NULL) {
+                DEBUG(0, ("bad architecture %s\n", r->architecture));
+                ret = false;
+                goto err_out;
+        }
+
+        /* now delete the files */
 
         if (r->driver_path && r->driver_path[0]) {
-                if ((s = strchr(&r->driver_path[1], '\\')) != NULL) {
-                        file = s;
-                        DEBUG(10,("deleting driverfile [%s]\n", s));
-                        driver_unlink_internals(conn, file);
-                }
+                DEBUG(10,("deleting driverfile [%s]\n", r->driver_path));
+                driver_unlink_internals(conn, short_arch, r->version, r->driver_path);
         }
 
         if (r->config_file && r->config_file[0]) {
-                if ((s = strchr(&r->config_file[1], '\\')) != NULL) {
-                        file = s;
-                        DEBUG(10,("deleting configfile [%s]\n", s));
-                        driver_unlink_internals(conn, file);
-                }
+                DEBUG(10,("deleting configfile [%s]\n", r->config_file));
+                driver_unlink_internals(conn, short_arch, r->version, r->config_file);
         }
 
         if (r->data_file && r->data_file[0]) {
-                if ((s = strchr(&r->data_file[1], '\\')) != NULL) {
-                        file = s;
-                        DEBUG(10,("deleting datafile [%s]\n", s));
-                        driver_unlink_internals(conn, file);
-                }
+                DEBUG(10,("deleting datafile [%s]\n", r->data_file));
+                driver_unlink_internals(conn, short_arch, r->version, r->data_file);
         }
 
         if (r->help_file && r->help_file[0]) {
-                if ((s = strchr(&r->help_file[1], '\\')) != NULL) {
-                        file = s;
-                        DEBUG(10,("deleting helpfile [%s]\n", s));
-                        driver_unlink_internals(conn, file);
-                }
-        }
-
-        /* check if we are done removing files */
+                DEBUG(10,("deleting helpfile [%s]\n", r->help_file));
+                driver_unlink_internals(conn, short_arch, r->version, r->help_file);
+        }
 
         if (r->dependent_files) {
+                int i = 0;
                 while (r->dependent_files[i] && r->dependent_files[i][0]) {
-                        char *p;
-
-                        /* bypass the "\print$" portion of the path */
-
-                        if ((p = strchr(r->dependent_files[i]+1, '\\')) != NULL) {
-                                file = p;
-                                DEBUG(10,("deleting dependent file [%s]\n", file));
-                                driver_unlink_internals(conn, file);
-                        }
-
+                        DEBUG(10,("deleting dependent file [%s]\n", r->dependent_files[i]));
+                        driver_unlink_internals(conn, short_arch, r->version, r->dependent_files[i]);
                         i++;
                 }
@@ -1871 +1864 @@
                                            printer, "");
         if (!W_ERROR_IS_OK(result)) {
-                DEBUG(0, ("nt_printer_remove: failed to remove rpinter %s",
-                          printer));
-        }
-}
+                DEBUG(0, ("nt_printer_remove: failed to remove printer %s: "
+                          "%s\n", printer, win_errstr(result)));
+        }
+}
+
+void nt_printer_add(TALLOC_CTX *mem_ctx,
+                    const struct auth_serversupplied_info *session_info,
+                    struct messaging_context *msg_ctx,
+                    const char *printer)
+{
+        WERROR result;
+
+        result = winreg_create_printer_internal(mem_ctx, session_info, msg_ctx,
+                                                printer);
+        if (!W_ERROR_IS_OK(result)) {
+                DEBUG(0, ("nt_printer_add: failed to add printer %s: %s\n",
+                          printer, win_errstr(result)));
+        }
+}

trunk/server/source3/printing/nt_printing_migrate.c

@@ -4 +4 @@
  *
  *  Copyright (c) Andreas Schneider            2010.
+ *  Copyright (C) Bjoern Baumbach <bb@sernet.de> 2011
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -28 +29 @@
 #include "rpc_client/cli_winreg_spoolss.h"
 
+static const char *driver_file_basename(const char *file)
+{
+        const char *basefile;
+
+        basefile = strrchr(file, '\\');
+        if (basefile == NULL) {
+                basefile = file;
+        } else {
+                basefile++;
+        }
+
+        return basefile;
+}
+
 NTSTATUS printing_tdb_migrate_form(TALLOC_CTX *mem_ctx,
                                    struct rpc_pipe_client *winreg_pipe,
@@ -74 +89 @@
                                          b,
                                          &f1);
+        if (W_ERROR_EQUAL(result, WERR_FILE_EXISTS)) {
+                /* Don't migrate form if it already exists. */
+                result = WERR_OK;
+        }
         if (!W_ERROR_IS_OK(result)) {
                 return werror_to_ntstatus(result);
@@ -97 +116 @@
         const char *driver_name;
         uint32_t driver_version;
+        int i;
 
         blob = data_blob_const(data, length);
@@ -115 +135 @@
         ZERO_STRUCT(a);
 
+        /* remove paths from file names */
+        if (r.dependent_files != NULL) {
+                for (i = 0 ; r.dependent_files[i] != NULL; i++) {
+                        r.dependent_files[i] = driver_file_basename(r.dependent_files[i]);
+                }
+        }
         a.string = r.dependent_files;
+
+        r.driverpath = driver_file_basename(r.driverpath);
+        r.configfile = driver_file_basename(r.configfile);
+        r.datafile = driver_file_basename(r.datafile);
+        r.helpfile = driver_file_basename(r.helpfile);
 
         d3.architecture = r.environment;

trunk/server/source3/printing/print_cups.c

@@ -36 +36 @@
 #endif
 
+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
+#define HAVE_CUPS_1_6 1
+#endif
+
+#ifndef HAVE_CUPS_1_6
+#define ippGetGroupTag(attr)  attr->group_tag
+#define ippGetName(attr)      attr->name
+#define ippGetValueTag(attr)  attr->value_tag
+#define ippGetStatusCode(ipp) ipp->request.status.status_code
+#define ippGetInteger(attr, element) attr->values[element].integer
+#define ippGetString(attr, element, language) attr->values[element].string.text
+
+static ipp_attribute_t *
+ippFirstAttribute(ipp_t *ipp)
+{
+  if (!ipp)
+    return (NULL);
+  return (ipp->current = ipp->attrs);
+}
+
+static ipp_attribute_t *
+ippNextAttribute(ipp_t *ipp)
+{
+  if (!ipp || !ipp->current)
+    return (NULL);
+  return (ipp->current = ipp->current->next);
+}
+
+static int ippSetOperation(ipp_t *ipp, ipp_op_t op)
+{
+    ipp->request.op.operation_id = op;
+    return (1);
+}
+
+static int ippSetRequestId(ipp_t *ipp, int request_id)
+{
+    ipp->request.any.request_id = request_id;
+    return (1);
+}
+#endif
+
 static SIG_ATOMIC_T gotalarm;
 
@@ -172 +213 @@
         bool ret_ok = false;
 
-        for (attr = response->attrs; attr != NULL;) {
+        for (attr = ippFirstAttribute(response); attr != NULL;) {
                /*
                 * Skip leading attributes until we hit a printer...
                 */
 
-                while (attr != NULL && attr->group_tag != IPP_TAG_PRINTER)
-                        attr = attr->next;
+                while (attr != NULL && ippGetGroupTag(attr) != IPP_TAG_PRINTER)
+                        attr = ippNextAttribute(response);
 
                 if (attr == NULL)
@@ -190 +231 @@
                 info       = NULL;
 
-                while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER) {
+                while (attr != NULL && ippGetGroupTag(attr) == IPP_TAG_PRINTER) {
                         size_t size;
-                        if (strcmp(attr->name, "printer-name") == 0 &&
-                            attr->value_tag == IPP_TAG_NAME) {
+                        if (strcmp(ippGetName(attr), "printer-name") == 0 &&
+                            ippGetValueTag(attr) == IPP_TAG_NAME) {
                                 if (!pull_utf8_talloc(mem_ctx,
                                                 &name,
-                                                attr->values[0].string.text,
+                                                ippGetString(attr, 0, NULL),
                                                 &size)) {
                                         goto err_out;
@@ -202 +243 @@
                         }
 
-                        if (strcmp(attr->name, "printer-info") == 0 &&
-                            attr->value_tag == IPP_TAG_TEXT) {
+                        if (strcmp(ippGetName(attr), "printer-info") == 0 &&
+                            ippGetValueTag(attr) == IPP_TAG_TEXT) {
                                 if (!pull_utf8_talloc(mem_ctx,
                                                 &info,
-                                                attr->values[0].string.text,
+                                                ippGetString(attr, 0, NULL),
                                                 &size)) {
                                         goto err_out;
@@ -212 +253 @@
                         }
 
-                        if (strcmp(attr->name, "printer-location") == 0 &&
-                            attr->value_tag == IPP_TAG_TEXT) {
+                        if (strcmp(ippGetName(attr), "printer-location") == 0 &&
+                            ippGetValueTag(attr) == IPP_TAG_TEXT) {
                                 if (!pull_utf8_talloc(mem_ctx,
                                                 &location,
-                                                attr->values[0].string.text,
+                                                ippGetString(attr, 0, NULL),
                                                 &size)) {
                                         goto err_out;
@@ -222 +263 @@
                         }
 
-                        attr = attr->next;
+                        attr = ippNextAttribute(response);
                 }
 
@@ -302 +343 @@
         request = ippNew();
 
-        request->request.op.operation_id = CUPS_GET_PRINTERS;
-        request->request.op.request_id   = 1;
+        ippSetOperation(request, CUPS_GET_PRINTERS);
+        ippSetRequestId(request, 1);
 
         language = cupsLangDefault();
@@ -344 +385 @@
         request = ippNew();
 
-        request->request.op.operation_id = CUPS_GET_CLASSES;
-        request->request.op.request_id   = 1;
+        ippSetOperation(request, CUPS_GET_CLASSES);
+        ippSetRequestId(request, 1);
 
         ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
@@ -608 +649 @@
         request = ippNew();
 
-        request->request.op.operation_id = IPP_CANCEL_JOB;
-        request->request.op.request_id   = 1;
+        ippSetOperation(request, IPP_CANCEL_JOB);
+        ippSetRequestId(request, 1);
 
         language = cupsLangDefault();
@@ -635 +676 @@
 
         if ((response = cupsDoRequest(http, request, "/jobs")) != NULL) {
-                if (response->request.status.status_code >= IPP_OK_CONFLICT) {
+                if (ippGetStatusCode(response) >= IPP_OK_CONFLICT) {
                         DEBUG(0,("Unable to cancel job %d - %s\n", pjob->sysjob,
                                 ippErrorString(cupsLastError())));
@@ -705 +746 @@
         request = ippNew();
 
-        request->request.op.operation_id = IPP_HOLD_JOB;
-        request->request.op.request_id   = 1;
+        ippSetOperation(request, IPP_HOLD_JOB);
+        ippSetRequestId(request, 1);
 
         language = cupsLangDefault();
@@ -731 +772 @@
 
         if ((response = cupsDoRequest(http, request, "/jobs")) != NULL) {
-                if (response->request.status.status_code >= IPP_OK_CONFLICT) {
+                if (ippGetStatusCode(response) >= IPP_OK_CONFLICT) {
                         DEBUG(0,("Unable to hold job %d - %s\n", pjob->sysjob,
                                 ippErrorString(cupsLastError())));
@@ -801 +842 @@
         request = ippNew();
 
-        request->request.op.operation_id = IPP_RELEASE_JOB;
-        request->request.op.request_id   = 1;
+        ippSetOperation(request, IPP_RELEASE_JOB);
+        ippSetRequestId(request, 1);
 
         language = cupsLangDefault();
@@ -827 +868 @@
 
         if ((response = cupsDoRequest(http, request, "/jobs")) != NULL) {
-                if (response->request.status.status_code >= IPP_OK_CONFLICT) {
+                if (ippGetStatusCode(response) >= IPP_OK_CONFLICT) {
                         DEBUG(0,("Unable to release job %d - %s\n", pjob->sysjob,
                                 ippErrorString(cupsLastError())));
@@ -857 +898 @@
  */
 
-static int cups_job_submit(int snum, struct printjob *pjob)
+static int cups_job_submit(int snum, struct printjob *pjob,
+                           enum printing_types printing_type,
+                           char *lpq_cmd)
 {
         TALLOC_CTX *frame = talloc_stackframe();
@@ -876 +919 @@
         char *filename = NULL;
         size_t size;
-        uint32_t jobid = (uint32_t)-1;
 
         DEBUG(5,("cups_job_submit(%d, %p)\n", snum, pjob));
@@ -907 +949 @@
         request = ippNew();
 
-        request->request.op.operation_id = IPP_PRINT_JOB;
-        request->request.op.request_id   = 1;
+        ippSetOperation(request, IPP_PRINT_JOB);
+        ippSetRequestId(request, 1);
 
         language = cupsLangDefault();
@@ -938 +980 @@
                      pjob->clientmachine);
 
-        /* Get the jobid from the filename. */
-        jobid = print_parse_jobid(pjob->filename);
-        if (jobid == (uint32_t)-1) {
-                DEBUG(0,("cups_job_submit: failed to parse jobid from name %s\n",
-                                pjob->filename ));
-                jobid = 0;
-        }
-
         if (!push_utf8_talloc(frame, &jobname, pjob->jobname, &size)) {
                 goto out;
@@ -951 +985 @@
         new_jobname = talloc_asprintf(frame,
                         "%s%.8u %s", PRINT_SPOOL_PREFIX,
-                        (unsigned int)jobid,
-                        jobname);
+                        pjob->jobid, jobname);
         if (new_jobname == NULL) {
                 goto out;
@@ -984 +1017 @@
         }
         if ((response = cupsDoFileRequest(http, request, uri, pjob->filename)) != NULL) {
-                if (response->request.status.status_code >= IPP_OK_CONFLICT) {
+                if (ippGetStatusCode(response) >= IPP_OK_CONFLICT) {
                         DEBUG(0,("Unable to print file to %s - %s\n",
                                  lp_printername(snum),
@@ -992 +1025 @@
                         attr_job_id = ippFindAttribute(response, "job-id", IPP_TAG_INTEGER);
                         if(attr_job_id) {
-                                pjob->sysjob = attr_job_id->values[0].integer;
+                                pjob->sysjob = ippGetInteger(attr_job_id, 0);
                                 DEBUG(5,("cups_job_submit: job-id %d\n", pjob->sysjob));
                         } else {
@@ -1114 +1147 @@
         request = ippNew();
 
-        request->request.op.operation_id = IPP_GET_JOBS;
-        request->request.op.request_id   = 1;
+        ippSetOperation(request, IPP_GET_JOBS);
+        ippSetRequestId(request, 1);
 
         language = cupsLangDefault();
@@ -1143 +1176 @@
         }
 
-        if (response->request.status.status_code >= IPP_OK_CONFLICT) {
+        if (ippGetStatusCode(response) >= IPP_OK_CONFLICT) {
                 DEBUG(0,("Unable to get jobs for %s - %s\n", uri,
-                         ippErrorString(response->request.status.status_code)));
+                         ippErrorString(ippGetStatusCode(response))));
                 goto out;
         }
@@ -1157 +1190 @@
         queue  = NULL;
 
-        for (attr = response->attrs; attr != NULL; attr = attr->next) {
+        for (attr = ippFirstAttribute(response); attr != NULL; attr = ippNextAttribute(response)) {
                /*
                 * Skip leading attributes until we hit a job...
                 */
 
-                while (attr != NULL && attr->group_tag != IPP_TAG_JOB)
-                        attr = attr->next;
+                while (attr != NULL && ippGetGroupTag(attr) != IPP_TAG_JOB)
+                        attr = ippNextAttribute(response);
 
                 if (attr == NULL)
@@ -1198 +1231 @@
                 job_name     = NULL;
 
-                while (attr != NULL && attr->group_tag == IPP_TAG_JOB) {
-                        if (attr->name == NULL) {
-                                attr = attr->next;
+                while (attr != NULL && ippGetGroupTag(attr) == IPP_TAG_JOB) {
+                        if (ippGetName(attr) == NULL) {
+                                attr = ippNextAttribute(response);
                                 break;
                         }
 
-                        if (strcmp(attr->name, "job-id") == 0 &&
-                            attr->value_tag == IPP_TAG_INTEGER)
-                                job_id = attr->values[0].integer;
-
-                        if (strcmp(attr->name, "job-k-octets") == 0 &&
-                            attr->value_tag == IPP_TAG_INTEGER)
-                                job_k_octets = attr->values[0].integer;
-
-                        if (strcmp(attr->name, "job-priority") == 0 &&
-                            attr->value_tag == IPP_TAG_INTEGER)
-                                job_priority = attr->values[0].integer;
-
-                        if (strcmp(attr->name, "job-state") == 0 &&
-                            attr->value_tag == IPP_TAG_ENUM)
-                                job_status = (ipp_jstate_t)(attr->values[0].integer);
-
-                        if (strcmp(attr->name, "time-at-creation") == 0 &&
-                            attr->value_tag == IPP_TAG_INTEGER)
-                                job_time = attr->values[0].integer;
-
-                        if (strcmp(attr->name, "job-name") == 0 &&
-                            attr->value_tag == IPP_TAG_NAME) {
+                        if (strcmp(ippGetName(attr), "job-id") == 0 &&
+                            ippGetValueTag(attr) == IPP_TAG_INTEGER)
+                                job_id = ippGetInteger(attr, 0);
+
+                        if (strcmp(ippGetName(attr), "job-k-octets") == 0 &&
+                            ippGetValueTag(attr) == IPP_TAG_INTEGER)
+                                job_k_octets = ippGetInteger(attr, 0);
+
+                        if (strcmp(ippGetName(attr), "job-priority") == 0 &&
+                            ippGetValueTag(attr) == IPP_TAG_INTEGER)
+                                job_priority = ippGetInteger(attr, 0);
+
+                        if (strcmp(ippGetName(attr), "job-state") == 0 &&
+                            ippGetValueTag(attr) == IPP_TAG_ENUM)
+                                job_status = (ipp_jstate_t)ippGetInteger(attr, 0);
+
+                        if (strcmp(ippGetName(attr), "time-at-creation") == 0 &&
+                            ippGetValueTag(attr) == IPP_TAG_INTEGER)
+                                job_time = ippGetInteger(attr, 0);
+
+                        if (strcmp(ippGetName(attr), "job-name") == 0 &&
+                            ippGetValueTag(attr) == IPP_TAG_NAME) {
                                 if (!pull_utf8_talloc(frame,
                                                 &job_name,
-                                                attr->values[0].string.text,
+                                                ippGetString(attr, 0, NULL),
                                                 &size)) {
                                         goto out;
@@ -1234 +1267 @@
                         }
 
-                        if (strcmp(attr->name, "job-originating-user-name") == 0 &&
-                            attr->value_tag == IPP_TAG_NAME) {
+                        if (strcmp(ippGetName(attr), "job-originating-user-name") == 0 &&
+                            ippGetValueTag(attr) == IPP_TAG_NAME) {
                                 if (!pull_utf8_talloc(frame,
                                                 &user_name,
-                                                attr->values[0].string.text,
+                                                ippGetString(attr, 0, NULL),
                                                 &size)) {
                                         goto out;
@@ -1244 +1277 @@
                         }
 
-                        attr = attr->next;
+                        attr = ippNextAttribute(response);
                 }
 
@@ -1258 +1291 @@
                 }
 
-                temp->job      = job_id;
+                temp->sysjob   = job_id;
                 temp->size     = job_k_octets * 1024;
                 temp->status   = job_status == IPP_JOB_PENDING ? LPQ_QUEUED :
@@ -1290 +1323 @@
         request = ippNew();
 
-        request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
-        request->request.op.request_id   = 1;
+        ippSetOperation(request, IPP_GET_PRINTER_ATTRIBUTES);
+        ippSetRequestId(request, 1);
 
         ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
@@ -1317 +1350 @@
         }
 
-        if (response->request.status.status_code >= IPP_OK_CONFLICT) {
+        if (ippGetStatusCode(response) >= IPP_OK_CONFLICT) {
                 DEBUG(0,("Unable to get printer status for %s - %s\n", printername,
-                         ippErrorString(response->request.status.status_code)));
+                         ippErrorString(ippGetStatusCode(response))));
                 goto out;
         }
@@ -1328 +1361 @@
 
         if ((attr = ippFindAttribute(response, "printer-state", IPP_TAG_ENUM)) != NULL) {
-                if (attr->values[0].integer == IPP_PRINTER_STOPPED)
+                if (ippGetInteger(attr, 0) == IPP_PRINTER_STOPPED)
                         status->status = LPSTAT_STOPPED;
                 else
@@ -1338 +1371 @@
                 char *msg = NULL;
                 if (!pull_utf8_talloc(frame, &msg,
-                                attr->values[0].string.text,
+                                ippGetString(attr, 0, NULL),
                                 &size)) {
                         SAFE_FREE(queue);
@@ -1414 +1447 @@
         request = ippNew();
 
-        request->request.op.operation_id = IPP_PAUSE_PRINTER;
-        request->request.op.request_id   = 1;
+        ippSetOperation(request, IPP_PAUSE_PRINTER);
+        ippSetRequestId(request, 1);
 
         language = cupsLangDefault();
@@ -1445 +1478 @@
 
         if ((response = cupsDoRequest(http, request, "/admin/")) != NULL) {
-                if (response->request.status.status_code >= IPP_OK_CONFLICT) {
+                if (ippGetStatusCode(response) >= IPP_OK_CONFLICT) {
                         DEBUG(0,("Unable to pause printer %s - %s\n",
                                  lp_printername(snum),
@@ -1518 +1551 @@
         request = ippNew();
 
-        request->request.op.operation_id = IPP_RESUME_PRINTER;
-        request->request.op.request_id   = 1;
+        ippSetOperation(request, IPP_RESUME_PRINTER);
+        ippSetRequestId(request, 1);
 
         language = cupsLangDefault();
@@ -1549 +1582 @@
 
         if ((response = cupsDoRequest(http, request, "/admin/")) != NULL) {
-                if (response->request.status.status_code >= IPP_OK_CONFLICT) {
+                if (ippGetStatusCode(response) >= IPP_OK_CONFLICT) {
                         DEBUG(0,("Unable to resume printer %s - %s\n",
                                  lp_printername(snum),

trunk/server/source3/printing/print_generic.c

@@ -140 +140 @@
 
 /****************************************************************************
+get the current list of queued jobs
+****************************************************************************/
+static int generic_queue_get(const char *printer_name,
+                             enum printing_types printing_type,
+                             char *lpq_command,
+                             print_queue_struct **q,
+                             print_status_struct *status)
+{
+        char **qlines;
+        int fd;
+        int numlines, i, qcount;
+        print_queue_struct *queue = NULL;
+
+        /* never do substitution when running the 'lpq command' since we can't
+           get it rigt when using the background update daemon.  Make the caller
+           do it before passing off the command string to us here. */
+
+        print_run_command(-1, printer_name, False, lpq_command, &fd, NULL);
+
+        if (fd == -1) {
+                DEBUG(5,("generic_queue_get: Can't read print queue status for printer %s\n",
+                        printer_name ));
+                return 0;
+        }
+
+        numlines = 0;
+        qlines = fd_lines_load(fd, &numlines,0,NULL);
+        close(fd);
+
+        /* turn the lpq output into a series of job structures */
+        qcount = 0;
+        ZERO_STRUCTP(status);
+        if (numlines && qlines) {
+                queue = SMB_MALLOC_ARRAY(print_queue_struct, numlines+1);
+                if (!queue) {
+                        TALLOC_FREE(qlines);
+                        *q = NULL;
+                        return 0;
+                }
+                memset(queue, '\0', sizeof(print_queue_struct)*(numlines+1));
+
+                for (i=0; i<numlines; i++) {
+                        /* parse the line */
+                        if (parse_lpq_entry(printing_type,qlines[i],
+                                            &queue[qcount],status,qcount==0)) {
+                                qcount++;
+                        }
+                }
+        }
+
+        TALLOC_FREE(qlines);
+        *q = queue;
+        return qcount;
+}
+
+/****************************************************************************
  Submit a file for printing - called from print_job_end()
 ****************************************************************************/
 
-static int generic_job_submit(int snum, struct printjob *pjob)
+static int generic_job_submit(int snum, struct printjob *pjob,
+                              enum printing_types printing_type,
+                              char *lpq_cmd)
 {
         int ret = -1;
@@ -153 +211 @@
         TALLOC_CTX *ctx = talloc_tos();
         fstring job_page_count, job_size;
+        print_queue_struct *q;
+        print_status_struct status;
 
         /* we print from the directory path to give the best chance of
@@ -203 +263 @@
                         "%c", job_page_count,
                         NULL);
+        if (ret != 0) {
+                ret = -1;
+                goto out;
+        }
+
+        /*
+         * check the queue for the newly submitted job, this allows us to
+         * determine the backend job identifier (sysjob).
+         */
+        pjob->sysjob = -1;
+        ret = generic_queue_get(lp_printername(snum), printing_type, lpq_cmd,
+                                &q, &status);
+        if (ret > 0) {
+                int i;
+                for (i = 0; i < ret; i++) {
+                        if (strcmp(q[i].fs_file, p) == 0) {
+                                pjob->sysjob = q[i].sysjob;
+                                DEBUG(5, ("new job %u (%s) matches sysjob %d\n",
+                                          pjob->jobid, jobname, pjob->sysjob));
+                                break;
+                        }
+                }
+                SAFE_FREE(q);
+                ret = 0;
+        }
+        if (pjob->sysjob == -1) {
+                DEBUG(2, ("failed to get sysjob for job %u (%s), tracking as "
+                          "Unix job\n", pjob->jobid, jobname));
+        }
+
 
  out:
@@ -211 +301 @@
         TALLOC_FREE(current_directory);
         return ret;
-}
-
-
-/****************************************************************************
-get the current list of queued jobs
-****************************************************************************/
-static int generic_queue_get(const char *printer_name, 
-                             enum printing_types printing_type,
-                             char *lpq_command,
-                             print_queue_struct **q, 
-                             print_status_struct *status)
-{
-        char **qlines;
-        int fd;
-        int numlines, i, qcount;
-        print_queue_struct *queue = NULL;
-        
-        /* never do substitution when running the 'lpq command' since we can't
-           get it rigt when using the background update daemon.  Make the caller 
-           do it before passing off the command string to us here. */
-
-        print_run_command(-1, printer_name, False, lpq_command, &fd, NULL);
-
-        if (fd == -1) {
-                DEBUG(5,("generic_queue_get: Can't read print queue status for printer %s\n",
-                        printer_name ));
-                return 0;
-        }
-        
-        numlines = 0;
-        qlines = fd_lines_load(fd, &numlines,0,NULL);
-        close(fd);
-
-        /* turn the lpq output into a series of job structures */
-        qcount = 0;
-        ZERO_STRUCTP(status);
-        if (numlines && qlines) {
-                queue = SMB_MALLOC_ARRAY(print_queue_struct, numlines+1);
-                if (!queue) {
-                        TALLOC_FREE(qlines);
-                        *q = NULL;
-                        return 0;
-                }
-                memset(queue, '\0', sizeof(print_queue_struct)*(numlines+1));
-
-                for (i=0; i<numlines; i++) {
-                        /* parse the line */
-                        if (parse_lpq_entry(printing_type,qlines[i],
-                                            &queue[qcount],status,qcount==0)) {
-                                qcount++;
-                        }
-                }               
-        }
-
-        TALLOC_FREE(qlines);
-        *q = queue;
-        return qcount;
 }
 

trunk/server/source3/printing/print_iprint.c

@@ -35 +35 @@
 #define NOVELL_SERVER_VERSION_OES_SP1           33554432
 
+#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
+#define HAVE_CUPS_1_6 1
+#endif
+
+#ifndef HAVE_CUPS_1_6
+#define ippGetCount(attr)     attr->num_values
+#define ippGetGroupTag(attr)  attr->group_tag
+#define ippGetName(attr)      attr->name
+#define ippGetValueTag(attr)  attr->value_tag
+#define ippGetStatusCode(ipp) ipp->request.status.status_code
+#define ippGetBoolean(attr, element) attr->values[element].boolean
+#define ippGetInteger(attr, element) attr->values[element].integer
+#define ippGetString(attr, element, language) attr->values[element].string.text
+
+static ipp_attribute_t *
+ippFirstAttribute(ipp_t *ipp)
+{
+  if (!ipp)
+    return (NULL);
+  return (ipp->current = ipp->attrs);
+}
+
+static ipp_attribute_t *
+ippNextAttribute(ipp_t *ipp)
+{
+  if (!ipp || !ipp->current)
+    return (NULL);
+  return (ipp->current = ipp->current->next);
+}
+
+static int ippSetOperation(ipp_t *ipp, ipp_op_t op)
+{
+    ipp->request.op.operation_id = op;
+    return (1);
+}
+
+static int ippSetRequestId(ipp_t *ipp, int request_id)
+{
+    ipp->request.any.request_id = request_id;
+    return (1);
+}
+#endif
+
 /*
  * 'iprint_passwd_cb()' - The iPrint password callback...
@@ -93 +136 @@
         request = ippNew();
 
-        request->request.op.operation_id = (ipp_op_t)OPERATION_NOVELL_MGMT;
-        request->request.op.request_id   = 1;
+        ippSetOperation(request, (ipp_op_t)OPERATION_NOVELL_MGMT);
+        ippSetRequestId(request, 1);
 
         language = cupsLangDefault();
@@ -115 +158 @@
 
         if (((response = cupsDoRequest(http, request, "/ipp/")) == NULL) ||
-            (response->request.status.status_code >= IPP_OK_CONFLICT))
+            (ippGetStatusCode(response) >= IPP_OK_CONFLICT))
                 goto out;
 
         if (((attr = ippFindAttribute(response, "server-version",
                                       IPP_TAG_STRING)) != NULL)) {
-                if ((ver = strstr(attr->values[0].string.text,
+                if ((ver = strstr(ippGetString(attr, 0, NULL),
                                   NOVELL_SERVER_VERSION_STRING)) != NULL) {
                         ver += strlen(NOVELL_SERVER_VERSION_STRING);
@@ -136 +179 @@
                 }
 
-                if ((os = strstr(attr->values[0].string.text,
+                if ((os = strstr(ippGetString(attr, 0, NULL),
                                   NOVELL_SERVER_SYSNAME)) != NULL) {
                         os += strlen(NOVELL_SERVER_SYSNAME);
@@ -185 +228 @@
         request = ippNew();
 
-        request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
-        request->request.op.request_id   = reqId;
+        ippSetOperation(request, IPP_GET_PRINTER_ATTRIBUTES);
+        ippSetRequestId(request, reqId);
 
         language = cupsLangDefault();
@@ -231 +274 @@
         }
 
-        for (attr = response->attrs; attr != NULL;) {
+        for (attr = ippFirstAttribute(response); attr != NULL;) {
                /*
                 * Skip leading attributes until we hit a printer...
                 */
 
-                while (attr != NULL && attr->group_tag != IPP_TAG_PRINTER)
-                        attr = attr->next;
+                while (attr != NULL && ippGetGroupTag(attr) != IPP_TAG_PRINTER)
+                        attr = ippNextAttribute(response);
 
                 if (attr == NULL)
@@ -251 +294 @@
                 secure     = 0;
 
-                while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER) {
-                        if (strcmp(attr->name, "printer-name") == 0 &&
-                            attr->value_tag == IPP_TAG_NAME)
-                                name = attr->values[0].string.text;
-
-                        if (strcmp(attr->name, "printer-info") == 0 &&
-                            (attr->value_tag == IPP_TAG_TEXT ||
-                            attr->value_tag == IPP_TAG_TEXTLANG))
-                                info = attr->values[0].string.text;
+                while (attr != NULL && ippGetGroupTag(attr) == IPP_TAG_PRINTER) {
+                        if (strcmp(ippGetName(attr), "printer-name") == 0 &&
+                            ippGetValueTag(attr) == IPP_TAG_NAME)
+                                name = ippGetString(attr, 0, NULL);
+
+                        if (strcmp(ippGetName(attr), "printer-info") == 0 &&
+                            (ippGetValueTag(attr) == IPP_TAG_TEXT ||
+                            ippGetValueTag(attr) == IPP_TAG_TEXTLANG))
+                                info = ippGetString(attr, 0, NULL);
 
                        /*
@@ -267 +310 @@
                         * printer should show up
                         */
-                        if (!strcmp(attr->name, "smb-enabled") &&
-                            ((attr->value_tag == IPP_TAG_INTEGER &&
-                            !attr->values[0].integer) ||
-                            (attr->value_tag == IPP_TAG_BOOLEAN &&
-                            !attr->values[0].boolean)))
+                        if (!strcmp(ippGetName(attr), "smb-enabled") &&
+                            ((ippGetValueTag(attr) == IPP_TAG_INTEGER &&
+                            !ippGetInteger(attr, 0)) ||
+                            (ippGetValueTag(attr) == IPP_TAG_BOOLEAN &&
+                            !ippGetBoolean(attr, 0))))
                                 smb_enabled = 0;
 
@@ -280 +323 @@
                         * printer should show up
                         */
-                        if (!strcmp(attr->name, "security-enabled") &&
-                            ((attr->value_tag == IPP_TAG_INTEGER &&
-                            attr->values[0].integer) ||
-                            (attr->value_tag == IPP_TAG_BOOLEAN &&
-                            attr->values[0].boolean)))
+                        if (!strcmp(ippGetName(attr), "security-enabled") &&
+                            ((ippGetValueTag(attr) == IPP_TAG_INTEGER &&
+                            ippGetInteger(attr, 0)) ||
+                            (ippGetValueTag(attr) == IPP_TAG_BOOLEAN &&
+                            ippGetBoolean(attr, 0))))
                                 secure = 1;
 
-                        attr = attr->next;
+                        attr = ippNextAttribute(response);
                 }
 
@@ -344 +387 @@
         request = ippNew();
 
-        request->request.op.operation_id =
-                (ipp_op_t)OPERATION_NOVELL_LIST_PRINTERS;
-        request->request.op.request_id   = 1;
+        ippSetOperation(request, (ipp_op_t)OPERATION_NOVELL_LIST_PRINTERS);
+        ippSetRequestId(request, 1);
 
         language = cupsLangDefault();
@@ -369 +411 @@
         }
 
-        for (attr = response->attrs; attr != NULL;) {
+        for (attr = ippFirstAttribute(response); attr != NULL;) {
                /*
                 * Skip leading attributes until we hit a printer...
                 */
 
-                while (attr != NULL && attr->group_tag != IPP_TAG_PRINTER)
-                        attr = attr->next;
+                while (attr != NULL && ippGetGroupTag(attr) != IPP_TAG_PRINTER)
+                        attr = ippNextAttribute(response);
 
                 if (attr == NULL)
@@ -384 +426 @@
                 */
 
-                while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER)
+                while (attr != NULL && ippGetGroupTag(attr) == IPP_TAG_PRINTER)
                 {
-                        if (strcmp(attr->name, "printer-name") == 0 &&
-                            (attr->value_tag == IPP_TAG_URI ||
-                             attr->value_tag == IPP_TAG_NAME ||
-                             attr->value_tag == IPP_TAG_TEXT ||
-                             attr->value_tag == IPP_TAG_NAMELANG ||
-                             attr->value_tag == IPP_TAG_TEXTLANG))
+                        if (strcmp(ippGetName(attr), "printer-name") == 0 &&
+                            (ippGetValueTag(attr) == IPP_TAG_URI ||
+                             ippGetValueTag(attr) == IPP_TAG_NAME ||
+                             ippGetValueTag(attr) == IPP_TAG_TEXT ||
+                             ippGetValueTag(attr) == IPP_TAG_NAMELANG ||
+                             ippGetValueTag(attr) == IPP_TAG_TEXTLANG))
                         {
-                                for (i = 0; i<attr->num_values; i++)
+                                for (i = 0; i<ippGetCount(attr); i++)
                                 {
-                                        char *url = attr->values[i].string.text;
+                                        char *url = ippGetString(attr, i, NULL);
                                         if (!url || !strlen(url))
                                                 continue;
@@ -401 +443 @@
                                 }
                         }
-                        attr = attr->next;
+                        attr = ippNextAttribute(response);
                 }
         }
@@ -467 +509 @@
         request = ippNew();
 
-        request->request.op.operation_id = IPP_CANCEL_JOB;
-        request->request.op.request_id   = 1;
+        ippSetOperation(request, IPP_CANCEL_JOB);
+        ippSetRequestId(request, 1);
 
         language = cupsLangDefault();
@@ -494 +536 @@
 
         if ((response = cupsDoRequest(http, request, httpPath)) != NULL) {
-                if (response->request.status.status_code >= IPP_OK_CONFLICT) {
+                if (ippGetStatusCode(response) >= IPP_OK_CONFLICT) {
                         DEBUG(0,("Unable to cancel job %d - %s\n", pjob->sysjob,
                                 ippErrorString(cupsLastError())));
@@ -565 +607 @@
         request = ippNew();
 
-        request->request.op.operation_id = IPP_HOLD_JOB;
-        request->request.op.request_id   = 1;
+        ippSetOperation(request, IPP_HOLD_JOB);
+        ippSetRequestId(request, 1);
 
         language = cupsLangDefault();
@@ -594 +636 @@
 
         if ((response = cupsDoRequest(http, request, httpPath)) != NULL) {
-                if (response->request.status.status_code >= IPP_OK_CONFLICT) {
+                if (ippGetStatusCode(response) >= IPP_OK_CONFLICT) {
                         DEBUG(0,("Unable to hold job %d - %s\n", pjob->sysjob,
                                 ippErrorString(cupsLastError())));
@@ -665 +707 @@
         request = ippNew();
 
-        request->request.op.operation_id = IPP_RELEASE_JOB;
-        request->request.op.request_id   = 1;
+        ippSetOperation(request, IPP_RELEASE_JOB);
+        ippSetRequestId(request, 1);
 
         language = cupsLangDefault();
@@ -694 +736 @@
 
         if ((response = cupsDoRequest(http, request, httpPath)) != NULL) {
-                if (response->request.status.status_code >= IPP_OK_CONFLICT) {
+                if (ippGetStatusCode(response) >= IPP_OK_CONFLICT) {
                         DEBUG(0,("Unable to release job %d - %s\n", pjob->sysjob,
                                 ippErrorString(cupsLastError())));
@@ -723 +765 @@
  */
 
-static int iprint_job_submit(int snum, struct printjob *pjob)
+static int iprint_job_submit(int snum, struct printjob *pjob,
+                             enum printing_types printing_type,
+                             char *lpq_cmd)
 {
         int             ret = 1;                /* Return value */
@@ -764 +808 @@
         request = ippNew();
 
-        request->request.op.operation_id = IPP_PRINT_JOB;
-        request->request.op.request_id   = 1;
+        ippSetOperation(request, IPP_PRINT_JOB);
+        ippSetRequestId(request, 1);
 
         language = cupsLangDefault();
@@ -798 +842 @@
 
         if ((response = cupsDoFileRequest(http, request, uri, pjob->filename)) != NULL) {
-                if (response->request.status.status_code >= IPP_OK_CONFLICT) {
+                if (ippGetStatusCode(response) >= IPP_OK_CONFLICT) {
                         DEBUG(0,("Unable to print file to %s - %s\n",
                                  lp_printername(snum),
@@ -818 +862 @@
 
                 attr = ippFindAttribute(response, "job-id", IPP_TAG_INTEGER);
-                if (attr != NULL && attr->group_tag == IPP_TAG_JOB)
+                if (attr != NULL && ippGetGroupTag(attr) == IPP_TAG_JOB)
                 {
-                        pjob->sysjob = attr->values[0].integer;
+                        pjob->sysjob = ippGetInteger(attr, 0);
                 }
         }
@@ -867 +911 @@
         int             job_k_octets;   /* job-k-octets attribute */
         time_t          job_time;       /* time-at-creation attribute */
-        time_t          printer_current_time = 0;       /* printer's current time */
         time_t          printer_up_time = 0;    /* printer's uptime */
         ipp_jstate_t    job_status;     /* job-status attribute */
@@ -940 +983 @@
         request = ippNew();
 
-        request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
-        request->request.op.request_id   = 2;
+        ippSetOperation(request, IPP_GET_PRINTER_ATTRIBUTES);
+        ippSetRequestId(request, 2);
 
         language = cupsLangDefault();
@@ -972 +1015 @@
         }
 
-        if (response->request.status.status_code >= IPP_OK_CONFLICT) {
+        if (ippGetStatusCode(response) >= IPP_OK_CONFLICT) {
                 DEBUG(0,("Unable to get printer status for %s - %s\n", printername,
-                         ippErrorString(response->request.status.status_code)));
+                         ippErrorString(ippGetStatusCode(response))));
                 *q = queue;
                 goto out;
@@ -984 +1027 @@
 
         if ((attr = ippFindAttribute(response, "printer-state", IPP_TAG_ENUM)) != NULL) {
-                if (attr->values[0].integer == IPP_PRINTER_STOPPED)
+                if (ippGetInteger(attr, 0) == IPP_PRINTER_STOPPED)
                         status->status = LPSTAT_STOPPED;
                 else
@@ -992 +1035 @@
         if ((attr = ippFindAttribute(response, "printer-state-message",
                                      IPP_TAG_TEXT)) != NULL)
-                fstrcpy(status->message, attr->values[0].string.text);
-
-        if ((attr = ippFindAttribute(response, "printer-current-time",
-                                     IPP_TAG_DATE)) != NULL)
-                printer_current_time = ippDateToTime(attr->values[0].date);
+                fstrcpy(status->message, ippGetString(attr, 0, NULL));
 
         if ((attr = ippFindAttribute(response, "printer-up-time",
                                      IPP_TAG_INTEGER)) != NULL)
-                printer_up_time = attr->values[0].integer;
+                printer_up_time = ippGetInteger(attr, 0);
 
         ippDelete(response);
@@ -1017 +1056 @@
         request = ippNew();
 
-        request->request.op.operation_id = IPP_GET_JOBS;
-        request->request.op.request_id   = 3;
+        ippSetOperation(request, IPP_GET_JOBS);
+        ippSetRequestId(request, 3);
 
         ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
@@ -1046 +1085 @@
         }
 
-        if (response->request.status.status_code >= IPP_OK_CONFLICT) {
+        if (ippGetStatusCode(response) >= IPP_OK_CONFLICT) {
                 DEBUG(0,("Unable to get jobs for %s - %s\n", uri,
-                         ippErrorString(response->request.status.status_code)));
+                         ippErrorString(ippGetStatusCode(response))));
                 goto out;
         }
@@ -1060 +1099 @@
         queue  = NULL;
 
-        for (attr = response->attrs; attr != NULL; attr = attr->next) {
+        for (attr = ippFirstAttribute(response); attr != NULL; attr = ippNextAttribute(response)) {
                /*
                 * Skip leading attributes until we hit a job...
                 */
 
-                while (attr != NULL && attr->group_tag != IPP_TAG_JOB)
-                        attr = attr->next;
+                while (attr != NULL && ippGetGroupTag(attr) != IPP_TAG_JOB)
+                        attr = ippNextAttribute(response);
 
                 if (attr == NULL)
@@ -1101 +1140 @@
                 job_name     = NULL;
 
-                while (attr != NULL && attr->group_tag == IPP_TAG_JOB) {
-                        if (attr->name == NULL) {
-                                attr = attr->next;
+                while (attr != NULL && ippGetGroupTag(attr) == IPP_TAG_JOB) {
+                        if (ippGetName(attr) == NULL) {
+                                attr = ippNextAttribute(response);
                                 break;
                         }
 
-                        if (strcmp(attr->name, "job-id") == 0 &&
-                            attr->value_tag == IPP_TAG_INTEGER)
-                                job_id = attr->values[0].integer;
-
-                        if (strcmp(attr->name, "job-k-octets") == 0 &&
-                            attr->value_tag == IPP_TAG_INTEGER)
-                                job_k_octets = attr->values[0].integer;
-
-                        if (strcmp(attr->name, "job-priority") == 0 &&
-                            attr->value_tag == IPP_TAG_INTEGER)
-                                job_priority = attr->values[0].integer;
-
-                        if (strcmp(attr->name, "job-state") == 0 &&
-                            attr->value_tag == IPP_TAG_ENUM)
-                                job_status = (ipp_jstate_t)(attr->values[0].integer);
-
-                        if (strcmp(attr->name, "time-at-creation") == 0 &&
-                            attr->value_tag == IPP_TAG_INTEGER)
+                        if (strcmp(ippGetName(attr), "job-id") == 0 &&
+                            ippGetValueTag(attr) == IPP_TAG_INTEGER)
+                                job_id = ippGetInteger(attr, 0);
+
+                        if (strcmp(ippGetName(attr), "job-k-octets") == 0 &&
+                            ippGetValueTag(attr) == IPP_TAG_INTEGER)
+                                job_k_octets = ippGetInteger(attr, 0);
+
+                        if (strcmp(ippGetName(attr), "job-priority") == 0 &&
+                            ippGetValueTag(attr) == IPP_TAG_INTEGER)
+                                job_priority = ippGetInteger(attr, 0);
+
+                        if (strcmp(ippGetName(attr), "job-state") == 0 &&
+                            ippGetValueTag(attr) == IPP_TAG_ENUM)
+                                job_status = (ipp_jstate_t)ippGetInteger(attr, 0);
+
+                        if (strcmp(ippGetName(attr), "time-at-creation") == 0 &&
+                            ippGetValueTag(attr) == IPP_TAG_INTEGER)
                         {
                                /*
@@ -1134 +1173 @@
 
                                 if (jobUseUnixTime)
-                                        job_time = attr->values[0].integer; 
+                                        job_time = ippGetInteger(attr, 0);
                                 else
-                                        job_time = time(NULL) - printer_up_time + attr->values[0].integer;
+                                        job_time = time(NULL) - printer_up_time + ippGetInteger(attr, 0);
                         }
 
-                        if (strcmp(attr->name, "job-name") == 0 &&
-                            (attr->value_tag == IPP_TAG_NAMELANG ||
-                             attr->value_tag == IPP_TAG_NAME))
-                                job_name = attr->values[0].string.text;
-
-                        if (strcmp(attr->name, "job-originating-user-name") == 0 &&
-                            (attr->value_tag == IPP_TAG_NAMELANG ||
-                             attr->value_tag == IPP_TAG_NAME))
-                                user_name = attr->values[0].string.text;
-
-                        attr = attr->next;
+                        if (strcmp(ippGetName(attr), "job-name") == 0 &&
+                            (ippGetValueTag(attr) == IPP_TAG_NAMELANG ||
+                             ippGetValueTag(attr) == IPP_TAG_NAME))
+                                job_name = ippGetString(attr, 0, NULL);
+
+                        if (strcmp(ippGetName(attr), "job-originating-user-name") == 0 &&
+                            (ippGetValueTag(attr) == IPP_TAG_NAMELANG ||
+                             ippGetValueTag(attr) == IPP_TAG_NAME))
+                                user_name = ippGetString(attr, 0, NULL);
+
+                        attr = ippNextAttribute(response);
                 }
 
@@ -1163 +1202 @@
                 }
 
-                temp->job      = job_id;
+                temp->sysjob   = job_id;
                 temp->size     = job_k_octets * 1024;
                 temp->status   = job_status == IPP_JOB_PENDING ? LPQ_QUEUED :

trunk/server/source3/printing/printer_list.c

@@ -92 +92 @@
         data = dbwrap_fetch_bystring_upper(db, key, key);
         if (data.dptr == NULL) {
-                DEBUG(1, ("Failed to fetch record!\n"));
+                DEBUG(6, ("Failed to fetch record! "
+                          "The printer database is empty?\n"));
                 status = NT_STATUS_NOT_FOUND;
                 goto done;
@@ -192 +193 @@
 
         len = tdb_pack(data.dptr, data.dsize,
-                       PL_DATA_FORMAT, time_h, time_l, name, str);
+                       PL_DATA_FORMAT, time_h, time_l, name, str, str2);
 
         status = dbwrap_store_bystring_upper(db, key, data, TDB_REPLACE);

trunk/server/source3/printing/printing.c

@@ -378 +378 @@
 ***********************************************************************/
 
-static int unpack_pjob( uint8 *buf, int buflen, struct printjob *pjob )
+static int unpack_pjob(TALLOC_CTX *mem_ctx, uint8 *buf, int buflen,
+                       struct printjob *pjob)
 {
         int     len = 0;
         int     used;
-        uint32 pjpid, pjsysjob, pjfd, pjstarttime, pjstatus;
+        uint32 pjpid, pjjobid, pjsysjob, pjfd, pjstarttime, pjstatus;
         uint32 pjsize, pjpage_count, pjspooled, pjsmbjob;
 
-        if ( !buf || !pjob )
+        if (!buf || !pjob) {
                 return -1;
-
-        len += tdb_unpack(buf+len, buflen-len, "dddddddddfffff",
+        }
+
+        len += tdb_unpack(buf+len, buflen-len, "ddddddddddfffff",
                                 &pjpid,
+                                &pjjobid,
                                 &pjsysjob,
                                 &pjfd,
@@ -404 +407 @@
                                 pjob->queuename);
 
-        if ( len == -1 )
+        if (len == -1) {
                 return -1;
-
-        used = unpack_devicemode(NULL, buf+len, buflen-len, &pjob->devmode);
+        }
+
+        used = unpack_devicemode(mem_ctx, buf+len, buflen-len, &pjob->devmode);
         if (used == -1) {
                 return -1;
@@ -415 +419 @@
 
         pjob->pid = pjpid;
+        pjob->jobid = pjjobid;
         pjob->sysjob = pjsysjob;
         pjob->fd = pjfd;
@@ -432 +437 @@
 ****************************************************************************/
 
-static struct printjob *print_job_find(const char *sharename, uint32 jobid)
-{
-        static struct printjob  pjob;
+static struct printjob *print_job_find(TALLOC_CTX *mem_ctx,
+                                       const char *sharename,
+                                       uint32 jobid)
+{
+        struct printjob         *pjob;
         uint32_t tmp;
         TDB_DATA                ret;
@@ -450 +457 @@
 
         if (!ret.dptr) {
-                DEBUG(10,("print_job_find: failed to find jobid %u.\n", (unsigned int)jobid ));
+                DEBUG(10, ("print_job_find: failed to find jobid %u.\n",
+                           jobid));
                 return NULL;
         }
 
-        talloc_free(pjob.devmode);
-
-        ZERO_STRUCT( pjob );
-
-        if ( unpack_pjob( ret.dptr, ret.dsize, &pjob ) == -1 ) {
-                DEBUG(10,("print_job_find: failed to unpack jobid %u.\n", (unsigned int)jobid ));
-                SAFE_FREE(ret.dptr);
-                return NULL;
-        }
-
+        pjob = talloc_zero(mem_ctx, struct printjob);
+        if (pjob == NULL) {
+                goto err_out;
+        }
+
+        if (unpack_pjob(mem_ctx, ret.dptr, ret.dsize, pjob) == -1) {
+                DEBUG(10, ("failed to unpack jobid %u.\n", jobid));
+                talloc_free(pjob);
+                pjob = NULL;
+                goto err_out;
+        }
+
+        DEBUG(10,("print_job_find: returning system job %d for jobid %u.\n",
+                  pjob->sysjob, jobid));
+        SMB_ASSERT(pjob->jobid == jobid);
+
+err_out:
         SAFE_FREE(ret.dptr);
-
-        DEBUG(10,("print_job_find: returning system job %d for jobid %u.\n",
-                        (int)pjob.sysjob, (unsigned int)jobid ));
-
-        return &pjob;
+        return pjob;
 }
 
@@ -494 +505 @@
 
         if (state->sysjob == pjob->sysjob) {
-                uint32 jobid = IVAL(key.dptr,0);
-
-                state->sysjob_to_jobid_value = jobid;
+                state->sysjob_to_jobid_value = pjob->jobid;
                 return 1;
         }
 
         return 0;
+}
+
+static uint32 sysjob_to_jobid_pdb(struct tdb_print_db *pdb, int sysjob)
+{
+        struct unixjob_traverse_state state;
+
+        state.sysjob = sysjob;
+        state.sysjob_to_jobid_value = (uint32)-1;
+
+        tdb_traverse(pdb->tdb, unixjob_traverse_fn, &state);
+
+        return state.sysjob_to_jobid_value;
 }
 
@@ -742 +763 @@
                 len = 0;
                 buflen = newlen;
-                len += tdb_pack(buf+len, buflen-len, "dddddddddfffff",
+                len += tdb_pack(buf+len, buflen-len, "ddddddddddfffff",
                                 (uint32)pjob->pid,
+                                (uint32)pjob->jobid,
                                 (uint32)pjob->sysjob,
                                 (uint32)pjob->fd,
@@ -780 +802 @@
         /* Send notify updates for what has changed */
 
-        if ( ret ) {
+        if (ret) {
                 bool changed = false;
                 struct printjob old_pjob;
 
-                if ( old_data.dsize )
-                {
-                        if ( unpack_pjob( old_data.dptr, old_data.dsize, &old_pjob ) != -1 )
-                        {
-                                pjob_store_notify(server_event_context(),
+                if (old_data.dsize) {
+                        TALLOC_CTX *tmp_ctx = talloc_new(ev);
+                        if (tmp_ctx == NULL)
+                                goto done;
+
+                        len = unpack_pjob(tmp_ctx, old_data.dptr,
+                                          old_data.dsize, &old_pjob);
+                        if (len != -1 ) {
+                                pjob_store_notify(ev,
                                                   msg_ctx,
                                                   sharename, jobid, &old_pjob,
                                                   pjob,
                                                   &changed);
-                                talloc_free(old_pjob.devmode);
-
                                 if (changed) {
                                         add_to_jobs_changed(pdb, jobid);
                                 }
                         }
-
-                }
-                else {
+                        talloc_free(tmp_ctx);
+
+                } else {
                         /* new job */
-                        pjob_store_notify(server_event_context(), msg_ctx,
+                        pjob_store_notify(ev, msg_ctx,
                                           sharename, jobid, NULL, pjob,
                                           &changed);
@@ -809 +833 @@
         }
 
+done:
         release_print_db(pdb);
-done:
         SAFE_FREE( old_data.dptr );
         SAFE_FREE( buf );
@@ -829 +853 @@
         uint32 job_status = 0;
         struct tdb_print_db *pdb;
-
-        pdb = get_print_db_byname( sharename );
-
-        if (!pdb)
+        TALLOC_CTX *tmp_ctx = talloc_new(ev);
+        if (tmp_ctx == NULL) {
                 return;
-
-        pjob = print_job_find( sharename, jobid );
-
+        }
+
+        pdb = get_print_db_byname(sharename);
+        if (!pdb) {
+                goto err_out;
+        }
+
+        pjob = print_job_find(tmp_ctx, sharename, jobid);
         if (!pjob) {
-                DEBUG(5, ("pjob_delete: we were asked to delete nonexistent job %u\n",
-                                        (unsigned int)jobid));
-                release_print_db(pdb);
-                return;
+                DEBUG(5, ("we were asked to delete nonexistent job %u\n",
+                          jobid));
+                goto err_release;
         }
 
@@ -855 +881 @@
         tdb_delete(pdb->tdb, print_key(jobid, &tmp));
         remove_from_jobs_added(sharename, jobid);
-        release_print_db( pdb );
         rap_jobid_delete(sharename, jobid);
+err_release:
+        release_print_db(pdb);
+err_out:
+        talloc_free(tmp_ctx);
 }
 
@@ -869 +898 @@
 {
         struct printjob pj, *old_pj;
-
-        if (jobid == (uint32)-1)
-                jobid = q->job + UNIX_JOB_START;
+        TALLOC_CTX *tmp_ctx = talloc_new(ev);
+        if (tmp_ctx == NULL) {
+                return;
+        }
+
+        if (jobid == (uint32)-1) {
+                jobid = q->sysjob + UNIX_JOB_START;
+        }
 
         /* Preserve the timestamp on an existing unix print job */
 
-        old_pj = print_job_find(sharename, jobid);
+        old_pj = print_job_find(tmp_ctx, sharename, jobid);
 
         ZERO_STRUCT(pj);
 
         pj.pid = (pid_t)-1;
-        pj.sysjob = q->job;
+        pj.jobid = jobid;
+        pj.sysjob = q->sysjob;
         pj.fd = -1;
         pj.starttime = old_pj ? old_pj->starttime : q->time;
@@ -898 +933 @@
 
         pjob_store(ev, msg_ctx, sharename, jobid, &pj);
+        talloc_free(tmp_ctx);
 }
 
@@ -910 +946 @@
         struct tevent_context *ev;
         struct messaging_context *msg_ctx;
+        TALLOC_CTX *mem_ctx;
 };
 
@@ -926 +963 @@
                 return 0;
 
-        jobid = IVAL(key.dptr, 0);
-        if ( unpack_pjob( data.dptr, data.dsize, &pjob ) == -1 )
+        if (unpack_pjob(ts->mem_ctx, data.dptr, data.dsize, &pjob) == -1)
                 return 0;
         talloc_free(pjob.devmode);
-
+        jobid = pjob.jobid;
 
         if (!pjob.smbjob) {
                 /* remove a unix job if it isn't in the system queue any more */
-
                 for (i=0;i<ts->qcount;i++) {
-                        uint32 u_jobid = (ts->queue[i].job + UNIX_JOB_START);
-                        if (jobid == u_jobid)
+                        if (ts->queue[i].sysjob == pjob.sysjob) {
                                 break;
+                        }
                 }
                 if (i == ts->qcount) {
@@ -969 +1004 @@
         /* this check only makes sense for jobs submitted from Windows clients */
 
-        if ( pjob.smbjob ) {
+        if (pjob.smbjob) {
                 for (i=0;i<ts->qcount;i++) {
-                        uint32 curr_jobid;
-
                         if ( pjob.status == LPQ_DELETED )
                                 continue;
 
-                        curr_jobid = print_parse_jobid(ts->queue[i].fs_file);
-
-                        if (jobid == curr_jobid) {
+                        if (ts->queue[i].sysjob == pjob.sysjob) {
 
                                 /* try to clean up any jobs that need to be deleted */
@@ -1033 +1064 @@
         }
 
-        /* Save the pjob attributes we will store.
-           FIXME!!! This is the only place where queue->job
-           represents the SMB jobid      --jerry */
-
-        ts->queue[i].job = jobid;
+        /* Save the pjob attributes we will store. */
+        ts->queue[i].sysjob = pjob.sysjob;
         ts->queue[i].size = pjob.size;
         ts->queue[i].page_count = pjob.page_count;
@@ -1188 +1216 @@
                 qcount++;
                 data.dsize += tdb_pack(NULL, 0, "ddddddff",
-                                (uint32)queue[i].job,
+                                (uint32)queue[i].sysjob,
                                 (uint32)queue[i].size,
                                 (uint32)queue[i].page_count,
@@ -1208 +1236 @@
 
                 len += tdb_pack(data.dptr + len, data.dsize - len, "ddddddff",
-                                (uint32)queue[i].job,
+                                (uint32)queue[i].sysjob,
                                 (uint32)queue[i].size,
                                 (uint32)queue[i].page_count,
@@ -1322 +1350 @@
 ****************************************************************************/
 
-static void print_queue_update_internal( struct tevent_context *ev,
-                                         struct messaging_context *msg_ctx,
-                                         const char *sharename,
-                                         struct printif *current_printif,
-                                         char *lpq_command, char *lprm_command )
+static void print_queue_update_internal(struct tevent_context *ev,
+                                        struct messaging_context *msg_ctx,
+                                        const char *sharename,
+                                        struct printif *current_printif,
+                                        char *lpq_command, char *lprm_command)
 {
         int i, qcount;
@@ -1338 +1366 @@
         fstring keystr, cachestr;
         struct tdb_print_db *pdb = get_print_db_byname(sharename);
-
-        if (!pdb) {
+        TALLOC_CTX *tmp_ctx = talloc_new(ev);
+
+        if ((pdb == NULL) || (tmp_ctx == NULL)) {
                 return;
         }
@@ -1380 +1409 @@
           fill in any system job numbers as we go
         */
-
         jcdata = get_jobs_added_data(pdb);
 
         for (i=0; i<qcount; i++) {
-                uint32 jobid = print_parse_jobid(queue[i].fs_file);
-
+                uint32 jobid = sysjob_to_jobid_pdb(pdb, queue[i].sysjob);
                 if (jobid == (uint32)-1) {
                         /* assume its a unix print job */
@@ -1394 +1421 @@
 
                 /* we have an active SMB print job - update its status */
-                pjob = print_job_find(sharename, jobid);
+                pjob = print_job_find(tmp_ctx, sharename, jobid);
                 if (!pjob) {
                         /* err, somethings wrong. Probably smbd was restarted
                            with jobs in the queue. All we can do is treat them
                            like unix jobs. Pity. */
+                        DEBUG(1, ("queued print job %d not found in jobs list, "
+                                  "assuming unix job\n", jobid));
                         print_unix_job(ev, msg_ctx,
                                        sharename, &queue[i], jobid);
                         continue;
                 }
-
-                pjob->sysjob = queue[i].job;
 
                 /* don't reset the status on jobs to be deleted */
@@ -1430 +1457 @@
         tstruct.ev = ev;
         tstruct.msg_ctx = msg_ctx;
+        tstruct.mem_ctx = tmp_ctx;
 
         tdb_traverse(pdb->tdb, traverse_fn_delete, (void *)&tstruct);
@@ -1437 +1465 @@
 
         SAFE_FREE(tstruct.queue);
+        talloc_free(tmp_ctx);
 
         DEBUG(10,("print_queue_update_internal: printer %s INFO/total_jobs = %d\n",
@@ -1632 +1661 @@
 }
 
+static bool printer_housekeeping_fn(const struct timeval *now,
+                                    void *private_data)
+{
+        static time_t last_pcap_reload_time = 0;
+        time_t printcap_cache_time = (time_t)lp_printcap_cache_time();
+        time_t t = time_mono(NULL);
+
+        DEBUG(5, ("printer housekeeping\n"));
+
+        /* if periodic printcap rescan is enabled, see if it's time to reload */
+        if ((printcap_cache_time != 0)
+         && (t >= (last_pcap_reload_time + printcap_cache_time))) {
+                DEBUG( 3,( "Printcap cache time expired.\n"));
+                pcap_cache_reload(server_event_context(),
+                                  smbd_messaging_context(),
+                                  &reload_pcap_change_notify);
+                last_pcap_reload_time = t;
+        }
+
+        return true;
+}
+
 static pid_t background_lpq_updater_pid = -1;
 
@@ -1703 +1754 @@
                         DEBUG(0,("tevent_add_fd() failed for pause_pipe\n"));
                         smb_panic("tevent_add_fd() failed for pause_pipe");
+                }
+
+                if (!(event_add_idle(ev, NULL,
+                                     timeval_set(SMBD_HOUSEKEEPING_INTERVAL, 0),
+                                     "printer_housekeeping",
+                                     printer_housekeeping_fn,
+                                     NULL))) {
+                        DEBUG(0, ("Could not add printing housekeeping event\n"));
+                        exit(1);
                 }
 
@@ -2049 +2109 @@
 
 /****************************************************************************
- Give the filename used for a jobid.
+ Return the device mode asigned to a specific print job.
  Only valid for the process doing the spooling and when the job
  has not been spooled.
 ****************************************************************************/
 
-char *print_job_fname(const char* sharename, uint32 jobid)
-{
-        struct printjob *pjob = print_job_find(sharename, jobid);
-        if (!pjob || pjob->spooled || pjob->pid != sys_getpid())
+struct spoolss_DeviceMode *print_job_devmode(TALLOC_CTX *mem_ctx,
+                                             const char *sharename,
+                                             uint32 jobid)
+{
+        struct printjob *pjob = print_job_find(mem_ctx, sharename, jobid);
+        if (pjob == NULL) {
                 return NULL;
-        return pjob->filename;
-}
-
-
-/****************************************************************************
- Give the filename used for a jobid.
- Only valid for the process doing the spooling and when the job
- has not been spooled.
-****************************************************************************/
-
-struct spoolss_DeviceMode *print_job_devmode(const char* sharename, uint32 jobid)
-{
-        struct printjob *pjob = print_job_find(sharename, jobid);
-
-        if ( !pjob )
-                return NULL;
+        }
 
         return pjob->devmode;
@@ -2088 +2135 @@
 {
         struct printjob *pjob;
-
-        pjob = print_job_find(sharename, jobid);
-        if (!pjob || pjob->pid != sys_getpid())
-                return False;
+        bool ret;
+        TALLOC_CTX *tmp_ctx = talloc_new(ev);
+        if (tmp_ctx == NULL) {
+                return false;
+        }
+
+        pjob = print_job_find(tmp_ctx, sharename, jobid);
+        if (!pjob || pjob->pid != sys_getpid()) {
+                ret = false;
+                goto err_out;
+        }
 
         fstrcpy(pjob->jobname, name);
-        return pjob_store(ev, msg_ctx, sharename, jobid, pjob);
+        ret = pjob_store(ev, msg_ctx, sharename, jobid, pjob);
+err_out:
+        talloc_free(tmp_ctx);
+        return ret;
 }
 
@@ -2105 +2162 @@
         struct printjob *pjob;
 
-        pjob = print_job_find(sharename, jobid);
+        pjob = print_job_find(mem_ctx, sharename, jobid);
         if (!pjob || pjob->pid != sys_getpid()) {
                 return false;
         }
 
-        *name = talloc_strdup(mem_ctx, pjob->jobname);
-        if (!*name) {
-                return false;
-        }
-
+        *name = pjob->jobname;
         return true;
 }
@@ -2187 +2240 @@
 {
         const char* sharename = lp_const_servicename(snum);
-        struct printjob *pjob = print_job_find(sharename, jobid);
+        struct printjob *pjob;
         int result = 0;
         struct printif *current_printif = get_printer_fns( snum );
-
-        if (!pjob)
-                return False;
+        bool ret;
+        TALLOC_CTX *tmp_ctx = talloc_new(ev);
+        if (tmp_ctx == NULL) {
+                return false;
+        }
+
+        pjob = print_job_find(tmp_ctx, sharename, jobid);
+        if (!pjob) {
+                ret = false;
+                goto err_out;
+        }
 
         /*
@@ -2198 +2259 @@
          */
 
-        if (pjob->status == LPQ_DELETING)
-                return True;
+        if (pjob->status == LPQ_DELETING) {
+                ret = true;
+                goto err_out;
+        }
 
         /* Hrm - we need to be able to cope with deleting a job before it
@@ -2229 +2292 @@
                         int njobs = 1;
 
-                        if (!pdb)
-                                return False;
+                        if (!pdb) {
+                                ret = false;
+                                goto err_out;
+                        }
                         pjob_delete(ev, msg_ctx, sharename, jobid);
                         /* Ensure we keep a rough count of the number of total jobs... */
@@ -2240 +2305 @@
         remove_from_jobs_added( sharename, jobid );
 
-        return (result == 0);
+        ret = (result == 0);
+err_out:
+        talloc_free(tmp_ctx);
+        return ret;
 }
 
@@ -2251 +2319 @@
                      uint32 jobid)
 {
-        struct printjob *pjob = print_job_find(servicename, jobid);
-
-        if (!pjob || !server_info)
-                return False;
-
-        return strequal(pjob->user, server_info->sanitized_username);
+        struct printjob *pjob;
+        bool ret;
+        TALLOC_CTX *tmp_ctx = talloc_new(server_info);
+        if (tmp_ctx == NULL) {
+                return false;
+        }
+
+        pjob = print_job_find(tmp_ctx, servicename, jobid);
+        if (!pjob || !server_info) {
+                ret = false;
+                goto err_out;
+        }
+
+        ret = strequal(pjob->user, server_info->sanitized_username);
+err_out:
+        talloc_free(tmp_ctx);
+        return ret;
 }
 
@@ -2270 +2349 @@
         struct printjob *pjob;
         bool    owner;
-        char    *fname;
+        WERROR werr;
+        TALLOC_CTX *tmp_ctx = talloc_new(msg_ctx);
+        if (tmp_ctx == NULL) {
+                return WERR_NOT_ENOUGH_MEMORY;
+        }
 
         owner = is_owner(server_info, lp_const_servicename(snum), jobid);
@@ -2290 +2373 @@
                 /* END_ADMIN_LOG */
 
-                return WERR_ACCESS_DENIED;
+                werr = WERR_ACCESS_DENIED;
+                goto err_out;
         }
 
@@ -2300 +2384 @@
          */
 
-        fname = print_job_fname(sharename, jobid);
-        if (fname != NULL) {
-                /* remove the spool file */
-                DEBUG(10, ("print_job_delete: "
-                           "Removing spool file [%s]\n", fname));
-                if (unlink(fname) == -1) {
-                        return map_werror_from_unix(errno);
+        pjob = print_job_find(tmp_ctx, sharename, jobid);
+        if (!pjob || pjob->spooled || pjob->pid != getpid()) {
+                DEBUG(10, ("Skipping spool file removal for job %u\n", jobid));
+        } else {
+                DEBUG(10, ("Removing spool file [%s]\n", pjob->filename));
+                if (unlink(pjob->filename) == -1) {
+                        werr = map_werror_from_unix(errno);
+                        goto err_out;
                 }
         }
 
         if (!print_job_delete1(server_event_context(), msg_ctx, snum, jobid)) {
-                return WERR_ACCESS_DENIED;
+                werr = WERR_ACCESS_DENIED;
+                goto err_out;
         }
 
@@ -2319 +2405 @@
         print_queue_update(msg_ctx, snum, True);
 
-        pjob = print_job_find(sharename, jobid);
+        pjob = print_job_find(tmp_ctx, sharename, jobid);
         if (pjob && (pjob->status != LPQ_DELETING)) {
-                return WERR_ACCESS_DENIED;
-        }
-
-        return WERR_PRINTER_HAS_JOBS_QUEUED;
+                werr = WERR_ACCESS_DENIED;
+                goto err_out;
+        }
+        werr = WERR_PRINTER_HAS_JOBS_QUEUED;
+
+err_out:
+        talloc_free(tmp_ctx);
+        return werr;
 }
 
@@ -2331 +2421 @@
 ****************************************************************************/
 
-bool print_job_pause(const struct auth_serversupplied_info *server_info,
+WERROR print_job_pause(const struct auth_serversupplied_info *server_info,
                      struct messaging_context *msg_ctx,
-                     int snum, uint32 jobid, WERROR *errcode)
+                     int snum, uint32 jobid)
 {
         const char* sharename = lp_const_servicename(snum);
@@ -2339 +2429 @@
         int ret = -1;
         struct printif *current_printif = get_printer_fns( snum );
-
-        pjob = print_job_find(sharename, jobid);
-
+        WERROR werr;
+        TALLOC_CTX *tmp_ctx = talloc_new(msg_ctx);
+        if (tmp_ctx == NULL) {
+                return WERR_NOT_ENOUGH_MEMORY;
+        }
+
+        pjob = print_job_find(tmp_ctx, sharename, jobid);
         if (!pjob || !server_info) {
                 DEBUG(10, ("print_job_pause: no pjob or user for jobid %u\n",
                         (unsigned int)jobid ));
-                return False;
+                werr = WERR_INVALID_PARAM;
+                goto err_out;
         }
 
@@ -2351 +2446 @@
                 DEBUG(10, ("print_job_pause: not spooled or bad sysjob = %d for jobid %u\n",
                         (int)pjob->sysjob, (unsigned int)jobid ));
-                return False;
+                werr = WERR_INVALID_PARAM;
+                goto err_out;
         }
 
@@ -2367 +2463 @@
                 /* END_ADMIN_LOG */
 
-                *errcode = WERR_ACCESS_DENIED;
-                return False;
+                werr = WERR_ACCESS_DENIED;
+                goto err_out;
         }
 
@@ -2375 +2471 @@
 
         if (ret != 0) {
-                *errcode = WERR_INVALID_PARAM;
-                return False;
+                werr = WERR_INVALID_PARAM;
+                goto err_out;
         }
 
@@ -2388 +2484 @@
 
         /* how do we tell if this succeeded? */
-
-        return True;
+        werr = WERR_OK;
+err_out:
+        talloc_free(tmp_ctx);
+        return werr;
 }
 
@@ -2396 +2494 @@
 ****************************************************************************/
 
-bool print_job_resume(const struct auth_serversupplied_info *server_info,
+WERROR print_job_resume(const struct auth_serversupplied_info *server_info,
                       struct messaging_context *msg_ctx,
-                      int snum, uint32 jobid, WERROR *errcode)
+                      int snum, uint32 jobid)
 {
         const char *sharename = lp_const_servicename(snum);
@@ -2404 +2502 @@
         int ret;
         struct printif *current_printif = get_printer_fns( snum );
-
-        pjob = print_job_find(sharename, jobid);
-
+        WERROR werr;
+        TALLOC_CTX *tmp_ctx = talloc_new(msg_ctx);
+        if (tmp_ctx == NULL)
+                return WERR_NOT_ENOUGH_MEMORY;
+
+        pjob = print_job_find(tmp_ctx, sharename, jobid);
         if (!pjob || !server_info) {
                 DEBUG(10, ("print_job_resume: no pjob or user for jobid %u\n",
                         (unsigned int)jobid ));
-                return False;
+                werr = WERR_INVALID_PARAM;
+                goto err_out;
         }
 
@@ -2416 +2518 @@
                 DEBUG(10, ("print_job_resume: not spooled or bad sysjob = %d for jobid %u\n",
                         (int)pjob->sysjob, (unsigned int)jobid ));
-                return False;
+                werr = WERR_INVALID_PARAM;
+                goto err_out;
         }
 
@@ -2423 +2526 @@
                                 JOB_ACCESS_ADMINISTER)) {
                 DEBUG(3, ("resume denied by security descriptor\n"));
-                *errcode = WERR_ACCESS_DENIED;
 
                 /* BEGIN_ADMIN_LOG */
@@ -2432 +2534 @@
                               lp_printername(snum) );
                 /* END_ADMIN_LOG */
-                return False;
+                werr = WERR_ACCESS_DENIED;
+                goto err_out;
         }
 
@@ -2438 +2541 @@
 
         if (ret != 0) {
-                *errcode = WERR_INVALID_PARAM;
-                return False;
+                werr = WERR_INVALID_PARAM;
+                goto err_out;
         }
 
@@ -2450 +2553 @@
                           JOB_STATUS_QUEUED);
 
-        return True;
+        werr = WERR_OK;
+err_out:
+        talloc_free(tmp_ctx);
+        return werr;
 }
 
@@ -2464 +2570 @@
         ssize_t return_code;
         struct printjob *pjob;
-
-        pjob = print_job_find(sharename, jobid);
-
-        if (!pjob)
+        TALLOC_CTX *tmp_ctx = talloc_new(ev);
+        if (tmp_ctx == NULL) {
                 return -1;
+        }
+
+        pjob = print_job_find(tmp_ctx, sharename, jobid);
+        if (!pjob) {
+                return_code = -1;
+                goto err_out;
+        }
+
         /* don't allow another process to get this info - it is meaningless */
-        if (pjob->pid != sys_getpid())
-                return -1;
+        if (pjob->pid != sys_getpid()) {
+                return_code = -1;
+                goto err_out;
+        }
 
         /* if SMBD is spooling this can't be allowed */
         if (pjob->status == PJOB_SMBD_SPOOLING) {
-                return -1;
+                return_code = -1;
+                goto err_out;
         }
 
         return_code = write_data(pjob->fd, buf, size);
-
-        if (return_code>0) {
+        if (return_code > 0) {
                 pjob->size += size;
                 pjob_store(ev, msg_ctx, sharename, jobid, pjob);
         }
+err_out:
+        talloc_free(tmp_ctx);
         return return_code;
 }
@@ -2763 +2879 @@
 
         slprintf(pjob->filename, sizeof(pjob->filename)-1,
-                 "%s/%s%.8u.XXXXXX", lp_pathname(snum),
-                 PRINT_SPOOL_PREFIX, (unsigned int)jobid);
+                 "%s/%sXXXXXX", lp_pathname(snum), PRINT_SPOOL_PREFIX);
         pjob->fd = mkstemp(pjob->filename);
 
@@ -2830 +2945 @@
 
         pjob.pid = sys_getpid();
+        pjob.jobid = jobid;
         pjob.sysjob = -1;
         pjob.fd = -1;
@@ -2894 +3010 @@
         const char* sharename = lp_const_servicename(snum);
         struct printjob *pjob;
-
-        pjob = print_job_find(sharename, jobid);
-        if (!pjob)
+        TALLOC_CTX *tmp_ctx = talloc_new(msg_ctx);
+        if (tmp_ctx == NULL) {
                 return;
+        }
+
+        pjob = print_job_find(tmp_ctx, sharename, jobid);
+        if (!pjob) {
+                goto err_out;
+        }
         /* don't allow another process to get this info - it is meaningless */
-        if (pjob->pid != sys_getpid())
-                return;
+        if (pjob->pid != sys_getpid()) {
+                goto err_out;
+        }
 
         pjob->page_count++;
         pjob_store(server_event_context(), msg_ctx, sharename, jobid, pjob);
+err_out:
+        talloc_free(tmp_ctx);
 }
 
@@ -2919 +3043 @@
         int ret;
         SMB_STRUCT_STAT sbuf;
-        struct printif *current_printif = get_printer_fns( snum );
+        struct printif *current_printif = get_printer_fns(snum);
         NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
-
-        pjob = print_job_find(sharename, jobid);
-
+        char *lpq_cmd;
+        TALLOC_CTX *tmp_ctx = talloc_new(msg_ctx);
+        if (tmp_ctx == NULL) {
+                return NT_STATUS_NO_MEMORY;
+        }
+
+        pjob = print_job_find(tmp_ctx, sharename, jobid);
         if (!pjob) {
-                return NT_STATUS_PRINT_CANCELLED;
+                status = NT_STATUS_PRINT_CANCELLED;
+                goto err_out;
         }
 
         if (pjob->spooled || pjob->pid != sys_getpid()) {
-                return NT_STATUS_ACCESS_DENIED;
+                status = NT_STATUS_ACCESS_DENIED;
+                goto err_out;
         }
 
@@ -2983 +3113 @@
         }
 
-        ret = (*(current_printif->job_submit))(snum, pjob);
-
+        /* don't strip out characters like '$' from the printername */
+        lpq_cmd = talloc_string_sub2(tmp_ctx,
+                                     lp_lpqcommand(snum),
+                                     "%p",
+                                     lp_printername(snum),
+                                     false, false, false);
+        if (lpq_cmd == NULL) {
+                status = NT_STATUS_PRINT_CANCELLED;
+                goto fail;
+        }
+        lpq_cmd = talloc_sub_advanced(tmp_ctx,
+                                      lp_servicename(snum),
+                                      current_user_info.unix_name,
+                                      "",
+                                      current_user.ut.gid,
+                                      get_current_username(),
+                                      current_user_info.domain,
+                                      lpq_cmd);
+        if (lpq_cmd == NULL) {
+                status = NT_STATUS_PRINT_CANCELLED;
+                goto fail;
+        }
+
+        ret = (*(current_printif->job_submit))(snum, pjob,
+                                               current_printif->type, lpq_cmd);
         if (ret) {
                 status = NT_STATUS_PRINT_CANCELLED;
@@ -3009 +3162 @@
         unlink(pjob->filename);
         pjob_delete(server_event_context(), msg_ctx, sharename, jobid);
+err_out:
+        talloc_free(tmp_ctx);
         return status;
 }
@@ -3031 +3186 @@
         bool ret = False;
         const char* sharename = lp_servicename(snum);
+        TALLOC_CTX *tmp_ctx = talloc_new(msg_ctx);
+        if (tmp_ctx == NULL) {
+                return false;
+        }
 
         /* make sure the database is up to date */
@@ -3080 +3239 @@
                                 queue[i].fs_user,
                                 queue[i].fs_file);
-                queue[i].job = qjob;
+                queue[i].sysjob = qjob;
                 queue[i].size = qsize;
                 queue[i].page_count = qpage_count;
@@ -3097 +3256 @@
                 jobid = IVAL(cgdata.dptr, i*4);
                 DEBUG(5,("get_stored_queue_info: added job = %u\n", (unsigned int)jobid));
-                pjob = print_job_find(lp_const_servicename(snum), jobid);
+                pjob = print_job_find(tmp_ctx, lp_const_servicename(snum), jobid);
                 if (!pjob) {
                         DEBUG(5,("get_stored_queue_info: failed to find added job = %u\n", (unsigned int)jobid));
@@ -3104 +3263 @@
                 }
 
-                queue[total_count].job = jobid;
+                queue[total_count].sysjob = jobid;
                 queue[total_count].size = pjob->size;
                 queue[total_count].page_count = pjob->page_count;
@@ -3113 +3272 @@
                 fstrcpy(queue[total_count].fs_file, pjob->jobname);
                 total_count++;
+                talloc_free(pjob);
         }
 
@@ -3122 +3282 @@
 
                 for (j = 0; j < total_count; j++) {
-                        if (queue[j].job == jobid) {
+                        if (queue[j].sysjob == jobid) {
                                 found = true;
                                 break;
@@ -3134 +3294 @@
                                  (unsigned int) jobid));
 
-                        pjob = print_job_find(sharename, jobid);
+                        pjob = print_job_find(tmp_ctx, sharename, jobid);
                         if (pjob == NULL) {
                                 DEBUG(5,("get_stored_queue_info: failed to find "
@@ -3143 +3303 @@
                         }
 
-                        queue[j].job = jobid;
+                        queue[j].sysjob = jobid;
                         queue[j].size = pjob->size;
                         queue[j].page_count = pjob->page_count;
@@ -3151 +3311 @@
                         fstrcpy(queue[j].fs_user, pjob->user);
                         fstrcpy(queue[j].fs_file, pjob->jobname);
+                        talloc_free(pjob);
 
                         DEBUG(5,("get_stored_queue_info: updated queue[%u], jobid: %u, jobname: %s\n",
@@ -3178 +3339 @@
         SAFE_FREE(data.dptr);
         SAFE_FREE(cgdata.dptr);
+        talloc_free(tmp_ctx);
         return ret;
 }
@@ -3345 +3507 @@
         for (i=0;i<njobs;i++) {
                 bool owner = is_owner(server_info, lp_const_servicename(snum),
-                                      queue[i].job);
+                                      queue[i].sysjob);
 
                 if (owner || can_job_admin) {
                         print_job_delete1(server_event_context(), msg_ctx,
-                                          snum, queue[i].job);
+                                          snum, queue[i].sysjob);
                 }
         }

trunk/server/source3/printing/printspoolss.c

@@ -83 +83 @@
         }
 
-        /* Ok, now we have to open an actual file.
+        /*
+         * Ok, now we have to open an actual file.
          * Here is the reason:
          * We want to write the spool job to this file in
@@ -93 +94 @@
          * take over once we call EndDocPrinter().
          * Of course we will not start writing until
-         * StartDocPrinter() actually gives the ok. */
-
-        pf->filename = talloc_asprintf(pf, "%s/%s.XXXXXX",
+         * StartDocPrinter() actually gives the ok.
+         * smbd spooler files do not include a print jobid
+         * path component, as the jobid is only known after
+         * calling StartDocPrinter().
+         */
+
+        pf->filename = talloc_asprintf(pf, "%s/%sXXXXXX",
                                         lp_pathname(SNUM(fsp->conn)),
                                         PRINT_SPOOL_PREFIX);
@@ -140 +145 @@
         status = dcerpc_spoolss_OpenPrinter(b, pf, pf->svcname,
                                             "RAW", devmode_ctr,
-                                            SEC_FLAG_MAXIMUM_ALLOWED,
+                                            PRINTER_ACCESS_USE,
                                             &pf->handle, &werr);
         if (!NT_STATUS_IS_OK(status)) {

trunk/server/source3/printing/tests/vlp.c

@@ -238 +238 @@
         slprintf(job.jobname, sizeof(job.jobname) - 1, "%s", argv[2]);
 
-        if (!(pw = getpwuid(getuid()))) {
+        if (!(pw = getpwuid(geteuid()))) {
+                printf("getpwuid failed\n");
                 return 1;
         }