summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2004-02-29 21:49:37 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2004-02-29 21:49:37 +0000
commit1d3816276e7d669d708b3817626056a91a7e9f26 (patch)
treee8bca8927bf9b63097dc41f5492cfe34d7f85681 /usr.sbin
parent8960458919906c398d8776406f0bfd6cbedf9388 (diff)
of course the control socket needs to be nonblocking as well, i could have
sworn it was... noticed by & fixed with claudio
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/bgpd/control.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/bgpd/control.c b/usr.sbin/bgpd/control.c
index 93fc06eaf1c..208808432ed 100644
--- a/usr.sbin/bgpd/control.c
+++ b/usr.sbin/bgpd/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.22 2004/02/26 16:16:41 claudio Exp $ */
+/* $OpenBSD: control.c,v 1.23 2004/02/29 21:49:36 henning Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -75,6 +75,7 @@ control_init(void)
umask(old_umask);
+ session_socket_blockmode(fd, BM_NONBLOCK);
control_state.fd = fd;
return (fd);
@@ -122,6 +123,8 @@ control_accept(int listenfd)
log_warn("session_control_accept");
}
+ session_socket_blockmode(connfd, BM_NONBLOCK);
+
if (getpeereid(connfd, &uid, &gid) == -1) {
log_warn("session_control_accept");
return;