summaryrefslogtreecommitdiffstats
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 a4b846d8..78e04928 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
[sshconnect2.c]
rename 'supported' static var in userauth_gssapi() to 'gss_supported'
to avoid shadowing the global version. markus@ ok
+ - markus@cvs.openbsd.org 2003/10/28 09:08:06
+ [misc.c]
+ error->debug for getsockopt+TCP_NODELAY; several requests
20031021
- (dtucker) [INSTALL] Some system crypt() functions support MD5 passwords
@@ -1387,4 +1390,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.3089 2003/11/03 09:06:14 dtucker Exp $
+$Id: ChangeLog,v 1.3090 2003/11/03 09:07:14 dtucker Exp $
diff --git a/misc.c b/misc.c
index ac616de0..1f320353 100644
--- a/misc.c
+++ b/misc.c
@@ -23,7 +23,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: misc.c,v 1.22 2003/09/18 08:49:45 markus Exp $");
+RCSID("$OpenBSD: misc.c,v 1.23 2003/10/28 09:08:06 markus Exp $");
#include "misc.h"
#include "log.h"
@@ -97,7 +97,7 @@ set_nodelay(int fd)
optlen = sizeof opt;
if (getsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &opt, &optlen) == -1) {
- error("getsockopt TCP_NODELAY: %.100s", strerror(errno));
+ debug("getsockopt TCP_NODELAY: %.100s", strerror(errno));
return;
}
if (opt == 1) {