Fincer
/
openntpd-openbsd
mirror of https://github.com/Fincer/openntpd-openbsd
1
0
Fork 0
Code Issues 0 Projects 0 Releases 61 Wiki Activity
Browse Source

Remove sendmail tentacles. ok krw@ ajacoutot@

OPENBSD_5_7
matthieu 10 years ago
parent
19507eb6b6
commit
76852e9bcd
8 changed files with 16 additions and 118 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -5
      src/etc/Makefile
  2. +1
    -14
      src/etc/changelist
  3. +1
    -4
      src/etc/crontab
  4. +8
    -56
      src/etc/mail/Makefile
  5. +0
    -1
      src/etc/master.passwd
  6. +1
    -33
      src/etc/mtree/4.4BSD.dist
  7. +2
    -2
      src/etc/rc
  8. +1
    -3
      src/etc/rc.conf

+ 2
- 5
src/etc/Makefile View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.394 2014/09/15 20:26:32 rpe Exp $
# $OpenBSD: Makefile,v 1.395 2014/09/15 22:28:58 matthieu Exp $
TZDIR= /usr/share/zoneinfo TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain LOCALTIME= Canada/Mountain
@ -55,7 +55,7 @@ RCDAEMONS= amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd \
ftpd ftpproxy hostapd hotplugd httpd identd ifstated iked \ ftpd ftpproxy hostapd hotplugd httpd identd ifstated iked \
inetd isakmpd ldapd npppd ldattach ldpd lpd mopd mrouted \ inetd isakmpd ldapd npppd ldattach ldpd lpd mopd mrouted \
nsd ntpd ospfd ospf6d portmap pflogd rarpd rbootd \ nsd ntpd ospfd ospf6d portmap pflogd rarpd rbootd \
relayd ripd route6d rtadvd rtsold sasyncd sendmail \
relayd ripd route6d rtadvd rtsold sasyncd \
sensorsd slowcgi smtpd snmpd spamd sshd syslogd watchdogd \ sensorsd slowcgi smtpd snmpd spamd sshd syslogd watchdogd \
wsmoused xdm ypbind ypldap yppasswdd ypserv nfsd mountd lockd \ wsmoused xdm ypbind ypldap yppasswdd ypserv nfsd mountd lockd \
statd spamlogd sndiod tftpd tftpproxy ldomd unbound iscsid statd spamlogd sndiod tftpd tftpproxy ldomd unbound iscsid
@ -190,13 +190,10 @@ distribution-etc-root-var: distrib-dirs
${DESTDIR}/var/log/messages ${DESTDIR}/var/log/messages
${INSTALL} -c -o ${BINOWN} -g wheel -m 600 /dev/null \ ${INSTALL} -c -o ${BINOWN} -g wheel -m 600 /dev/null \
${DESTDIR}/var/log/secure ${DESTDIR}/var/log/secure
${INSTALL} -c -o ${BINOWN} -g wheel -m 664 /dev/null \
${DESTDIR}/var/log/sendmail.st
${INSTALL} -c -o ${BINOWN} -g wheel -m 644 /dev/null \ ${INSTALL} -c -o ${BINOWN} -g wheel -m 644 /dev/null \
${DESTDIR}/var/log/wtmp ${DESTDIR}/var/log/wtmp
${INSTALL} -c -o ${BINOWN} -g wheel -m 640 /dev/null \ ${INSTALL} -c -o ${BINOWN} -g wheel -m 640 /dev/null \
${DESTDIR}/var/log/xferlog ${DESTDIR}/var/log/xferlog
cd ../gnu/usr.sbin/sendmail/cf/cf && exec ${MAKE} distribution
cd ../usr.sbin/ypserv/ypinit && exec ${MAKE} distribution cd ../usr.sbin/ypserv/ypinit && exec ${MAKE} distribution
cd ../usr.bin/ssh && exec ${MAKE} distribution cd ../usr.bin/ssh && exec ${MAKE} distribution
cd ../lib/libcrypto && exec ${MAKE} distribution cd ../lib/libcrypto && exec ${MAKE} distribution


+ 1
- 14
src/etc/changelist View File

@ -1,4 +1,4 @@
# $OpenBSD: changelist,v 1.101 2014/09/03 21:19:34 matthieu Exp $
# $OpenBSD: changelist,v 1.102 2014/09/15 22:28:58 matthieu Exp $
# #
# List of files which the security script backs up and checks # List of files which the security script backs up and checks
# for modifications. # for modifications.
@ -55,22 +55,9 @@
/etc/locate.rc /etc/locate.rc
/etc/login.conf /etc/login.conf
/etc/mail.rc /etc/mail.rc
/etc/mail/access
/etc/mail/aliases /etc/mail/aliases
/etc/mail/genericstable
/etc/mail/helpfile
/etc/mail/local-host-names
/etc/mail/localhost.cf
/etc/mail/mailertable
/etc/mail/relay-domains
+/etc/mail/secrets
/etc/mail/sendmail.cf
/etc/mail/smtpd.conf /etc/mail/smtpd.conf
/etc/mail/spamd.conf /etc/mail/spamd.conf
/etc/mail/submit.cf
/etc/mail/trusted-users
/etc/mail/virtual
/etc/mail/virtusertable
/etc/mailer.conf /etc/mailer.conf
/etc/man.conf /etc/man.conf
/etc/master.passwd /etc/master.passwd


+ 1
- 4
src/etc/crontab View File

@ -1,4 +1,4 @@
# $OpenBSD: crontab,v 1.20 2014/03/12 18:21:34 tedu Exp $
# $OpenBSD: crontab,v 1.21 2014/09/15 22:28:58 matthieu Exp $
# #
# /var/cron/tabs/root - root's crontab # /var/cron/tabs/root - root's crontab
# #
@ -8,9 +8,6 @@ HOME=/var/log
# #
#minute hour mday month wday command #minute hour mday month wday command
# #
# sendmail clientmqueue runner
#*/30 * * * * /usr/sbin/sendmail -L sm-msp-queue -Ac -q
#
# rotate log files every hour, if necessary # rotate log files every hour, if necessary
0 * * * * /usr/bin/newsyslog 0 * * * * /usr/bin/newsyslog
# send log file notifications, if necessary # send log file notifications, if necessary


+ 8
- 56
src/etc/mail/Makefile View File

@ -1,18 +1,9 @@
# $OpenBSD: Makefile,v 1.8 2014/03/12 21:40:27 tedu Exp $
# $OpenBSD: Makefile,v 1.9 2014/09/15 22:28:58 matthieu Exp $
# #
# Generate the various .db versions from their source files. # Generate the various .db versions from their source files.
# The sendmail .mc files are not built here. They live in
# /usr/share/sendmail/cf and have their own Makefile.
#
SENDMAIL= /usr/libexec/sendmail/sendmail
MAKEMAP= /usr/libexec/sendmail/makemap
.for DB in access aliases genericstable mailertable virtusertable userdb
. if exists(${DB})
DB_FILES+= ${DB}.db
. endif
.endfor
DB_FILES= aliases.db
MAKEMAP= /usr/libexec/smtpd/makemap
all: ${DB_FILES} all: ${DB_FILES}
@ -22,58 +13,19 @@ clean:
distribution: distribution:
${INSTALL} -c -o root -g wheel -m 644 Makefile \ ${INSTALL} -c -o root -g wheel -m 644 Makefile \
${DESTDIR}/etc/mail/Makefile ${DESTDIR}/etc/mail/Makefile
${INSTALL} -c -o root -g wheel -m 644 README \
${DESTDIR}/etc/mail/README
${INSTALL} -c -o root -g wheel -m 644 access \
${DESTDIR}/etc/mail/access
${MAKEMAP} hash ${DESTDIR}/etc/mail/access < access
${INSTALL} -c -o root -g wheel -m 644 aliases \ ${INSTALL} -c -o root -g wheel -m 644 aliases \
${DESTDIR}/etc/mail/aliases ${DESTDIR}/etc/mail/aliases
${SENDMAIL} -C${DESTDIR}/etc/mail/sendmail.cf \
-bi -O AliasFile=${DESTDIR}/etc/mail/aliases \
-O DontBlameSendmail=mapinunsafedirpath
${INSTALL} -c -o root -g wheel -m 644 local-host-names \
${DESTDIR}/etc/mail/local-host-names
${INSTALL} -c -o root -g wheel -m 644 genericstable \
${DESTDIR}/etc/mail/genericstable
${MAKEMAP} hash ${DESTDIR}/etc/mail/genericstable < genericstable
${INSTALL} -c -o root -g wheel -m 644 mailertable \
${DESTDIR}/etc/mail/mailertable
${MAKEMAP} hash ${DESTDIR}/etc/mail/mailertable < mailertable
${INSTALL} -c -o root -g wheel -m 644 relay-domains \
${DESTDIR}/etc/mail/relay-domains
${INSTALL} -c -o root -g wheel -m 644 trusted-users \
${DESTDIR}/etc/mail/trusted-users
${INSTALL} -c -o root -g wheel -m 644 virtusertable \
${DESTDIR}/etc/mail/virtusertable
${INSTALL} -c -o root -g wheel -m 644 spamd.conf \
${DESTDIR}/etc/mail/spamd.conf
${MAKEMAP} -t aliases -o ${DESTDIR}/etc/mail/aliases.db \
aliases
${INSTALL} -c -o root -g wheel -m 644 smtpd.conf \ ${INSTALL} -c -o root -g wheel -m 644 smtpd.conf \
${DESTDIR}/etc/mail/smtpd.conf ${DESTDIR}/etc/mail/smtpd.conf
${MAKEMAP} hash ${DESTDIR}/etc/mail/virtusertable < virtusertable
@for db in access.db aliases.db genericstable.db mailertable.db \
virtusertable.db; do \
chmod 644 ${DESTDIR}/etc/mail/$$db; \
done
access.db: access
${MAKEMAP} hash ${.ALLSRC} < ${.ALLSRC}
${INSTALL} -c -o root -g wheel -m 644 spamd.conf \
${DESTDIR}/etc/mail/spamd.conf
chmod 644 ${DESTDIR}/etc/mail/aliases.db
aliases.db: aliases aliases.db: aliases
newaliases newaliases
genericstable.db: genericstable
${MAKEMAP} hash ${.ALLSRC} < ${.ALLSRC}
mailertable.db: mailertable
${MAKEMAP} hash ${.ALLSRC} < ${.ALLSRC}
virtusertable.db: virtusertable
${MAKEMAP} hash ${.ALLSRC} < ${.ALLSRC}
userdb.db: userdb
${MAKEMAP} btree ${.ALLSRC} < ${.ALLSRC}
.PHONY: distribution .PHONY: distribution
.include <bsd.own.mk> .include <bsd.own.mk>
.include <bsd.sys.mk> .include <bsd.sys.mk>

+ 0
- 1
src/etc/master.passwd View File

@ -2,7 +2,6 @@ root::0:0:daemon:0:0:Charlie &:/root:/bin/ksh
daemon:*:1:1::0:0:The devil himself:/root:/sbin/nologin daemon:*:1:1::0:0:The devil himself:/root:/sbin/nologin
operator:*:2:5::0:0:System &:/operator:/sbin/nologin operator:*:2:5::0:0:System &:/operator:/sbin/nologin
bin:*:3:7::0:0:Binaries Commands and Source:/:/sbin/nologin bin:*:3:7::0:0:Binaries Commands and Source:/:/sbin/nologin
smmsp:*:25:25::0:0:Sendmail Message Submission Program:/nonexistent:/sbin/nologin
sshd:*:27:27::0:0:sshd privsep:/var/empty:/sbin/nologin sshd:*:27:27::0:0:sshd privsep:/var/empty:/sbin/nologin
_portmap:*:28:28::0:0:portmap:/var/empty:/sbin/nologin _portmap:*:28:28::0:0:portmap:/var/empty:/sbin/nologin
_identd:*:29:29::0:0:identd:/var/empty:/sbin/nologin _identd:*:29:29::0:0:identd:/var/empty:/sbin/nologin


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

@ -1,4 +1,4 @@
# $OpenBSD: 4.4BSD.dist,v 1.263 2014/08/26 19:33:48 robert Exp $
# $OpenBSD: 4.4BSD.dist,v 1.264 2014/09/15 22:28:58 matthieu Exp $
/set type=dir uname=root gname=wheel mode=0755 /set type=dir uname=root gname=wheel mode=0755
@ -147,10 +147,6 @@ usr
std gname=bin uname=root mode=0755 std gname=bin uname=root mode=0755
.. ..
.. ..
# ./usr/include/libmilter
libmilter gname=bin uname=root mode=0755
..
objc gname=bin uname=root mode=0755 objc gname=bin uname=root mode=0755
.. ..
openssl gname=bin uname=root mode=0755 openssl gname=bin uname=root mode=0755
@ -191,8 +187,6 @@ usr
.. ..
lpr lpr
.. ..
sendmail type=dir uname=root gname=wheel mode=0755
..
smtpd type=dir uname=root gname=wheel mode=0755 smtpd type=dir uname=root gname=wheel mode=0755
.. ..
.. ..
@ -636,28 +630,6 @@ usr
nls nls
.. ..
# ./usr/share/sendmail
sendmail
cf
..
domain
..
feature
..
hack
..
m4
..
mailer
..
ostype
..
sh
..
siteconfig
..
..
# ./usr/share/snmp # ./usr/share/snmp
snmp snmp
mibs mibs
@ -795,8 +767,6 @@ var
# ./var/spool # ./var/spool
spool spool
clientmqueue mode=0770 uname=smmsp gname=smmsp
..
# ./var/spool/ftp # ./var/spool/ftp
ftp mode=0555 ftp mode=0555
@ -813,8 +783,6 @@ var
# ./var/spool/lock # ./var/spool/lock
lock uname=uucp gname=dialer mode=1775 lock uname=uucp gname=dialer mode=1775
.. ..
mqueue mode=0700
..
output gname=daemon mode=0775 output gname=daemon mode=0775
.. ..
smtpd type=dir uname=root gname=wheel mode=0711 smtpd type=dir uname=root gname=wheel mode=0711


+ 2
- 2
src/etc/rc View File

@ -1,4 +1,4 @@
# $OpenBSD: rc,v 1.441 2014/08/26 19:33:48 robert Exp $
# $OpenBSD: rc,v 1.442 2014/09/15 22:28:58 matthieu Exp $
# System startup script run by init on autoboot # System startup script run by init on autoboot
# or after single-user. # or after single-user.
@ -498,7 +498,7 @@ if ifconfig lo0 inet6 >/dev/null 2>&1; then
fi fi
fi fi
start_daemon hostapd lpd sendmail smtpd slowcgi httpd ftpd
start_daemon hostapd lpd smtpd slowcgi httpd ftpd
start_daemon ftpproxy tftpd tftpproxy identd inetd rarpd bootparamd start_daemon ftpproxy tftpd tftpproxy identd inetd rarpd bootparamd
start_daemon rbootd mopd spamd spamlogd sndiod start_daemon rbootd mopd spamd spamlogd sndiod
echo '.' echo '.'


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

@ -1,4 +1,4 @@
# $OpenBSD: rc.conf,v 1.198 2014/08/27 14:04:15 florian Exp $
# $OpenBSD: rc.conf,v 1.199 2014/09/15 22:28:58 matthieu Exp $
# DO NOT EDIT THIS FILE!! # DO NOT EDIT THIS FILE!!
# #
@ -67,8 +67,6 @@ iscsid_flags=NO # for normal use: ""
slowcgi_flags=NO # for normal use: "" slowcgi_flags=NO # for normal use: ""
# For normal use: "-L sm-mta -bd -q30m", and note there is a cron job
sendmail_flags=NO
spamd_flags=NO # for normal use: "" and see spamd(8) spamd_flags=NO # for normal use: "" and see spamd(8)
spamd_black=NO # set to YES to run spamd without greylisting spamd_black=NO # set to YES to run spamd without greylisting
spamlogd_flags= # use eg. "-i interface" and see spamlogd(8) spamlogd_flags= # use eg. "-i interface" and see spamlogd(8)


Write Preview
Loading…
Cancel
Save