summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--misc.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c9cfedfa2..9c1d96ed5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
9 - markus@cvs.openbsd.org 2003/04/12 10:13:57 9 - markus@cvs.openbsd.org 2003/04/12 10:13:57
10 [cipher.c] 10 [cipher.c]
11 hide cipher details; ok djm@ 11 hide cipher details; ok djm@
12 - markus@cvs.openbsd.org 2003/04/12 10:15:36
13 [misc.c]
14 debug->debug2
12 15
1320030512 1620030512
14 - (djm) Redhat spec: Don't install profile.d scripts when not 17 - (djm) Redhat spec: Don't install profile.d scripts when not
@@ -1396,4 +1399,4 @@
1396 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1399 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1397 ok provos@ 1400 ok provos@
1398 1401
1399$Id: ChangeLog,v 1.2679 2003/05/14 03:41:23 djm Exp $ 1402$Id: ChangeLog,v 1.2680 2003/05/14 03:41:39 djm Exp $
diff --git a/misc.c b/misc.c
index 512fb22fb..ff1966192 100644
--- a/misc.c
+++ b/misc.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: misc.c,v 1.20 2002/12/13 10:03:15 markus Exp $"); 26RCSID("$OpenBSD: misc.c,v 1.21 2003/04/12 10:15:36 markus Exp $");
27 27
28#include "misc.h" 28#include "misc.h"
29#include "log.h" 29#include "log.h"
@@ -60,7 +60,7 @@ set_nonblock(int fd)
60 debug2("fd %d is O_NONBLOCK", fd); 60 debug2("fd %d is O_NONBLOCK", fd);
61 return; 61 return;
62 } 62 }
63 debug("fd %d setting O_NONBLOCK", fd); 63 debug2("fd %d setting O_NONBLOCK", fd);
64 val |= O_NONBLOCK; 64 val |= O_NONBLOCK;
65 if (fcntl(fd, F_SETFL, val) == -1) 65 if (fcntl(fd, F_SETFL, val) == -1)
66 debug("fcntl(%d, F_SETFL, O_NONBLOCK): %s", 66 debug("fcntl(%d, F_SETFL, O_NONBLOCK): %s",