diff --git a/etc/group b/etc/group index c9aa917b99f0..35df51838ae4 100644 --- a/etc/group +++ b/etc/group @@ -1,39 +1,38 @@ -# wheel:*:0:root daemon:*:1: kmem:*:2: sys:*:3: tty:*:4: operator:*:5:root mail:*:6: bin:*:7: news:*:8: man:*:9: games:*:13: ftp:*:14: staff:*:20: sshd:*:22: smmsp:*:25: mailnull:*:26: guest:*:31: video:*:44: realtime:*:47: idletime:*:48: bind:*:53: unbound:*:59: proxy:*:62: authpf:*:63: _pflogd:*:64: _dhcp:*:65: uucp:*:66: dialer:*:68: network:*:69: audit:*:77: www:*:80: u2f:*:116: ntpd:*:123: _ypldap:*:160: hast:*:845: tests:*:977: nogroup:*:65533: nobody:*:65534: diff --git a/etc/mail/Makefile b/etc/mail/Makefile index 0e8823492e83..784023d6f9c0 100644 --- a/etc/mail/Makefile +++ b/etc/mail/Makefile @@ -1,247 +1,245 @@ -# -# # This Makefile provides an easy way to generate the configuration # file and database maps for the sendmail(8) daemon. # # The user-driven targets are: # # all - Build cf, maps and aliases # cf - Build the .cf file from .mc file # maps - Build the feature maps # aliases - Build the sendmail aliases # install - Install the .cf file as /etc/mail/sendmail.cf # # For acting on both the MTA daemon and MSP queue running daemon: # start - Start both the sendmail MTA daemon and MSP queue running # daemon with the flags defined in /etc/defaults/rc.conf or # /etc/rc.conf # stop - Stop both the sendmail MTA daemon and MSP queue running # daemon # restart - Restart both the sendmail MTA daemon and MSP queue running # daemon # # For acting on just the MTA daemon: # start-mta - Start the sendmail MTA daemon with the flags defined in # /etc/defaults/rc.conf or /etc/rc.conf # stop-mta - Stop the sendmail MTA daemon # restart-mta - Restart the sendmail MTA daemon # # For acting on just the MSP queue running daemon: # start-mspq - Start the sendmail MSP queue running daemon with the # flags defined in /etc/defaults/rc.conf or /etc/rc.conf # stop-mspq - Stop the sendmail MSP queue running daemon # restart-mspq - Restart the sendmail MSP queue running daemon # # Calling `make' will generate the updated versions when either the # aliases or one of the map files were changed. # # A `make install` is only necessary after modifying the .mc file. In # this case one would normally also call `make restart' to allow the # running sendmail to pick up the changes as well. # # ------------------------------------------------------------------------ # This Makefile uses `.mc' as the default MTA .mc file. This # can be changed by defining SENDMAIL_MC in /etc/make.conf, e.g.: # # SENDMAIL_MC=/etc/mail/myconfig.mc # # If '.mc' does not exist, it is created using 'freebsd.mc' # as a template. # # It also uses '.submit.mc' as the default mail submission .mc # file. This can be changed by defining SENDMAIL_SUBMIT_MC in # /etc/make.conf, e.g.: # # SENDMAIL_SUBMIT_MC=/etc/mail/mysubmit.mc # # If '.submit.mc' does not exist, it is created using # 'freebsd.submit.mc' as a template. # ------------------------------------------------------------------------ # # The Makefile knows about the following maps: # access, authinfo, bitdomain, domaintable, genericstable, mailertable, # userdb, uucpdomain, virtusertable # .ifndef SENDMAIL_MC SENDMAIL_MC!= hostname SENDMAIL_MC:= ${SENDMAIL_MC}.mc ${SENDMAIL_MC}: ${CP} freebsd.mc ${SENDMAIL_MC} .endif .ifndef SENDMAIL_SUBMIT_MC SENDMAIL_SUBMIT_MC!= hostname SENDMAIL_SUBMIT_MC:= ${SENDMAIL_SUBMIT_MC}.submit.mc ${SENDMAIL_SUBMIT_MC}: ${CP} freebsd.submit.mc ${SENDMAIL_SUBMIT_MC} .endif INSTALL_CF= ${SENDMAIL_MC:R}.cf .ifndef SENDMAIL_SET_USER_ID INSTALL_SUBMIT_CF= ${SENDMAIL_SUBMIT_MC:R}.cf .endif SENDMAIL_ALIASES?= /etc/mail/aliases # # This is the directory where the sendmail configuration files are # located. # .if exists(/usr/share/sendmail/cf) SENDMAIL_CF_DIR?= /usr/share/sendmail/cf .elif exists(/usr/src/contrib/sendmail/cf) SENDMAIL_CF_DIR?= /usr/src/contrib/sendmail/cf .endif # # The sendmail startup script # SENDMAIL_START_SCRIPT?= /etc/rc.d/sendmail # # Some useful programs we need. # SENDMAIL?= /usr/sbin/sendmail MAKEMAP?= /usr/sbin/makemap M4?= /usr/bin/m4 # Permissions for generated maps SENDMAIL_MAP_PERMS?= 0640 # Set a reasonable default .MAIN: all # # ------------------------------------------------------------------------ # # The Makefile picks up the list of files from SENDMAIL_MAP_SRC and # stores the matching .db filenames in SENDMAIL_MAP_OBJ if the file # exists in the current directory. SENDMAIL_MAP_TYPE is the database # type to use when calling makemap. # SENDMAIL_MAP_SRC+= mailertable domaintable bitdomain uucpdomain \ genericstable virtusertable access authinfo SENDMAIL_MAP_OBJ= SENDMAIL_MAP_TYPE?= hash .for _f in ${SENDMAIL_MAP_SRC} userdb .if exists(${_f}) SENDMAIL_MAP_OBJ+= ${_f}.db .endif .endfor # # The makemap command is used to generate a hashed map from the textfile. # .for _f in ${SENDMAIL_MAP_SRC} .if (exists(${_f}.sample) && !exists(${_f})) ${_f}: ${_f}.sample sed -e 's/^/#/' < ${.OODATE} > ${.TARGET} .endif ${_f}.db: ${_f} ${MAKEMAP} ${SENDMAIL_MAP_TYPE} ${.TARGET} < ${.OODATE} chmod ${SENDMAIL_MAP_PERMS} ${.TARGET} .endfor userdb.db: userdb ${MAKEMAP} btree ${.TARGET} < ${.OODATE} chmod ${SENDMAIL_MAP_PERMS} ${.TARGET} # # The .cf file needs to be recreated if the templates were modified. # M4FILES!= find ${SENDMAIL_CF_DIR} -type f -name '*.m4' -print # # M4(1) is used to generate the .cf file from the .mc file. # .SUFFIXES: .cf .mc .mc.cf: ${M4FILES} ${M4} -D_CF_DIR_=${SENDMAIL_CF_DIR}/ ${SENDMAIL_M4_FLAGS} \ ${SENDMAIL_CF_DIR}/m4/cf.m4 ${@:R}.mc > ${.TARGET} # # Aliases are handled separately since they normally reside in /etc # and can be rebuild without the help of makemap. # .for _f in ${SENDMAIL_ALIASES} ${_f}.db: ${_f} ${SENDMAIL} -bi -OAliasFile=${.ALLSRC} chmod ${SENDMAIL_MAP_PERMS} ${.TARGET} .endfor # # ------------------------------------------------------------------------ # all: cf maps aliases clean: depend: cf: ${INSTALL_CF} ${INSTALL_SUBMIT_CF} .ifdef SENDMAIL_SET_USER_ID install: install-cf .else install: install-cf install-submit-cf .endif install-cf: ${INSTALL_CF} .if ${INSTALL_CF} != /etc/mail/sendmail.cf ${INSTALL} -m ${SHAREMODE} ${INSTALL_CF} /etc/mail/sendmail.cf .endif install-submit-cf: ${INSTALL_SUBMIT_CF} .ifdef SENDMAIL_SET_USER_ID @echo ">>> ERROR: You should not create a submit.cf file if you are using a" @echo " set-user-ID sendmail binary (SENDMAIL_SET_USER_ID is set" @echo " in make.conf)." @false .else .if ${INSTALL_SUBMIT_CF} != /etc/mail/submit.cf ${INSTALL} -m ${SHAREMODE} ${INSTALL_SUBMIT_CF} /etc/mail/submit.cf .endif .endif aliases: ${SENDMAIL_ALIASES:%=%.db} maps: ${SENDMAIL_MAP_OBJ} start start-mta start-mspq: @if [ -r ${SENDMAIL_START_SCRIPT} ]; then \ echo -n 'Starting:'; \ sh ${SENDMAIL_START_SCRIPT} $@; \ echo '.'; \ fi stop stop-mta stop-mspq: @if [ -r ${SENDMAIL_START_SCRIPT} ]; then \ echo -n 'Stopping:'; \ sh ${SENDMAIL_START_SCRIPT} $@; \ echo '.'; \ fi restart restart-mta restart-mspq: @if [ -r ${SENDMAIL_START_SCRIPT} ]; then \ echo -n 'Restarting:'; \ sh ${SENDMAIL_START_SCRIPT} $@; \ echo '.'; \ fi # User defined targets .if exists(Makefile.local) .include "Makefile.local" .endif # For the definition of $SHAREMODE .include diff --git a/etc/master.passwd b/etc/master.passwd index 52acc3df998c..416b2b4e4874 100644 --- a/etc/master.passwd +++ b/etc/master.passwd @@ -1,28 +1,27 @@ -# root::0:0::0:0:Charlie &:/root:/bin/sh toor:*:0:0::0:0:Bourne-again Superuser:/root: daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin operator:*:2:5::0:0:System &:/:/usr/sbin/nologin bin:*:3:7::0:0:Binaries Commands and Source:/:/usr/sbin/nologin tty:*:4:65533::0:0:Tty Sandbox:/:/usr/sbin/nologin kmem:*:5:65533::0:0:KMem Sandbox:/:/usr/sbin/nologin games:*:7:13::0:0:Games pseudo-user:/:/usr/sbin/nologin news:*:8:8::0:0:News Subsystem:/:/usr/sbin/nologin man:*:9:9::0:0:Mister Man Pages:/usr/share/man:/usr/sbin/nologin sshd:*:22:22::0:0:Secure Shell Daemon:/var/empty:/usr/sbin/nologin smmsp:*:25:25::0:0:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin mailnull:*:26:26::0:0:Sendmail Default User:/var/spool/mqueue:/usr/sbin/nologin bind:*:53:53::0:0:Bind Sandbox:/:/usr/sbin/nologin unbound:*:59:59::0:0:Unbound DNS Resolver:/var/unbound:/usr/sbin/nologin proxy:*:62:62::0:0:Packet Filter pseudo-user:/nonexistent:/usr/sbin/nologin _pflogd:*:64:64::0:0:pflogd privsep user:/var/empty:/usr/sbin/nologin _dhcp:*:65:65::0:0:dhcp programs:/var/empty:/usr/sbin/nologin uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/local/libexec/uucp/uucico pop:*:68:6::0:0:Post Office Owner:/nonexistent:/usr/sbin/nologin auditdistd:*:78:77::0:0:Auditdistd unprivileged user:/var/empty:/usr/sbin/nologin www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/usr/sbin/nologin ntpd:*:123:123::0:0:NTP Daemon:/var/db/ntp:/usr/sbin/nologin _ypldap:*:160:160::0:0:YP LDAP unprivileged user:/var/empty:/usr/sbin/nologin hast:*:845:845::0:0:HAST unprivileged user:/var/empty:/usr/sbin/nologin tests:*:977:977::0:0:Unprivileged user for tests:/nonexistent:/usr/sbin/nologin nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile index 4bce54e5d5eb..fc1e81d97d66 100644 --- a/etc/mtree/Makefile +++ b/etc/mtree/Makefile @@ -1,34 +1,33 @@ - .include .include PACKAGE= mtree # NOTE: BSD.debug.dist is unconditionally installed for developer ease-of-use. FILES= \ BSD.debug.dist \ BSD.include.dist \ BSD.root.dist \ ${_BSD.libcompats.dist} \ ${_BSD.sendmail.dist} \ ${_BSD.tests.dist} \ BSD.usr.dist \ BSD.var.dist .for LIBCOMPAT libcompat in ${_ALL_LIBCOMPATS_libcompats} .if ${MK_LIB${LIBCOMPAT}} != "no" _BSD.libcompats.dist+= BSD.lib${libcompat}.dist .endif .endfor .if ${MK_SENDMAIL} != "no" _BSD.sendmail.dist= BSD.sendmail.dist .endif .if ${MK_TESTS} != "no" _BSD.tests.dist= BSD.tests.dist .endif NO_OBJ= FILESDIR= /etc/mtree .include diff --git a/etc/mtree/README b/etc/mtree/README index fd4a062552d9..bd813057b5bd 100644 --- a/etc/mtree/README +++ b/etc/mtree/README @@ -1,49 +1,48 @@ - Note: If you modify these files, please keep hier(7) updated! These files are used to create empty file hierarchies for building the system into. Some notes about working with them are placed here to try and keep them in good working order. a) The files use 4 space indentation, and other than in the header comments, should not contain any tabs. An indentation of 4 is preferable to the standard indentation of 8 because the indentation of levels in these files can become quite deep causing the line to overflow 80 characters. This also matches with the files generated when using the mtree -c option, which was implemented that way for the same reason. b) Only directories should be listed here. c) The listing should be kept in filename sorted order. d) Sanity checking changes to these files can be done by following this procedure (the sed -e is ugly, but fixing mtree -c to not emit the trailing white space would be even uglier): mkdir /tmp/MTREE mtree -deU -f BSD.X.dist -p /tmp/MTREE mtree -cdin -k uname,gname,mode -p /tmp/MTREE | \ sed -e 's/ *$//' >BSD.X.new diff -u BSD.X.dist BSD.X.new rm -r /tmp/MTREE Note that you will get some differences about /set lines, and uname= gname= on certain directory areas, mainly man page sections. This is caused by mtree not having a look ahead mechanism for making better selections for these as it traverses the hierarchy. The BSD.X.new file should NOT be committed, as it will be missing the correct header, and important keywords like ``nochange''. Simply use the diff for a sanity check to make sure things are in the correct order and correctly indented. e) Further sanity checking of the system builds with DESTDIR=/someplace are more complicated, but can often catch missing entries in these files. I tend to run this more complete sanity check shortly after the target date for a new release is announced. If you want details on it bug me about it via email to rgrimes@FreeBSD.org. diff --git a/etc/root/dot.k5login b/etc/root/dot.k5login index 5721e640fe21..c3b55dfc6f0b 100644 --- a/etc/root/dot.k5login +++ b/etc/root/dot.k5login @@ -1,3 +1,2 @@ -# # user1/root@YOUR.REALM.WHEREVER # user2/root@YOUR.REALM.WHEREVER diff --git a/etc/shells b/etc/shells index 3f96d65c43a4..d840afb12bad 100644 --- a/etc/shells +++ b/etc/shells @@ -1,8 +1,7 @@ -# # List of acceptable shells for chpass(1). # ftpd(8) will not allow users to connect who are not using # one of these shells. /bin/sh /bin/csh /bin/tcsh