diff options
| author | Damien Miller <djm@mindrot.org> | 2014-08-19 11:14:17 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-08-19 11:14:17 +1000 |
| commit | d4e7d59d01a6c7f59e8c1f94a83c086e9a33d8aa (patch) | |
| tree | 90b2df7ac5591d7668e451a55c1c708dd7fc5326 | |
| parent | 9eaeea2cf2b6af5f166cfa9ad3c7a90711a147a9 (diff) | |
| download | openssh-git-d4e7d59d01a6c7f59e8c1f94a83c086e9a33d8aa.tar.gz | |
- (djm) [serverloop.c] Fix syntax error on Cygwin; from Corinna Vinschen
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | serverloop.c | 4 |
2 files changed, 11 insertions, 4 deletions
@@ -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 7a80da55..e92f9e27 100644 --- a/serverloop.c +++ b/serverloop.c @@ -1173,9 +1173,9 @@ server_input_global_request(int type, u_int32_t seq, void *ctxt) /* 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 ) { |