aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2016-06-01 20:44:28 +0000
committerGlen Barber <gjb@FreeBSD.org>2016-06-01 20:44:28 +0000
commitea580d0b45f1ab5573c1fc1221a1b1629ef9fa49 (patch)
treed5de5230db3fad21fe53ad39c087cff6f8737235 /usr.sbin
parente5f0191f20b638d3a8cb605d53fea0c357ae716d (diff)
downloadsrc-ea580d0b45f1ab5573c1fc1221a1b1629ef9fa49.tar.gz
src-ea580d0b45f1ab5573c1fc1221a1b1629ef9fa49.zip
Revert r301137 and r301163, and implement a correct fix
for the CONFS issue with dma.conf and ppp.conf. Thank you very much to Bryan Drewery for looking into the problem and providing this fix. Pointyhat: gjb Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=301166
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/ppp/Makefile3
-rw-r--r--usr.sbin/ppp/ppp.conf37
2 files changed, 40 insertions, 0 deletions
diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile
index e0772af2e53e..1dcd3b571a05 100644
--- a/usr.sbin/ppp/Makefile
+++ b/usr.sbin/ppp/Makefile
@@ -21,6 +21,9 @@ PPP_NO_PAM=
PPP_NO_RADIUS=
PPP_NO_SUID=
.endif
+CONFS= ppp.conf
+CONFSDIR= ${CONFDIR}/ppp
+CONFSMODE= 600
.if ${MK_ATM} == "no"
PPP_NO_ATM=
diff --git a/usr.sbin/ppp/ppp.conf b/usr.sbin/ppp/ppp.conf
new file mode 100644
index 000000000000..2b63834839f9
--- /dev/null
+++ b/usr.sbin/ppp/ppp.conf
@@ -0,0 +1,37 @@
+#################################################################
+# PPP Sample Configuration File
+# Originally written by Toshiharu OHNO
+# Simplified 5/14/1999 by wself@cdrom.com
+#
+# See /usr/share/examples/ppp/ for some examples
+#
+# $FreeBSD$
+#################################################################
+
+default:
+ set log Phase Chat LCP IPCP CCP tun command
+ ident user-ppp VERSION
+
+ # Ensure that "device" references the correct serial port
+ # for your modem. (cuau0 = COM1, cuau1 = COM2)
+ #
+ set device /dev/cuau1
+
+ set speed 115200
+ set dial "ABORT BUSY ABORT NO\\sCARRIER TIMEOUT 5 \
+ \"\" AT OK-AT-OK ATE1Q0 OK \\dATDT\\T TIMEOUT 40 CONNECT"
+ set timeout 180 # 3 minute idle timer (the default)
+ enable dns # request DNS info (for resolv.conf)
+
+papchap:
+ #
+ # edit the next three lines and replace the items in caps with
+ # the values which have been assigned by your ISP.
+ #
+
+ set phone PHONE_NUM
+ set authname USERNAME
+ set authkey PASSWORD
+
+ set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.0 0.0.0.0
+ add default HISADDR # Add a (sticky) default route