Browse Source

Enable npppd and npppctl in default build. Add npppd to rc and

install sample configs to /etc/.
ok claudio deraadt henning mcbride
OPENBSD_5_3
yasuoka 12 years ago
parent
commit
71d3e06461
7 changed files with 34 additions and 13 deletions
  1. +8
    -7
      src/etc/Makefile
  2. +3
    -1
      src/etc/changelist
  3. +6
    -1
      src/etc/mtree/4.4BSD.dist
  4. +2
    -2
      src/etc/rc
  5. +2
    -1
      src/etc/rc.conf
  6. +11
    -0
      src/etc/rc.d/npppd
  7. +2
    -1
      src/etc/sysctl.conf

+ 8
- 7
src/etc/Makefile View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.323 2012/08/29 04:04:15 dtucker Exp $
# $OpenBSD: Makefile,v 1.324 2012/09/20 12:51:43 yasuoka Exp $
TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain
@ -50,12 +50,12 @@ BIN2= motd
# -r-xr-xr-x
RCDAEMONS= amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd \
ftpd ftpproxy hostapd hotplugd httpd identd ifstated iked \
inetd isakmpd ldapd ldattach ldpd lpd mopd mrouted named nginx \
nsd ntpd ospfd ospf6d portmap pflogd rarpd rbootd relayd ripd \
route6d rtadvd rtsold rwhod sasyncd sendmail sensorsd smtpd \
snmpd spamd sshd syslogd watchdogd wsmoused xdm ypbind ypldap \
yppasswdd ypserv kdc kadmind kpasswdd nfsd mountd lockd statd \
spamlogd sndiod popa3d tftpd tftpproxy
inetd isakmpd ldapd npppd ldattach ldpd lpd mopd mrouted \
named nginx nsd ntpd ospfd ospf6d portmap pflogd rarpd rbootd \
relayd ripd route6d rtadvd rtsold rwhod sasyncd sendmail \
sensorsd smtpd snmpd spamd sshd syslogd watchdogd wsmoused \
xdm ypbind ypldap yppasswdd ypserv kdc kadmind kpasswdd nfsd \
mountd lockd statd spamlogd sndiod popa3d tftpd tftpproxy
MISETS= base${OSrev}.tgz comp${OSrev}.tgz \
man${OSrev}.tgz game${OSrev}.tgz etc${OSrev}.tgz
@ -260,6 +260,7 @@ distribution-etc-root-var: distrib-dirs
cd ../usr.bin/mail && exec ${MAKE} distribution
cd ../usr.sbin/ldapd && exec ${MAKE} distribution
cd ../usr.sbin/nginx && exec ${MAKE} -f Makefile.bsd-wrapper distribution
cd ../usr.sbin/npppd && exec ${MAKE} distribution
cd mail && exec ${MAKE} distribution
${INSTALL} -c -o root -g wheel -m 600 root/root.mail \
${DESTDIR}/var/mail/root


+ 3
- 1
src/etc/changelist View File

@ -1,4 +1,4 @@
# $OpenBSD: changelist,v 1.75 2011/10/06 20:49:25 deraadt Exp $
# $OpenBSD: changelist,v 1.76 2012/09/20 12:51:43 yasuoka Exp $
#
# List of files which the security script backs up and checks
# for modifications.
@ -93,6 +93,8 @@
/etc/netstart
/etc/networks
/etc/newsyslog.conf
/etc/npppd/npppd.conf
+/etc/npppd/npppd-users
/etc/nsd.conf
/etc/ntpd.conf
/etc/ospf6d.conf


+ 6
- 1
src/etc/mtree/4.4BSD.dist View File

@ -1,4 +1,4 @@
# $OpenBSD: 4.4BSD.dist,v 1.226 2012/08/23 07:09:41 deraadt Exp $
# $OpenBSD: 4.4BSD.dist,v 1.227 2012/09/20 12:51:43 yasuoka Exp $
/set type=dir uname=root gname=wheel mode=0755
# .
@ -188,6 +188,11 @@ nginx
# ./etc/nginx
..
# ./etc/npppd
npppd
# ./etc/npppd
..
# ./etc/ppp
ppp
# ./etc/ppp


+ 2
- 2
src/etc/rc View File

@ -1,4 +1,4 @@
# $OpenBSD: rc,v 1.402 2012/08/26 19:25:19 ajacoutot Exp $
# $OpenBSD: rc,v 1.403 2012/09/20 12:51:43 yasuoka Exp $
# System startup script run by init on autoboot
# or after single-user.
@ -387,7 +387,7 @@ make_keys
echo -n 'starting early daemons:'
start_daemon syslogd ldattach pflogd named nsd ntpd isakmpd iked sasyncd
start_daemon ldapd
start_daemon ldapd npppd
echo '.'
if [ X"${ipsec}" != X"NO" ]; then


+ 2
- 1
src/etc/rc.conf View File

@ -1,6 +1,6 @@
#!/bin/sh -
#
# $OpenBSD: rc.conf,v 1.170 2012/08/26 19:25:19 ajacoutot Exp $
# $OpenBSD: rc.conf,v 1.171 2012/09/20 12:51:43 yasuoka Exp $
# set these to "NO" to turn them off. otherwise, they're used as flags
ldpd_flags=NO # for normal use: ""
@ -46,6 +46,7 @@ snmpd_flags=NO # for normal use: ""
smtpd_flags=NO # for normal use: ""
sndiod_flags="" # for normal use: ""
ldapd_flags=NO # for normal use: ""
npppd_flags=NO # for normal use: ""
inetd_flags="" # for normal use: ""
rwhod_flags=NO # for normal use: ""
portmap_flags=NO # for normal use: ""


+ 11
- 0
src/etc/rc.d/npppd View File

@ -0,0 +1,11 @@
#!/bin/sh
#
# $OpenBSD: npppd,v 1.1 2012/09/20 12:51:43 yasuoka Exp $
daemon="/usr/sbin/npppd"
. /etc/rc.d/rc.subr
pexp="npppd: main"
rc_cmd $1

+ 2
- 1
src/etc/sysctl.conf View File

@ -1,4 +1,4 @@
# $OpenBSD: sysctl.conf,v 1.53 2012/05/31 15:04:03 sthen Exp $
# $OpenBSD: sysctl.conf,v 1.54 2012/09/20 12:51:43 yasuoka Exp $
#
# This file contains a list of sysctl options the user wants set at
# boot time. See sysctl(3) and sysctl(8) for more information on
@ -25,6 +25,7 @@
#net.inet.tcp.ecn=1 # 1=Enable the TCP ECN extension
#net.inet.carp.preempt=1 # 1=Enable carp(4) preemption
#net.inet.carp.log=3 # log level of carp(4) info, default 2
#net.pipex.enable=1 # 1=Enable pipex(4) for npppd(8)
#ddb.panic=0 # 0=Do not drop into ddb on a kernel panic
#ddb.console=1 # 1=Permit entry of ddb from the console
#fs.posix.setuid=0 # 0=Traditional BSD chown() semantics


Loading…
Cancel
Save