diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2013-08-07 22:07:36 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2013-08-07 22:07:36 +0000 |
| commit | d8a0bf09b910e4a7bd7c683f06dcad0e4276e7be (patch) | |
| tree | 3d9e8d51c06e89a72ad1be8ebdb69e35c785893f | |
| parent | a80b3962fbc1092c6d4ab5b016b75770ec3d7a41 (diff) | |
disable libexec/identd and enable usr.sbin/identd.
ok sthen@ deraadt@
| -rw-r--r-- | etc/inetd.conf | 4 | ||||
| -rw-r--r-- | etc/rc.d/identd | 6 | ||||
| -rw-r--r-- | libexec/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/Makefile | 4 |
4 files changed, 8 insertions, 10 deletions
diff --git a/etc/inetd.conf b/etc/inetd.conf index 9177efa45ba..b41d802f70d 100644 --- a/etc/inetd.conf +++ b/etc/inetd.conf @@ -1,4 +1,4 @@ -# $OpenBSD: inetd.conf,v 1.62 2013/04/20 17:46:23 deraadt Exp $ +# $OpenBSD: inetd.conf,v 1.63 2013/08/07 22:07:34 dlg Exp $ # # Internet server configuration database # @@ -12,8 +12,6 @@ #uucpd stream tcp6 nowait root /usr/libexec/uucpd uucpd #finger stream tcp nowait _fingerd /usr/libexec/fingerd fingerd -lsm #finger stream tcp6 nowait _fingerd /usr/libexec/fingerd fingerd -lsm -#ident stream tcp nowait _identd /usr/libexec/identd identd -el -#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 diff --git a/etc/rc.d/identd b/etc/rc.d/identd index 7ae5a89ed32..8c2913bf2eb 100644 --- a/etc/rc.d/identd +++ b/etc/rc.d/identd @@ -1,9 +1,9 @@ #!/bin/sh # -# $OpenBSD: identd,v 1.4 2013/03/24 07:43:32 ajacoutot Exp $ +# $OpenBSD: identd,v 1.5 2013/08/07 22:07:35 dlg Exp $ -daemon="/usr/libexec/identd -b" -daemon_flags="-el" +daemon="/usr/sbin/identd" +daemon_flags="" . /etc/rc.d/rc.subr diff --git a/libexec/Makefile b/libexec/Makefile index cebacf1e246..06717fd5af8 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -1,9 +1,9 @@ # from: @(#)Makefile 5.7 (Berkeley) 4/1/91 -# $OpenBSD: Makefile,v 1.52 2013/02/17 22:06:30 deraadt Exp $ +# $OpenBSD: Makefile,v 1.53 2013/08/07 22:07:32 dlg Exp $ .include <bsd.own.mk> -SUBDIR= comsat fingerd ftpd getty identd ld.so lockspool \ +SUBDIR= comsat fingerd ftpd getty ld.so lockspool \ mail.local makewhatis rpc.rquotad rpc.rstatd rpc.rusersd \ rpc.rwalld rpc.sprayd security spamd spamlogd spamd-setup rshd \ talkd tcpd uucpd diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index dbc604b5e04..0447a3eb068 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.168 2013/06/01 14:06:20 naddy Exp $ +# $OpenBSD: Makefile,v 1.169 2013/08/07 22:07:33 dlg Exp $ .include <bsd.own.mk> @@ -6,7 +6,7 @@ SUBDIR= ac accton acpidump adduser amd apm apmd arp \ authpf bgpctl bgpd bind chroot config cron crunchgen dev_mkdb \ dhcpd dhcrelay dvmrpctl dvmrpd edquota eeprom fdformat \ ftp-proxy fw_update gpioctl hostapd hotplugd httpd ifstated ikectl \ - inetd iostat iscsictl iscsid kgmon kvm_mkdb \ + identd inetd iostat iscsictl iscsid kgmon kvm_mkdb \ ldapd ldapctl ldomctl ldomd ldpd ldpctl lpr mailwrapper map-mbone \ memconfig mksuncd mkuboot mopd mrinfo mrouted \ mtrace mtree ndp netgroup_mkdb \ |