3 files changed, 6 insertions, 12 deletions

diff --git a/configure.ac b/configure.ac
index f9fb48d12..dde3c4589 100644
--- a/configure.ac
+++ b/configure.ac
@@ -586,9 +586,8 @@ case "$host" in
                 [Define if you want to disable shadow passwords])
         AC_DEFINE([NO_X11_UNIX_SOCKETS], [1],
                 [Define if X11 doesn't support AF_UNIX sockets on that system])
-        AC_DEFINE([NO_IPPORT_RESERVED_CONCEPT], [1],
-                [Define if the concept of ports only accessible to
-                superusers isn't known])
+        AC_DEFINE([IPPORT_RESERVED], [0],
+                [Cygwin has no notion of ports only accessible to superusers])
         AC_DEFINE([DISABLE_FD_PASSING], [1],
                 [Define if your platform needs to skip post auth
                 file descriptor passing])
diff --git a/readconf.c b/readconf.c
index c692f7dd2..d63e5961d 100644
--- a/readconf.c
+++ b/readconf.c
@@ -294,14 +294,12 @@ void
 add_local_forward(Options *options, const struct Forward *newfwd)
 {
         struct Forward *fwd;
-        int i;
-#ifndef NO_IPPORT_RESERVED_CONCEPT
         extern uid_t original_real_uid;
+        int i;
 
         if (newfwd->listen_port < IPPORT_RESERVED && original_real_uid != 0 &&
             newfwd->listen_path == NULL)
                 fatal("Privileged ports can only be forwarded by root.");
-#endif
         /* Don't add duplicates */
         for (i = 0; i < options->num_local_forwards; i++) {
                 if (forward_equals(newfwd, options->local_forwards + i))
diff --git a/serverloop.c b/serverloop.c
index f9e3e5d14..3563e5d42 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -1243,12 +1243,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)
-#ifndef NO_IPPORT_RESERVED_CONCEPT
-                    || (fwd.listen_port != 0 && fwd.listen_port < IPPORT_RESERVED &&
-                    pw->pw_uid != 0)
-#endif
-                    ) {
+                    (!want_reply && fwd.listen_port == 0) ||
+                    (fwd.listen_port != 0 && fwd.listen_port < IPPORT_RESERVED &&
+                    pw->pw_uid != 0)) {
                         success = 0;
                         packet_send_debug("Server has disabled port forwarding.");
                 } else {