Remove DestControls cruft. OK Patrice.

diff --git a/config/class1 b/config/class1
index 90887ea19b453a7572cabc90da6993cbb43ca874..23ba1f145c82e4ce8db5ee8079ad95f1b7559981 100644 (file)
--- a/config/class1
+++ b/config/class1
@@ -54,7 +54,6 @@
 #MaxSendPages:         25              # max pages in an outbound job
 #MaxRecvPages:         25              # max pages in an inbound job
 #ContCoverPage:                etc/cover.templ # enable continuation cover pages
-#DestControls:         etc/destcontrols # destination-specific controls
 #MaxConcurrentCalls:   1               # serialize jobs to the same dest
 #TimeOfDay:            "Any"           # outbound jobs any day, any time
 # END-SERVER

diff --git a/config/class1.0 b/config/class1.0
index 6a2627f3172ea9bf6565b84e839eab8b899ad9ca..c024d306ea551cb02a31a07e032510cfb0a56598 100644 (file)
--- a/config/class1.0
+++ b/config/class1.0
@@ -54,7 +54,6 @@
 #MaxSendPages:         25              # max pages in an outbound job
 #MaxRecvPages:         25              # max pages in an inbound job
 #ContCoverPage:                etc/cover.templ # enable continuation cover pages
-#DestControls:         etc/destcontrols # destination-specific controls
 #MaxConcurrentCalls:   1               # serialize jobs to the same dest
 #TimeOfDay:            "Any"           # outbound jobs any day, any time
 # END-SERVER

diff --git a/config/class2 b/config/class2
index d5649fc9ccb73a071530c7f23774fd175f851137..69780e4fbf2847a7136527c6bfdea7d4cbc6ca1a 100644 (file)
--- a/config/class2
+++ b/config/class2
@@ -55,7 +55,6 @@
 #MaxSendPages:         25              # max pages in an outbound job
 #MaxRecvPages:         25              # max pages in an inbound job
 #ContCoverPage:                etc/cover.templ # enable continuation cover pages
-#DestControls:         etc/destcontrols # destination-specific controls
 #MaxConcurrentCalls:   1               # serialize jobs to the same dest
 #TimeOfDay:            "Any"           # outbound jobs any day, any time
 # END-SERVER

diff --git a/config/class2.0 b/config/class2.0
index 9e174467af2330dc8f143f8cd16b158a452233bb..351c859e5ac19826dacd3144e6f18e2dfd3e6ca7 100644 (file)
--- a/config/class2.0
+++ b/config/class2.0
@@ -55,7 +55,6 @@
 #MaxSendPages:         25              # max pages in an outbound job
 #MaxRecvPages:         25              # max pages in an inbound job
 #ContCoverPage:                etc/cover.templ # enable continuation cover pages
-#DestControls:         etc/destcontrols # destination-specific controls
 #MaxConcurrentCalls:   1               # serialize jobs to the same dest
 #TimeOfDay:            "Any"           # outbound jobs any day, any time
 # END-SERVER

diff --git a/config/class2.1 b/config/class2.1
index 19c25e6f97c3a65ae176cd73e10d3b3e99d60b96..ba1ab46d8795fabc7775b41b8375fd5d412fdf85 100644 (file)
--- a/config/class2.1
+++ b/config/class2.1
@@ -55,7 +55,6 @@
 #MaxSendPages:         25              # max pages in an outbound job
 #MaxRecvPages:         25              # max pages in an inbound job
 #ContCoverPage:                etc/cover.templ # enable continuation cover pages
-#DestControls:         etc/destcontrols # destination-specific controls
 #MaxConcurrentCalls:   1               # serialize jobs to the same dest
 #TimeOfDay:            "Any"           # outbound jobs any day, any time
 # END-SERVER

diff --git a/config/skel b/config/skel
index 0700cc990213c4c2477effa0e78177544c9147e3..41be18849a011e467e286c4a35427b431a2dd186 100644 (file)
--- a/config/skel
+++ b/config/skel
@@ -53,7 +53,6 @@ PostScriptTimeout:    300             # 5 minute timeout on PostScript jobs
 MaxSendPages:          25              # max pages in an outbound job
 MaxRecvPages:          25              # max pages in an inbound job
 ContCoverPage:         etc/cover.templ # enable continuation cover pages
-DestControls:          etc/destcontrols # destination-specific controls
 MaxConcurrentCalls:    1               # serialize jobs to the same dest
 TimeOfDay:             "Any"           # outbound jobs any day, any time
 # END-SERVER

diff --git a/debian/hylafax.config b/debian/hylafax.config
index 5f4433423292615dc80e4b737c4170a18d11b075..9716f6bb89f118c4f03781aaa56aa4dd9d3984d0 100644 (file)
--- a/debian/hylafax.config
+++ b/debian/hylafax.config
@@ -1,5 +1,4 @@
 #ContCoverPage:         "etc/cover.templ"
-#DestControls:         "etc/destctrls"
 #DialStringRules:       "etc/dialrules"
 #QualifyCID:           "etc/cid"
 #QualifyTSI:           "etc/tsi"

diff --git a/debian/minimal.config b/debian/minimal.config
index 5f4433423292615dc80e4b737c4170a18d11b075..9716f6bb89f118c4f03781aaa56aa4dd9d3984d0 100644 (file)
--- a/debian/minimal.config
+++ b/debian/minimal.config
@@ -1,5 +1,4 @@
 #ContCoverPage:         "etc/cover.templ"
-#DestControls:         "etc/destctrls"
 #DialStringRules:       "etc/dialrules"
 #QualifyCID:           "etc/cid"
 #QualifyTSI:           "etc/tsi"

diff --git a/distrules b/distrules
index f7110c72e27d2b00f931f4d55c1b7d1c389bce53..f6b2cd3b5d9e740e5e1f7e332dab64381c3c07db 100644 (file)
--- a/distrules
+++ b/distrules
@@ -511,7 +511,6 @@ HYLAFAXSRC=\
 MANPAGES=\
     man/Makefile.in                            \
        man/hylafax-config.4f                   \
-       man/destctrls.4f                        \
        man/dialrules.4f                        \
        man/cqtest.1m                           \
        man/choptest.1m                         \

diff --git a/etc/faxaddmodem.sh.in b/etc/faxaddmodem.sh.in
index e2c71a00171e87173be28effeb0845252dbc3bfb..235a56d4a6e97c1b3928ec52d61dc0787665cb94 100644 (file)
--- a/etc/faxaddmodem.sh.in
+++ b/etc/faxaddmodem.sh.in
@@ -1800,7 +1800,6 @@ RequiredSchedulerParameters="
 OptionalSchedulerParameters="
     ContCoverPage
     ContCoverCmd
-    DestControls
     MaxConcurrentCalls
     MaxDials
     MaxSendPages
@@ -1817,7 +1816,6 @@ OptionalSchedulerParameters="
 "
 defaultContCoverPage=
 defaultContCoverCmd=\"bin/mkcover\"
-defaultDestControls=
 defaultMaxConcurrentCalls=1
 defaultMaxDials=12
 defaultMaxSendPages=0xffffffff
@@ -1989,8 +1987,6 @@ C#        MaxConcurrentCalls      \
        Maximum number of concurrent jobs to a destination
 S      ModemGroup              Define a group of modems
 S      TimeOfDay               Time of day restrictions for outbound jobs
-S      DestControls            \
-       Pathname of destination controls file (relative to $SPOOL)
 C#     UUCPLockTimeout         \
        Timeout before purging a stale UUCP lock file (secs)
 C#     MaxSendPages            Max number of pages to permit in an outbound job
@@ -1999,9 +1995,6 @@ EOF
        . $PROMPTS
     fi
     checkForLocalFile $DialStringRules "dial string rules"
-    if [ "$DestControls" != "" ] && [ "$DestControls" != '""' ]; then
-       checkForLocalFile $DestControls "destination controls";
-    fi
     printSchedulerConfig; prompt "Are these ok [yes]?"; read ok
 done
 

diff --git a/etc/faxsetup.sh.in b/etc/faxsetup.sh.in
index d38ef60303bf421688ab84770715138e90e06792..638d6c3be9303e3ae05e5da40a211ed5d7fa9745 100644 (file)
--- a/etc/faxsetup.sh.in
+++ b/etc/faxsetup.sh.in
@@ -718,7 +718,6 @@ EOF
     defaultServerTracing=1
     defaultContCoverPage=
     defaultContCoverCmd=\"bin/mkcover\"
-    defaultDestControls=
     defaultMaxConcurrentCalls=1
     defaultMaxDials=12
     defaultMaxSendPages=0xffffffff
@@ -2087,7 +2086,6 @@ RequiredSchedulerParameters="
 OptionalSchedulerParameters="
     ContCoverPage
     ContCoverCmd
-    DestControls
     MaxConcurrentCalls
     MaxDials
     MaxSendPages
@@ -2220,8 +2218,6 @@ C#        MaxConcurrentCalls      \
        Maximum number of concurrent jobs to a destination
 S      ModemGroup              Define a group of modems
 S      TimeOfDay               Time of day restrictions for outbound jobs
-S      DestControls            \
-       Pathname of destination controls file (relative to $DIR_SPOOL)
 C#     UUCPLockTimeout         \
        Timeout before purging a stale UUCP lock file (secs)
 C#     MaxSendPages            Max number of pages to permit in an outbound job
@@ -2231,9 +2227,6 @@ EOF
                . $PROMPTS
            fi
            checkForLocalFile $DialStringRules "dial string rules"
-           if [ "$DestControls" != "" ] && [ "$DestControls" != '""' ]; then
-               checkForLocalFile $DestControls "destination controls";
-           fi
            printSchedulerConfig; prompt "Are these ok [yes]?"; read ok
            isOK "$ok" && break
        done

diff --git a/man/Makefile.in b/man/Makefile.in
index a56b11614caa44930d6a9331922238939ad185a2..41734851e8a1493255bf319f220f3ed4ac8fe8d6 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -206,7 +206,6 @@ sman.apps/wedged.1m::       ${SRCDIR}/wedged.1m;    ${MANCVT}
 sman.apps/xferfaxstats.1m:: ${SRCDIR}/xferfaxstats.1m; ${MANCVT}
 sman.files/hylafax-server.4f:: ${SRCDIR}/hylafax-server.4f;    ${MANCVT}
 sman.files/hylafax-config.4f:: ${SRCDIR}/hylafax-config.4f;    ${MANCVT}
-sman.files/destctrls.4f:: ${SRCDIR}/destctrls.4f; ${MANCVT}
 sman.files/doneq.4f::  ${SRCDIR}/doneq.4f;     ${MANCVT}
 sman.files/dialrules.4f:: ${SRCDIR}/dialrules.4f; ${MANCVT}
 sman.files/hosts.hfaxd.4f::    ${SRCDIR}/hosts.hfaxd.4f;       ${MANCVT}

diff --git a/man/hylafax-server.4f b/man/hylafax-server.4f
index 58015bbbbffb991b48a0698a158f57b0310c17a2..bab6cc723a58a0e4b56a956af1e9ce388ec26c03 100644 (file)
--- a/man/hylafax-server.4f
+++ b/man/hylafax-server.4f
@@ -267,22 +267,6 @@ is to be permitted.
 For more information consult
 .IR hosts.hfaxd (${MANNUM4_5}).
 .PP
-There are a number of controls on outbound calls that can be
-specified using the
-.B etc/destcontrols
-file (or whatever file is specified in a
-.B DestControls
-configuration parameter in the
-.I faxq
-configuration file).
-This file, described in
-.IR destctrls (${MANNUM4_5}),
-allows an administrator to restrict calls by phone number
-and to control the time of day that calls may be placed.
-In addition, operational parameters such as the maximum number
-of pages in a facsimile transmission can be constrained
-on a per-destination basis.
-.PP
 If an error is encountered during transmission and a subsequent
 retransmission would not include the original cover page, then
 \*(Fx can be configured to generate a

diff --git a/pkg/sproto.stub.in b/pkg/sproto.stub.in
index 5a60f46c3fe3d4c527b0314294469e7405c4e2bd..f011fc35aba9124828c7c17f479107b36206933a 100644 (file)
--- a/pkg/sproto.stub.in
+++ b/pkg/sproto.stub.in
@@ -74,7 +74,6 @@ d man @MANDIR@/man4 ? ? ?
 f man @MANDIR@/man4/pagesizes.@MANNUM4_5@=../man/cman.files/pagesizes.4f 0444 @SYSUID@ @SYSGID@
 f man @MANDIR@/man4/typerules.@MANNUM4_5@=../man/cman.files/typerules.4f 0444 @SYSUID@ @SYSGID@
 f man @MANDIR@/man4/hylafax-config.@MANNUM4_5@=../man/sman.files/hylafax-config.4f 0444 @SYSUID@ @SYSGID@
-f man @MANDIR@/man4/destctrls.@MANNUM4_5@=../man/sman.files/destctrls.4f 0444 @SYSUID@ @SYSGID@
 f man @MANDIR@/man4/dialrules.@MANNUM4_5@=../man/sman.files/dialrules.4f 0444 @SYSUID@ @SYSGID@
 f man @MANDIR@/man4/doneq.@MANNUM4_5@=../man/sman.files/doneq.4f 0444 @SYSUID@ @SYSGID@
 f man @MANDIR@/man4/hosts.hfaxd.@MANNUM4_5@=../man/sman.files/hosts.hfaxd.4f 0444 @SYSUID@ @SYSGID@