- (djm) [serverloop.c] Fix syntax error on Cygwin; from Corinna Vinschen

This commit is contained in:
Damien Miller 2014-08-19 11:14:17 +10:00
parent 9eaeea2cf2
commit d4e7d59d01
2 changed files with 11 additions and 4 deletions

View File

@ -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] - (djm) [README contrib/caldera/openssh.spec]
[contrib/redhat/openssh.spec contrib/suse/openssh.spec] Update versions [contrib/redhat/openssh.spec contrib/suse/openssh.spec] Update versions
20130801 20140801
- (djm) [regress/multiplex.sh] Skip test for non-OpenBSD netcat. We need - (djm) [regress/multiplex.sh] Skip test for non-OpenBSD netcat. We need
a better solution, but this will have to do for now. a better solution, but this will have to do for now.
- (djm) [regress/multiplex.sh] Instruct nc not to quit as soon as stdin - (djm) [regress/multiplex.sh] Instruct nc not to quit as soon as stdin

View File

@ -1173,9 +1173,9 @@ server_input_global_request(int type, u_int32_t seq, void *ctxt)
/* check permissions */ /* check permissions */
if ((options.allow_tcp_forwarding & FORWARD_REMOTE) == 0 || if ((options.allow_tcp_forwarding & FORWARD_REMOTE) == 0 ||
no_port_forwarding_flag || no_port_forwarding_flag ||
(!want_reply && fwd.listen_port == 0) || (!want_reply && fwd.listen_port == 0)
#ifndef NO_IPPORT_RESERVED_CONCEPT #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) pw->pw_uid != 0)
#endif #endif
) { ) {