diff options
| author |   dlg <dlg@openbsd.org> | 2020-01-23 03:01:22 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2020-01-23 03:01:22 +0000 |
| commit | 35db17bc330bb86816b85e1d57b49507f5733285 (patch) | |
| tree | e5aa9aa0451f0d916e0cf442f024d18a9604dccb /usr.sbin/npppd | |
| parent | Use information from nvmem (provided by sxisid(4)) to calibrate the (diff) | |
| download | wireguard-openbsd-35db17bc330bb86816b85e1d57b49507f5733285.tar.xz wireguard-openbsd-35db17bc330bb86816b85e1d57b49507f5733285.zip | |
use pppac(4) instead of tun(4)
Diffstat (limited to 'usr.sbin/npppd')
| -rw-r--r-- | usr.sbin/npppd/npppd/npppd.conf | 8 | ||||
| -rw-r--r-- | usr.sbin/npppd/npppd/npppd.conf.5 | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/usr.sbin/npppd/npppd/npppd.conf b/usr.sbin/npppd/npppd/npppd.conf index f4d52ff817c..df65d494fc6 100644 --- a/usr.sbin/npppd/npppd/npppd.conf +++ b/usr.sbin/npppd/npppd/npppd.conf @@ -1,4 +1,4 @@ -# $OpenBSD: npppd.conf,v 1.2 2014/03/22 04:32:39 yasuoka Exp $ +# $OpenBSD: npppd.conf,v 1.3 2020/01/23 03:01:22 dlg Exp $ # sample npppd configuration file. see npppd.conf(5) authentication LOCAL type local { @@ -27,6 +27,6 @@ ipcp IPCP { interface pppx0 address 10.0.0.1 ipcp IPCP bind tunnel from L2TP authenticated by LOCAL to pppx0 -# use tun(4) interface. multiple ppp sessions concentrate one interface. -#interface tun0 address 10.0.0.1 ipcp IPCP -#bind tunnel from L2TP authenticated by LOCAL to tun0 +# use pppac(4) interface. multiple ppp sessions concentrated on one interface. +#interface pppac0 address 10.0.0.1 ipcp IPCP +#bind tunnel from L2TP authenticated by LOCAL to pppac0 diff --git a/usr.sbin/npppd/npppd/npppd.conf.5 b/usr.sbin/npppd/npppd/npppd.conf.5 index a8e803a0839..77d51e77047 100644 --- a/usr.sbin/npppd/npppd/npppd.conf.5 +++ b/usr.sbin/npppd/npppd/npppd.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: npppd.conf.5,v 1.24 2019/04/08 18:02:48 jmc Exp $ +.\" $OpenBSD: npppd.conf.5,v 1.25 2020/01/23 03:01:22 dlg Exp $ .\" .\" Copyright (c) 2012 YASUOKA Masahiko <yasuoka@openbsd.org> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: April 8 2019 $ +.Dd $Mdocdate: January 23 2020 $ .Dt NPPPD.CONF 5 .Os .Sh NAME @@ -522,7 +522,7 @@ setting is described below: .Ic interface Ar ifname Ic address Ar address Ic ipcp Ar ipcp .Pp Use -.Xr tun 4 +.Xr pppac 4 or .Xr pppx 4 and @@ -670,8 +670,8 @@ ipcp IPCP { pool-address 10.0.0.2-10.0.0.254 dns-servers 8.8.8.8 } -interface tun0 address 10.0.0.1 ipcp IPCP -interface tun1 address 10.0.0.1 ipcp IPCP +interface pppac0 address 10.0.0.1 ipcp IPCP +interface pppac1 address 10.0.0.1 ipcp IPCP authentication RADIUS type radius { username-suffix "@example.com" authentication-server { @@ -685,13 +685,13 @@ authentication LOCAL type local { username-suffix "@local" users-file "/etc/npppd/npppd-users" } -bind tunnel from L2TP authenticated by RADIUS to tun0 -bind tunnel from L2TP authenticated by LOCAL to tun1 +bind tunnel from L2TP authenticated by RADIUS to pppac0 +bind tunnel from L2TP authenticated by LOCAL to pppac1 .Ed .Sh SEE ALSO .Xr pipex 4 , +.Xr pppac 4 , .Xr pppx 4 , -.Xr tun 4 , .Xr npppctl 8 , .Xr npppd 8 , .Xr sysctl 8 |