- (djm) [serverloop.c] Fix syntax error on Cygwin; from Corinna Vinschen
diff --git a/ChangeLog b/ChangeLog
index 385c066..2cb5136 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,15 @@
-20130810
+20140819
+ - (djm) [serverloop.c] Fix syntax error on Cygwin; from Corinna Vinschen
+
+20140811
+ - (djm) [myproposal.h] Make curve25519 KEX dependent on
+ HAVE_EVP_SHA256 instead of OPENSSL_HAS_ECC.
+
+20140810
- (djm) [README contrib/caldera/openssh.spec]
[contrib/redhat/openssh.spec contrib/suse/openssh.spec] Update versions
-20130801
+20140801
- (djm) [regress/multiplex.sh] Skip test for non-OpenBSD netcat. We need
a better solution, but this will have to do for now.
- (djm) [regress/multiplex.sh] Instruct nc not to quit as soon as stdin
diff --git a/serverloop.c b/serverloop.c
index 7a80da5..e92f9e2 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -1173,9 +1173,9 @@
/* check permissions */
if ((options.allow_tcp_forwarding & FORWARD_REMOTE) == 0 ||
no_port_forwarding_flag ||
- (!want_reply && fwd.listen_port == 0) ||
+ (!want_reply && fwd.listen_port == 0)
#ifndef NO_IPPORT_RESERVED_CONCEPT
- (fwd.listen_port != 0 && fwd.listen_port < IPPORT_RESERVED &&
+ || (fwd.listen_port != 0 && fwd.listen_port < IPPORT_RESERVED &&
pw->pw_uid != 0)
#endif
) {