From 33f3f8bec5301b8bda7c4d788d2e677e939d14d4 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Wed, 23 Apr 2014 09:56:56 +0000 Subject: [PATCH] Remove krb5 bits from rc(8). ok reyk@ --- etc/Makefile | 7 +++---- etc/rc | 5 ++--- etc/rc.conf | 12 ++---------- etc/rc.d/ipropd_master | 11 ----------- etc/rc.d/ipropd_slave | 11 ----------- etc/rc.d/kadmind | 12 ------------ etc/rc.d/kdc | 11 ----------- etc/rc.d/kpasswdd | 12 ------------ 8 files changed, 7 insertions(+), 74 deletions(-) delete mode 100644 etc/rc.d/ipropd_master delete mode 100644 etc/rc.d/ipropd_slave delete mode 100644 etc/rc.d/kadmind delete mode 100644 etc/rc.d/kdc delete mode 100644 etc/rc.d/kpasswdd diff --git a/etc/Makefile b/etc/Makefile index 35281c45b98..0fe0b33ae0d 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.354 2014/04/22 10:24:29 reyk Exp $ +# $OpenBSD: Makefile,v 1.355 2014/04/23 09:56:56 ajacoutot Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -54,9 +54,8 @@ RCDAEMONS= amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd \ named nginx nsd ntpd ospfd ospf6d portmap pflogd rarpd rbootd \ relayd ripd route6d rtadvd rtsold rwhod sasyncd sendmail \ sensorsd slowcgi smtpd snmpd spamd sshd syslogd watchdogd \ - wsmoused xdm ypbind ypldap yppasswdd ypserv kdc kadmind \ - kpasswdd nfsd mountd lockd statd spamlogd sndiod \ - tftpd tftpproxy ldomd ipropd_master ipropd_slave unbound + wsmoused xdm ypbind ypldap yppasswdd ypserv nfsd mountd lockd \ + statd spamlogd sndiod tftpd tftpproxy ldomd unbound MISETS= base${OSrev}.tgz comp${OSrev}.tgz \ man${OSrev}.tgz game${OSrev}.tgz etc${OSrev}.tgz diff --git a/etc/rc b/etc/rc index 599e99d13af..16a9cf4be42 100644 --- a/etc/rc +++ b/etc/rc @@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.424 2014/04/19 16:07:09 henning Exp $ +# $OpenBSD: rc,v 1.425 2014/04/23 09:56:56 ajacoutot Exp $ # System startup script run by init on autoboot # or after single-user. @@ -501,8 +501,7 @@ fi start_daemon hostapd rwhod lpd sendmail smtpd slowcgi nginx ftpd start_daemon ftpproxy tftpd tftpproxy identd inetd rarpd bootparamd -start_daemon rbootd mopd spamd spamlogd kdc kadmind kpasswdd -start_daemon ipropd_master ipropd_slave sndiod +start_daemon rbootd mopd spamd spamlogd sndiod echo '.' # If rc.firstime exists, run it just once, and make sure it is deleted diff --git a/etc/rc.conf b/etc/rc.conf index cbea6d72c9e..e4c828d8016 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: rc.conf,v 1.187 2014/03/15 22:13:36 sthen Exp $ +# $OpenBSD: rc.conf,v 1.188 2014/04/23 09:56:56 ajacoutot Exp $ # DO NOT EDIT THIS FILE!! # @@ -62,11 +62,6 @@ inetd_flags=NO # for normal use: "" rwhod_flags=NO # for normal use: "" portmap_flags=NO # for normal use: "" # Note: inetd(8) rpc services need portmap too -kdc_flags=NO # for normal use: "" see 'info heimdal' for help -kadmind_flags=NO # for normal use: "" -kpasswdd_flags=NO # for normal use: "" -ipropd_master_flags=NO # for normal use: "" -ipropd_slave_flags=NO # for normal use: "[master hostname]" amd_flags=NO # for normal use: "" and see amd_master below tftpd_flags=NO # for normal use: "[chroot dir]" tftpproxy_flags=NO # for normal use: "" @@ -127,7 +122,7 @@ shlib_dirs= # extra directories for ldconfig, separated # started in the specified order and stopped in reverse order pkg_scripts= -unset kadmind_flags kdc_flags kpasswdd_flags mountd_flags nfsd_flags ypbind_flags +unset mountd_flags nfsd_flags ypbind_flags [ -f /etc/rc.conf.local ] && . /etc/rc.conf.local @@ -144,9 +139,6 @@ if [ X"${pf}" = X"NO" ]; then fi # backward compatibility -: ${kadmind_flags=$([ X"${krb5_master_kdc-NO}" = XYES ] || echo NO)} -: ${kdc_flags=$([ X"${krb5_master_kdc-NO}" = XYES -o X"${krb5_slave_kdc-NO}" = XYES ] || echo NO)} -: ${kpasswdd_flags=$([ X"${krb5_master_kdc-NO}" = XYES ] || echo NO)} : ${mountd_flags=$([ X"${nfs_server-NO}" = XYES ] || echo NO)} : ${nfsd_flags=$([ X"${nfs_server-NO}" = XYES ] && echo "-tun 4" || echo NO)} : ${ypbind_flags=$([ X"`domainname`" != X"" -a -d /var/yp/binding ] || echo NO)} diff --git a/etc/rc.d/ipropd_master b/etc/rc.d/ipropd_master deleted file mode 100644 index bc820f24314..00000000000 --- a/etc/rc.d/ipropd_master +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# -# $OpenBSD: ipropd_master,v 1.1 2013/08/09 16:24:54 ajacoutot Exp $ - -daemon="/usr/libexec/ipropd-master --detach" - -. /etc/rc.d/rc.subr - -rc_reload=NO - -rc_cmd $1 diff --git a/etc/rc.d/ipropd_slave b/etc/rc.d/ipropd_slave deleted file mode 100644 index e58988d4205..00000000000 --- a/etc/rc.d/ipropd_slave +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# -# $OpenBSD: ipropd_slave,v 1.1 2013/08/09 16:24:54 ajacoutot Exp $ - -daemon="/usr/libexec/ipropd-slave --detach" - -. /etc/rc.d/rc.subr - -rc_reload=NO - -rc_cmd $1 diff --git a/etc/rc.d/kadmind b/etc/rc.d/kadmind deleted file mode 100644 index 8345b58ad17..00000000000 --- a/etc/rc.d/kadmind +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# -# $OpenBSD: kadmind,v 1.1 2011/07/07 18:17:50 ajacoutot Exp $ - -daemon="/usr/libexec/kadmind" - -. /etc/rc.d/rc.subr - -rc_bg=YES -rc_reload=NO - -rc_cmd $1 diff --git a/etc/rc.d/kdc b/etc/rc.d/kdc deleted file mode 100644 index a4c98ece55c..00000000000 --- a/etc/rc.d/kdc +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -# -# $OpenBSD: kdc,v 1.2 2013/06/17 19:23:24 ajacoutot Exp $ - -daemon="/usr/libexec/kdc --detach" - -. /etc/rc.d/rc.subr - -rc_reload=NO - -rc_cmd $1 diff --git a/etc/rc.d/kpasswdd b/etc/rc.d/kpasswdd deleted file mode 100644 index cdb88de95bf..00000000000 --- a/etc/rc.d/kpasswdd +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# -# $OpenBSD: kpasswdd,v 1.1 2011/07/07 18:17:50 ajacoutot Exp $ - -daemon="/usr/libexec/kpasswdd" - -. /etc/rc.d/rc.subr - -rc_bg=YES -rc_reload=NO - -rc_cmd $1 -- 2.20.1