summaryrefslogtreecommitdiffstats
path: root/usr.sbin/ldapd/conn.c
diff options
context:
space:
mode:
authorjmatthew <jmatthew@openbsd.org>2015-11-02 06:32:51 +0000
committerjmatthew <jmatthew@openbsd.org>2015-11-02 06:32:51 +0000
commit576ea306f407aa35fb8c824f0219cd945bd2562c (patch)
treecb7b13dd6d01abc5a69b1b24e084d413a6b5bab0 /usr.sbin/ldapd/conn.c
parentFix typo: s/DT_JUMPREL/DT_JMPREL/ (diff)
downloadwireguard-openbsd-576ea306f407aa35fb8c824f0219cd945bd2562c.tar.xz
wireguard-openbsd-576ea306f407aa35fb8c824f0219cd945bd2562c.zip
use SOCK_NONBLOCK instead of fcntl
ok dlg@
Diffstat (limited to 'usr.sbin/ldapd/conn.c')
-rw-r--r--usr.sbin/ldapd/conn.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/usr.sbin/ldapd/conn.c b/usr.sbin/ldapd/conn.c
index 980d0164657..0a4a02ad323 100644
--- a/usr.sbin/ldapd/conn.c
+++ b/usr.sbin/ldapd/conn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conn.c,v 1.11 2013/11/02 13:31:51 deraadt Exp $ */
+/* $OpenBSD: conn.c,v 1.12 2015/11/02 06:32:51 jmatthew Exp $ */
/*
* Copyright (c) 2009, 2010 Martin Hedenfalk <martin@bzero.se>
@@ -291,8 +291,6 @@ conn_accept(int fd, short event, void *data)
log_debug("accepted connection from %s on fd %d", host, afd);
}
- fd_nonblock(afd);
-
if ((conn = calloc(1, sizeof(*conn))) == NULL) {
log_warn("malloc");
goto giveup;