summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Hedenfal <martinh@cvs.openbsd.org>2010-06-03 17:49:48 +0000
committerMartin Hedenfal <martinh@cvs.openbsd.org>2010-06-03 17:49:48 +0000
commitb91fdeb9d7c050f7f91886456999b45b9484c901 (patch)
tree99cf2c5aa240e7116b4b5a5538298274dfb88d34
parent808f8a9fffb357eef8c99344ca9e32dadc538415 (diff)
enable ldapd and ldapctl in the build
ok deraadt@
-rw-r--r--etc/ftpusers3
-rw-r--r--etc/group1
-rw-r--r--etc/mail/aliases3
-rw-r--r--etc/master.passwd1
-rw-r--r--usr.sbin/Makefile8
5 files changed, 10 insertions, 6 deletions
diff --git a/etc/ftpusers b/etc/ftpusers
index e781a680227..45062638308 100644
--- a/etc/ftpusers
+++ b/etc/ftpusers
@@ -1,4 +1,4 @@
-# $OpenBSD: ftpusers,v 1.41 2010/04/22 17:43:30 ratchov Exp $
+# $OpenBSD: ftpusers,v 1.42 2010/06/03 17:49:47 martinh Exp $
#
# list of users disallowed any ftp access.
# read by ftpd(8).
@@ -51,3 +51,4 @@ _rwalld
_nsd
_ldpd
_sndio
+_ldapd
diff --git a/etc/group b/etc/group
index 369dfa23771..be5c1f7161e 100644
--- a/etc/group
+++ b/etc/group
@@ -64,6 +64,7 @@ _rwalld:*:96:
_nsd:*:97:
_ldpd:*:98:
_sndio:*:99:
+_ldapd:*:100:
dialer:*:117:
nogroup:*:32766:
nobody:*:32767:
diff --git a/etc/mail/aliases b/etc/mail/aliases
index ee17f276607..2ec7b918700 100644
--- a/etc/mail/aliases
+++ b/etc/mail/aliases
@@ -1,5 +1,5 @@
#
-# $OpenBSD: aliases,v 1.33 2010/04/22 17:43:30 ratchov Exp $
+# $OpenBSD: aliases,v 1.34 2010/06/03 17:49:47 martinh Exp $
#
# Aliases in this file will NOT be expanded in the header from
# Mail, but WILL be visible over networks or from /usr/libexec/mail.local.
@@ -33,6 +33,7 @@ _identd: /dev/null
_isakmpd: /dev/null
_kadmin: /dev/null
_kdc: /dev/null
+_ldapd: /dev/null
_ldpd: /dev/null
_mopd: /dev/null
_nsd: /dev/null
diff --git a/etc/master.passwd b/etc/master.passwd
index 9140e01e32d..16f7faa571d 100644
--- a/etc/master.passwd
+++ b/etc/master.passwd
@@ -46,4 +46,5 @@ _rwalld:*:96:96::0:0:rpc.rwalld:/var/empty:/sbin/nologin
_nsd:*:97:97::0:0:NSD Daemon:/var/empty:/sbin/nologin
_ldpd:*:98:98::0:0:LDP Daemon:/var/empty:/sbin/nologin
_sndio:*:99:99::0:0:sndio privsep:/var/empty:/sbin/nologin
+_ldapd:*:100:100::0:0:LDAP Daemon:/var/empty:/sbin/nologin
nobody:*:32767:32767::0:0:Unprivileged user for NFS:/nonexistent:/sbin/nologin
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 21c201a556b..601bada7512 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.149 2009/12/21 14:15:28 claudio Exp $
+# $OpenBSD: Makefile,v 1.150 2010/06/03 17:49:47 martinh Exp $
.include <bsd.own.mk>
@@ -6,9 +6,9 @@ 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 faithd fdformat \
ftp-proxy gpioctl hostapd hotplugd httpd ifstated inetd iostat \
- kgmon kvm_mkdb ldpd ldpctl lpr mailwrapper map-mbone memconfig \
- mksuncd mopd mrinfo mrouted mtrace mtree ndp netgroup_mkdb ntpd \
- openssl ospfctl ospfd ospf6d ospf6ctl pcidump pkg_add popa3d \
+ kgmon kvm_mkdb ldapd ldapctl ldpd ldpctl lpr mailwrapper map-mbone \
+ memconfig mksuncd mopd mrinfo mrouted mtrace mtree ndp netgroup_mkdb \
+ ntpd openssl ospfctl ospfd ospf6d ospf6ctl pcidump pkg_add popa3d \
portmap ppp pppd pppoe procmap pstat pwd_mkdb quot quotaon rarpd \
rbootd rdate rdconfig relayctl relayd repquota rip6query ripctl ripd \
rmt route6d rpc.bootparamd rpc.lockd rpc.statd rtadvd rtsold rwhod \