Add a directory in /var/run to store ppp(8) command sockets.

PR:		bin/29966
Approved by:	brian
MFC after:	4

7 files changed, 11 insertions, 7 deletions

diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist
index e8935c9..38561d0 100644
--- a/etc/mtree/BSD.var.dist
+++ b/etc/mtree/BSD.var.dist
@@ -58,6 +58,7 @@
     run
         named           uname=bind gname=bind
         ..
+        ppp             gname=network mode=0770
     ..
     rwho            gname=daemon	mode=0775
     ..
diff --git a/share/examples/ppp/ppp.conf.isdn b/share/examples/ppp/ppp.conf.isdn
index 16a276f..992dfe7 100644
--- a/share/examples/ppp/ppp.conf.isdn
+++ b/share/examples/ppp/ppp.conf.isdn
@@ -75,7 +75,7 @@ isdn:
  link * set mode auto			# Automatically manage the second link
  set autoload 10 80 30			# Down @10% usage, up at 80%, 30s sample
 
- set server /tmp/ppp-isdn "" 0177	# The diagnostic port (-rw-------)
+ set server /var/run/ppp/ppp-isdn "" 0177 # The diagnostic port (-rw-------)
 
 #
 # When phone calls become free (say 0:00 Saturday morning), we may want
diff --git a/share/examples/ppp/ppp.conf.sample b/share/examples/ppp/ppp.conf.sample
index cc196ba..d88c9eb 100644
--- a/share/examples/ppp/ppp.conf.sample
+++ b/share/examples/ppp/ppp.conf.sample
@@ -156,7 +156,7 @@ TA:
 
  set mru 1504			# Some extra room for the MP header
 
- set server /tmp/ppp-TA "" 0177	# The diagnostic port (-rw-------)
+ set server /var/run/ppp/ppp-TA "" 0177	# The diagnostic port (-rw-------)
 
 
 #                          Example segments
@@ -182,7 +182,7 @@ examples:
 # First, you must set up your control socket.  It's safest to use
 # a UNIX domain socket, and watch the permissions:
 #
-    set server /var/tmp/internet MySecretPassword 0177
+    set server /var/run/ppp/internet MySecretPassword 0177
 #
 # Although a TCP port may be used if you want to allow control
 # connections from other machines:
@@ -566,7 +566,7 @@ loop:
  set dial
  set login
  set ifaddr 127.0.0.2 127.0.0.3
- set server /var/tmp/loop "" 0177
+ set server /var/run/ppp/loop "" 0177
  
 loop-in:
  set timeout 0
diff --git a/share/examples/ppp/ppp.conf.span-isp.working b/share/examples/ppp/ppp.conf.span-isp.working
index 13fd31b..428c6a2 100644
--- a/share/examples/ppp/ppp.conf.span-isp.working
+++ b/share/examples/ppp/ppp.conf.span-isp.working
@@ -94,7 +94,7 @@ vpn-in:
   enable chap
   disable lqr
   set ifaddr 127.0.0.2 127.0.0.3
-  set server /var/tmp/vpn-in "" 0177
+  set server /var/run/ppp/vpn-in "" 0177
 
 
 isp-in-7:
diff --git a/share/examples/ppp/ppp.linkup.span-isp b/share/examples/ppp/ppp.linkup.span-isp
index 1d0cc9b..8768bea 100644
--- a/share/examples/ppp/ppp.linkup.span-isp
+++ b/share/examples/ppp/ppp.linkup.span-isp
@@ -14,4 +14,4 @@ ispN:
   !bg ppp -background vpnN vpn
 
 vpn:
-  set server /var/tmp/vpn "" 0177
+  set server /var/run/ppp/vpn "" 0177
diff --git a/share/examples/ppp/ppp.linkup.span-isp.working b/share/examples/ppp/ppp.linkup.span-isp.working
index 9e7e5eb..274296e 100644
--- a/share/examples/ppp/ppp.linkup.span-isp.working
+++ b/share/examples/ppp/ppp.linkup.span-isp.working
@@ -14,4 +14,4 @@ isp3:
   !bg ppp -background vpn3 vpn
 
 vpn:
-  set server /var/tmp/vpn "" 0177
+  set server /var/run/ppp/vpn "" 0177
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index aa90ded..a580474 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -715,6 +715,9 @@ system information files describing various info about
 system since it was booted
 .Pp
 .Bl -tag -width Fl -compact
+.It Pa ppp/
+writable by the network group for command connection sockets; see
+.Xr ppp 8
 .It Pa utmp
 database of current users;
 see