Fix MaxJobTime time value bug (STR #4434)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11931 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/CHANGES-1.7.txt b/CHANGES-1.7.txt
index 51d57b6054fb48855035c5d6156073e38c6e1579..46172fe23de58cd43e363df690884ee9b3b6fc95 100644 (file)
--- a/CHANGES-1.7.txt
+++ b/CHANGES-1.7.txt
@@ -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 a07baaa450ac580b0b5e8685e27ef5636936bc7a..529900084b574b46a0cb385aea9142ba91ed9cee 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -108,7 +108,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 },