Disable JobControlCmd by default in faxq, as it can change batching

behaviour.

diff --git a/config.h.in b/config.h.in
index 72ccf4a0eeaca558a828f1dd074d3d93e1c8438f..fe37392888a8c8938ee2f9fe45d348a3f0796360 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -261,7 +261,6 @@
 #define FAX_TIFF2FAXCMD        FAX_BINDIR "/tiff2fax"  /* cmd to convert TIFF */
 #define        FAX_COVERCMD    FAX_BINDIR "/mkcover"   /* cmd to make cont coverpage */
 #define        FAX_WEDGEDCMD   FAX_BINDIR "/wedged"    /* cmd to handle wedged modem */
-#define        FAX_JOBCTRLCMD  FAX_BINDIR "/jcontrol"  /* cmd to handle job control*/
 
 /*
  * SNPP-related client-server definitions.

diff --git a/faxd/faxQueueApp.c++ b/faxd/faxQueueApp.c++
index 047276cafe0b29704d4c253963cda251a1ccb547..2776918a78d7934086e16d62b508bb06a7531607 100644 (file)
--- a/faxd/faxQueueApp.c++
+++ b/faxd/faxQueueApp.c++
@@ -3053,7 +3053,7 @@ faxQueueApp::stringtag faxQueueApp::strings[] = {
 { "senduucpcmd",       &faxQueueApp::sendUUCPCmd,
    FAX_LIBEXEC "/uucpsend" },
 { "wedgedcmd",         &faxQueueApp::wedgedCmd,        FAX_WEDGEDCMD },
-{ "jobcontrolcmd",     &faxQueueApp::jobCtrlCmd,       FAX_JOBCTRLCMD },
+{ "jobcontrolcmd",     &faxQueueApp::jobCtrlCmd,       "" },
 };
 faxQueueApp::numbertag faxQueueApp::numbers[] = {
 { "tracingmask",       &faxQueueApp::tracingMask,      // NB: must be first