From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Mon, 16 Jun 2014 16:10:58 +0000 (+0000)
Subject: Fix MaxJobTime time value bug (STR #4434)
X-Git-Tag: v2.2b1~602
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8f01dbcf477b919b6dd4eb458aa84eb1f79e967;p=thirdparty%2Fcups.git

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 51d57b6054..46172fe23d 100644
--- 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 a07baaa450..529900084b 100644
--- 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 },