summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorYASUOKA Masahiko <yasuoka@cvs.openbsd.org>2011-10-28 11:53:22 +0000
committerYASUOKA Masahiko <yasuoka@cvs.openbsd.org>2011-10-28 11:53:22 +0000
commit86ff089eb5ec00cdb0d432998033cd12abd66d28 (patch)
tree77ae2abdead97f2d4725ae2a8c0197d86d66d8c8 /usr.sbin
parent78bec3e508f77378819451e9f3c06a743764e039 (diff)
use existing _ppp instead of _npppd as a user/group id for npppd.
ok deraadt@ henning@
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/npppd/HOWTO_PIPEX_NPPPD.txt22
-rw-r--r--usr.sbin/npppd/npppd/npppd.h4
2 files changed, 15 insertions, 11 deletions
diff --git a/usr.sbin/npppd/HOWTO_PIPEX_NPPPD.txt b/usr.sbin/npppd/HOWTO_PIPEX_NPPPD.txt
index c2ca9d358ae..371817d59d4 100644
--- a/usr.sbin/npppd/HOWTO_PIPEX_NPPPD.txt
+++ b/usr.sbin/npppd/HOWTO_PIPEX_NPPPD.txt
@@ -1,4 +1,4 @@
-$Id: HOWTO_PIPEX_NPPPD.txt,v 1.5 2011/07/08 18:30:17 yasuoka Exp $
+$Id: HOWTO_PIPEX_NPPPD.txt,v 1.6 2011/10/28 11:53:21 yasuoka Exp $
How to test npppd and pipex
---------------------------
@@ -25,20 +25,24 @@ on server
% sudo cp npppd.conf /etc/npppd/
% sudo cp npppd-users.csv /etc/npppd/
- 5. create user '_npppd'
-
- % sudo groupadd _npppd
- % sudo useradd -d /var/empty -s /sbin/nologin -g _npppd _npppd
-
- 6. enable PIPEX and GRE by sysctl
+ 5. enable PIPEX and GRE by sysctl
% sudo sysctl net.inet.gre.allow=1 (for PPTP)
% sudo sysctl net.pipex.enable=1 (for PIPEX)
- 7. run npppd
+ 6. run npppd
% sudo /usr/sbin/npppd -d
+ NOTE:
+
+ * Previous version required to create `_npppd' user and group, but
+ now it uses '_ppp' instead. Delete `_npppd' if you created.
+
+ % sudo userdel _npppd
+ % sudo groupdel _npppd
+
+
on client
1. install 'pptp' from ports.
@@ -85,7 +89,7 @@ How to test L2TP/IPsec
#
# Simplest npppd.conf sample
#
-# $Id: HOWTO_PIPEX_NPPPD.txt,v 1.5 2011/07/08 18:30:17 yasuoka Exp $
+# $Id: HOWTO_PIPEX_NPPPD.txt,v 1.6 2011/10/28 11:53:21 yasuoka Exp $
interface_list: tun0
interface.tun0.ip4addr: 10.0.0.1
diff --git a/usr.sbin/npppd/npppd/npppd.h b/usr.sbin/npppd/npppd/npppd.h
index f0004194f4c..303ad48a10b 100644
--- a/usr.sbin/npppd/npppd/npppd.h
+++ b/usr.sbin/npppd/npppd/npppd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: npppd.h,v 1.6 2011/07/06 20:52:28 yasuoka Exp $ */
+/* $OpenBSD: npppd.h,v 1.7 2011/10/28 11:53:21 yasuoka Exp $ */
/*-
* Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -28,7 +28,7 @@
#ifndef NPPPD_H
#define NPPPD_H 1
-#define NPPPD_USER "_npppd"
+#define NPPPD_USER "_ppp"
#ifndef NPPPD_DEFAULT_TUN_IFNAME
#define NPPPD_DEFAULT_TUN_IFNAME "tun0"