summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--roaming_common.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a6b547198..0317221ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,10 @@
23 [monitor_fdpass.c] 23 [monitor_fdpass.c]
24 avoid spinning when fd passing on nonblocking sockets by calling poll() 24 avoid spinning when fd passing on nonblocking sockets by calling poll()
25 in the EINTR/EAGAIN path, much like we do in atomicio; ok dtucker@ 25 in the EINTR/EAGAIN path, much like we do in atomicio; ok dtucker@
26 - djm@cvs.openbsd.org 2010/01/12 00:59:29
27 [roaming_common.c]
28 delete with extreme prejudice a debug() that fired with every keypress;
29 ok dtucker deraadt
26 30
2720100110 3120100110
28 - (dtucker) [configure.ac misc.c readconf.c servconf.c ssh-keyscan.c] 32 - (dtucker) [configure.ac misc.c readconf.c servconf.c ssh-keyscan.c]
diff --git a/roaming_common.c b/roaming_common.c
index 3885a0368..9adbe56fc 100644
--- a/roaming_common.c
+++ b/roaming_common.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: roaming_common.c,v 1.7 2009/12/06 23:53:45 djm Exp $ */ 1/* $OpenBSD: roaming_common.c,v 1.8 2010/01/12 00:59:29 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2004-2009 AppGate Network Security AB 3 * Copyright (c) 2004-2009 AppGate Network Security AB
4 * 4 *
@@ -145,8 +145,6 @@ roaming_write(int fd, const void *buf, size_t count, int *cont)
145 if (out_buf_size > 0) 145 if (out_buf_size > 0)
146 buf_append(buf, ret); 146 buf_append(buf, ret);
147 } 147 }
148 debug3("Wrote %ld bytes for a total of %llu", (long)ret,
149 (unsigned long long)write_bytes);
150 if (out_buf_size > 0 && 148 if (out_buf_size > 0 &&
151 (ret == 0 || (ret == -1 && errno == EPIPE))) { 149 (ret == 0 || (ret == -1 && errno == EPIPE))) {
152 if (wait_for_roaming_reconnect() != 0) { 150 if (wait_for_roaming_reconnect() != 0) {