Browse Source

bye bye bootpd. You will not be missed.

OPENBSD_3_6
deraadt 20 years ago
parent
commit
81db547eac
4 changed files with 11 additions and 96 deletions
  1. +9
    -11
      src/etc/Makefile
  2. +0
    -81
      src/etc/bootptab
  3. +1
    -2
      src/etc/changelist
  4. +1
    -2
      src/etc/inetd.conf

+ 9
- 11
src/etc/Makefile View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.205 2004/05/04 19:35:25 deraadt Exp $
# $OpenBSD: Makefile,v 1.206 2004/05/04 23:37:04 deraadt Exp $
TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain
@ -12,15 +12,13 @@ NOOBJ= oobj
# -rw-r--r--
BINOWN= root
BINGRP= wheel
BIN1= bootptab changelist ccd.conf csh.cshrc csh.login csh.logout \
daily dhcpd.conf dhcpd.interfaces exports ftpusers \
ftpchroot gettytab group hosts hosts.lpd inetd.conf \
ksh.kshrc locate.rc man.conf monthly motd mrouted.conf \
myname netstart networks newsyslog.conf \
phones printcap protocols rbootd.conf rc rc.conf rc.local \
rc.securelevel rc.shutdown remote rpc security services \
shells spamd.conf syslog.conf weekly etc.${MACHINE}/disktab \
dhclient.conf mailer.conf
BIN1= changelist ccd.conf csh.cshrc csh.login csh.logout daily dhcpd.conf \
dhcpd.interfaces exports ftpusers ftpchroot gettytab group hosts \
hosts.lpd inetd.conf ksh.kshrc locate.rc man.conf monthly motd \
mrouted.conf myname netstart networks newsyslog.conf phones printcap \
protocols rbootd.conf rc rc.conf rc.local rc.securelevel rc.shutdown \
remote rpc security services shells spamd.conf syslog.conf weekly \
etc.${MACHINE}/disktab dhclient.conf mailer.conf
.if ${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
${MACHINE} == "cats" || ${MACHINE} == "hppa" || \
@ -375,7 +373,7 @@ distrib:
DHSIZE=1024 1536 2048 3072 4096
update-moduli:
( \
echo '# $$OpenBSD: Makefile,v 1.205 2004/05/04 19:35:25 deraadt Exp $$'; \
echo '# $$OpenBSD: Makefile,v 1.206 2004/05/04 23:37:04 deraadt Exp $$'; \
echo '# Time Type Tests Tries Size Generator Modulus'; \
( for i in ${DHSIZE}; do \
ssh-keygen -b $$i -G /dev/stdout; \


+ 0
- 81
src/etc/bootptab View File

@ -1,81 +0,0 @@
# $OpenBSD: bootptab,v 1.5 2002/06/06 15:23:31 mpech Exp $
#
# /etc/bootptab: database for bootp server (/usr/sbin/bootpd)
# Last update Mon 11/7/88 18:03
# Blank lines and lines beginning with '#' are ignored.
#
# Legend:
#
# first field -- hostname
# (may be full domain name and probably should be)
#
# bf Bootfile
# bs Bootfile size in 512-octet blocks
# cs Cookie server address list
# df Merit dump file
# dn Domain name
# ds Domain name server address list
# ef Extension file
# gw Gateway address list
# ha Host hardware address
# hd Bootfile home directory
# hn Send client's hostname to client
# ht Host hardware type (see Assigned Numbers RFC)
# im Impress server address list
# ip Host IP address
# lg Log server address list
# lp LPR server address list
# ns IEN-116 name server address list
# nt NTP (time) Server (RFC 1129)
# ra Reply address override
# rl Resource location protocol server address list
# rp Root path to mount as root
# sa TFTP server address client should use
# sm Host subnet mask
# sw Swap server address
# tc Table continuation (points to similar "template" host entry)
# td TFTP root directory used by "secure" TFTP servers
# to Time offset in seconds from UTC
# ts Time server address list
# vm Vendor magic cookie selector
# yd YP (NIS) domain name
# ys YP (NIS) server address
#
# Be careful about including backslashes where they're needed. Weird (bad)
# things can happen when a backslash is omitted where one is intended.
#
# First, we define a global entry which specifies the stuff every host uses.
#.global.dummy:\
# :sm=255.255.255.0:\
# :hd=/home/nfsclient:bf=null:\
# :ds=128.32.149.141:\
# :ns=0x80020b4d 0x80020ffd:\
# :ts=0x80020b4d 0x80020ffd:\
# :to=18000:
# Next, we can define different master entries for each subnet. . .
#subnet13.dummy:\
# :tc=.global.dummy:gw=128.2.13.1:
#
#
# We should be able to use as many levels of indirection as desired. Use
# your imagination. . .
#
# Individual entries (could also have different servers for some/all of these
# hosts, but we don't really use this feature at CMU):
#carnegie:tc=subnet13.dummy:ht=ieee802:ha=7FF8100000AF:ip=128.2.11.1:
#baldwin:tc=subnet19.dummy:ht=ethernet:ha=0800200159C3:ip=128.2.11.10:
#example nfs diskless client
#timesink:hd=/home/nfsclient/timesink:\
# tc=subnet149.dummy:ht=ethernet:ha=0800200168A7:ip=128.32.149.20:

+ 1
- 2
src/etc/changelist View File

@ -1,4 +1,4 @@
# $OpenBSD: changelist,v 1.36 2004/04/24 19:28:37 beck Exp $
# $OpenBSD: changelist,v 1.37 2004/05/04 23:37:04 deraadt Exp $
#
# List of files which the security script backs up and checks
# for modifications.
@ -11,7 +11,6 @@
/etc/bgpd.conf
/etc/boot.conf
/etc/bootparams
/etc/bootptab
/etc/ccd.conf
/etc/changelist
/etc/crontab


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

@ -1,4 +1,4 @@
# $OpenBSD: inetd.conf,v 1.51 2003/03/24 01:47:28 ian Exp $
# $OpenBSD: inetd.conf,v 1.52 2004/05/04 23:37:04 deraadt Exp $
#
# Internet server configuration database
#
@ -21,7 +21,6 @@ ident stream tcp6 nowait _identd /usr/libexec/identd identd -el
127.0.0.1:comsat dgram udp wait root /usr/libexec/comsat comsat
[::1]:comsat dgram udp6 wait root /usr/libexec/comsat comsat
#ntalk dgram udp wait root /usr/libexec/ntalkd ntalkd
#bootps dgram udp wait root /usr/sbin/bootpd bootpd
#pop3 stream tcp nowait root /usr/sbin/popa3d popa3d
# Internal services
#echo stream tcp nowait root internal


Loading…
Cancel
Save