[Bug 151] - minor fixes... typos?

JOBREQ_PROTO wasn't being used... instead it was using JOBREQ_OTHER
Applied Lee's patch after he pruned the extraneous bit out for me ;-)

diff --git a/etc/faxaddmodem.sh.in b/etc/faxaddmodem.sh.in
index bf913952ae61ba067f8ea3af5da1a3fcf15e873f..93877380d98ce506d36de4976b3b9acb39eae055 100644 (file)
--- a/etc/faxaddmodem.sh.in
+++ b/etc/faxaddmodem.sh.in
@@ -431,13 +431,13 @@ defaultRingsBeforeAnswer=0
 defaultSpeakerVolume=quiet
 defaultGettyArgs=\"\"
 defaultQualifyTSI=\"\"
-defaultJobReqBusy=300
-defaultJobReqNoCarrier=900
-defaultJobReqNoAnswer=900
-defaultJobReqNoFConn=900
-defaultJobReqDataConn=900
+defaultJobReqBusy=180
+defaultJobReqNoCarrier=300
+defaultJobReqNoAnswer=300
+defaultJobReqNoFConn=300
+defaultJobReqDataConn=300
 defaultJobReqProto=60
-defaultJobReqOther=900
+defaultJobReqOther=300
 defaultPollModemWait=30
 defaultPollLockWait=30
 defaultTagLineFont=\"\"

diff --git a/faxd/ServerConfig.c++ b/faxd/ServerConfig.c++
index 6e740bb09052d82468c1bb3d349cbdc8ffa6b035..e269a877acd2db8db0e890e9bfc8fc1abb4c5d48 100644 (file)
--- a/faxd/ServerConfig.c++
+++ b/faxd/ServerConfig.c++
@@ -90,7 +90,7 @@ const ServerConfig::S_numbertag ServerConfig::numbers[] = {
 { "servertracing",     &ServerConfig::tracingLevel,    FAXTRACE_SERVER },
 { "uucplocktimeout",   &ServerConfig::uucpLockTimeout, 0 },
 { "nocarrierretrys",   &ServerConfig::noCarrierRetrys, 1 },
-{ "jobreqproto",       &ServerConfig::requeueProto,    FAX_REQUEUE },
+{ "jobreqproto",       &ServerConfig::requeueProto,    FAX_REQPROTO },
 { "jobreqother",       &ServerConfig::requeueOther,    FAX_REQUEUE },
 { "pollmodemwait",     &ServerConfig::pollModemWait,   30 },
 { "polllockwait",      &ServerConfig::pollLockWait,    30 },