The default PageLogFormat value had the username and job ID swapped from CUPS

1.3.x (STR #3727)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@9421 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.4.txt b/CHANGES-1.4.txt
index a4f368644edc811071f9dffb2ed359c4ca1c3637..304806fe3028ecfd8f7bd0b5709ea60553f0137c 100644 (file)
--- a/CHANGES-1.4.txt
+++ b/CHANGES-1.4.txt
@@ -4,6 +4,8 @@ CHANGES-1.4.txt
 CHANGES IN CUPS V1.4.7
 
        - Documentation changes (STR #3720)
+       - The default PageLogFormat value had the username and job ID swapped
+         from CUPS 1.3.x (STR #3727)
        - The web interface did not allow setting of a default custom page size
          (STR #3707)
        - The scheduler could crash if a browsed printer times out while a job

diff --git a/doc/help/ref-cupsd-conf.html.in b/doc/help/ref-cupsd-conf.html.in
index 9114c489c9f9aff4edb62d94c576f764c834d6a0..c4593ee669b8454abc445f37083efc9b2dd71d2d 100644 (file)
--- a/doc/help/ref-cupsd-conf.html.in
+++ b/doc/help/ref-cupsd-conf.html.in
@@ -2372,8 +2372,8 @@ information to the system log instead of a plain file.</P>
 <H3>Examples</H3>
 
 <PRE CLASS="command">
-PageLogFormat %p %j %u %T %P %C %{job-billing} %{job-originating-host-name} %{job-name} %{media} %{sides}
-PageLogFormat PAGE %p %j %u %P %C %{job-billing} %{job-originating-host-name}
+PageLogFormat %p %u %j %T %P %C %{job-billing} %{job-originating-host-name} %{job-name} %{media} %{sides}
+PageLogFormat PAGE %p %u %j %P %C %{job-billing} %{job-originating-host-name}
 </PRE>
 
 <H3>Description</H3>
@@ -2406,7 +2406,7 @@ recognized:</P>
 
 </UL>
 
-<P>The default is "%p %j %u %T %P %C %{job-billing} %{job-originating-host-name} %{job-name} %{media} %{sides}".</P>
+<P>The default is "%p %u %j %T %P %C %{job-billing} %{job-originating-host-name} %{job-name} %{media} %{sides}".</P>
 
 
 <H2 CLASS="title"><SPAN CLASS="info">CUPS 1.2/Mac OS X 10.5</SPAN><A NAME="PassEnv">PassEnv</A></H2>

diff --git a/scheduler/conf.c b/scheduler/conf.c
index 5acb0900afa2c62dbb6fb122cee372dff81014dd..9ead1e03512bf12bc97fae9d1f4122b648e6398b 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -495,7 +495,7 @@ cupsdReadConfiguration(void)
   cupsdSetString(&ErrorLog, CUPS_LOGDIR "/error_log");
   cupsdSetString(&PageLog, CUPS_LOGDIR "/page_log");
   cupsdSetString(&PageLogFormat,
-                 "%p %j %u %T %P %C %{job-billing} "
+                 "%p %u %j %T %P %C %{job-billing} "
                 "%{job-originating-host-name} %{job-name} %{media} %{sides}");
   cupsdSetString(&Printcap, CUPS_DEFAULT_PRINTCAP);
   cupsdSetString(&PrintcapGUI, "/usr/bin/glpoptions");