Mirror fix from trunk.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.7@11932 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES.txt b/CHANGES.txt
index 7f62ee941fffd900c264bdeec8a585cb84d86813..255ca97956cecd8a057f00b31dbf58537fe8bc18 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-CHANGES.txt - 1.7.4 - 2014-06-10
+CHANGES.txt - 1.7.4 - 2014-06-16
 --------------------------------
 
 CHANGES IN CUPS V1.7.4
@@ -10,6 +10,7 @@ CHANGES IN CUPS V1.7.4
          environment variable (STR #4426)
        - The web interface now properly shows a "Go" button for all text-based
          browsers (STR #4425)
+       - The MaxJobTime directive now properly supports time values (STR #4434)
 
 
 CHANGES IN CUPS V1.7.3

diff --git a/scheduler/conf.c b/scheduler/conf.c
index 891abd1c58d9d1da2fe82b3a45869564d857a48f..50bd75b878d2313a24214543c9a4e79f416bf0d3 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -104,7 +104,7 @@ static const cupsd_var_t    cupsd_vars[] =
   { "MaxJobs",                 &MaxJobs,               CUPSD_VARTYPE_INTEGER },
   { "MaxJobsPerPrinter",       &MaxJobsPerPrinter,     CUPSD_VARTYPE_INTEGER },
   { "MaxJobsPerUser",          &MaxJobsPerUser,        CUPSD_VARTYPE_INTEGER },
-  { "MaxJobTime",              &MaxJobTime,            CUPSD_VARTYPE_INTEGER },
+  { "MaxJobTime",              &MaxJobTime,            CUPSD_VARTYPE_TIME },
   { "MaxLeaseDuration",                &MaxLeaseDuration,      CUPSD_VARTYPE_TIME },
   { "MaxLogSize",              &MaxLogSize,            CUPSD_VARTYPE_INTEGER },
   { "MaxRequestSize",          &MaxRequestSize,        CUPSD_VARTYPE_INTEGER },