[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  4050cc8 s3-printing: fix bug 9123 lprng job tracking errors
      from  0f14965 s3-smbd: Initialize the print backend after we setup winreg.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 4050cc8be25299514f7ebe609419f74aff8da423
Author: David Disseldorp <dd...@samba.org>
Date:   Tue Aug 28 18:58:24 2012 +0200

    s3-printing: fix bug 9123 lprng job tracking errors
    
    The lprng printing back-end is truncating the print job filename in the
    lpq output, which means that Samba is not able to determine the back-end
    job ID for a newly submitted print job.
    Remove the unneeded spoolss job ID from the print job file name to
    ensure the job filename is not truncated. Also log these warnings at a
    higher log level.

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

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


Changeset truncated at 500 lines:

diff --git a/source3/printing/print_generic.c b/source3/printing/print_generic.c
index aac3892..7a7cd3b 100644
--- a/source3/printing/print_generic.c
+++ b/source3/printing/print_generic.c
@@ -288,7 +288,7 @@ static int generic_job_submit(int snum, struct printjob 
*pjob,
                ret = 0;
        }
        if (pjob->sysjob == -1) {
-               DEBUG(0, ("failed to get sysjob for job %u (%s), tracking as "
+               DEBUG(2, ("failed to get sysjob for job %u (%s), tracking as "
                          "Unix job\n", pjob->jobid, jobname));
        }
 
diff --git a/source3/printing/printing.c b/source3/printing/printing.c
index aa5b41d..ba73918 100644
--- a/source3/printing/printing.c
+++ b/source3/printing/printing.c
@@ -2843,8 +2843,7 @@ static WERROR print_job_spool_file(int snum, uint32_t 
jobid,
        }
 
        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);
 
        if (pjob->fd == -1) {


-- 
Samba Shared Repository