diff options
Diffstat (limited to 'usr.sbin/ldapd/ldape.c')
| -rw-r--r-- | usr.sbin/ldapd/ldape.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.sbin/ldapd/ldape.c b/usr.sbin/ldapd/ldape.c index 9d833c66b74..4fcdbea47b7 100644 --- a/usr.sbin/ldapd/ldape.c +++ b/usr.sbin/ldapd/ldape.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ldape.c,v 1.21 2015/11/02 04:48:43 jmatthew Exp $ */ +/* $OpenBSD: ldape.c,v 1.22 2015/11/02 06:32:51 jmatthew Exp $ */ /* * Copyright (c) 2009, 2010 Martin Hedenfalk <martin@bzero.se> @@ -383,7 +383,8 @@ ldape(struct passwd *pw, char *csockpath, int pipe_parent2ldap[2]) /* Initialize LDAP listeners. */ TAILQ_FOREACH(l, &conf->listeners, entry) { - l->fd = socket(l->ss.ss_family, SOCK_STREAM, 0); + l->fd = socket(l->ss.ss_family, SOCK_STREAM | SOCK_NONBLOCK, + 0); if (l->fd < 0) fatal("ldape: socket"); @@ -419,8 +420,6 @@ ldape(struct passwd *pw, char *csockpath, int pipe_parent2ldap[2]) if (listen(l->fd, 20) != 0) fatal("ldape: listen"); - fd_nonblock(l->fd); - event_set(&l->ev, l->fd, EV_READ, conn_accept, l); event_add(&l->ev, NULL); evtimer_set(&l->evt, conn_accept, l); |