- (bal) NO_IPPORT_RESERVED_CONCEPT used instead of CYGWIN so other platforms

   lacking that concept can share it. Patch by vinschen@redhat.com

diff --git a/ChangeLog b/ChangeLog
index 4522e963dc6d77f6e5f39dbee4df7b19861413cf..5279c7363acce7e1660d49b1874c6ee564ff1492 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20020709
+ - (bal) NO_IPPORT_RESERVED_CONCEPT used instead of CYGWIN so other platforms
+   lacking that concept can share it. Patch by vinschen@redhat.com
+
 20020708
  - (tim) [openssh/contrib/solaris/buildpkg.sh] add PKG_INSTALL_ROOT to
    work in a jumpstart environment. patch by kbrint@rufus.net

diff --git a/acconfig.h b/acconfig.h
index aa8b6782505c703aebcaad2f871b81ae5eb6a2f8..086be74921c780aed2684b1701720c905984d16e 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -310,6 +310,9 @@
 /* Define if X11 doesn't support AF_UNIX sockets on that system */
 #undef NO_X11_UNIX_SOCKETS
 
+/* Define if the concept of ports only accessible to superusers isn't known */
+#undef NO_IPPORT_RESERVED_CONCEPT
+
 /* Needed for SCO and NeXT */
 #undef BROKEN_SAVED_UIDS
 

diff --git a/configure.ac b/configure.ac
index 8bd7d477932d6944a6348c94fa0717b23458a516..dfc8fbbd29aaedde26695de0c6950a6b2629d2ec 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -91,6 +91,7 @@ case "$host" in
        AC_DEFINE(IPV4_DEFAULT)
        AC_DEFINE(IP_TOS_IS_BROKEN)
        AC_DEFINE(NO_X11_UNIX_SOCKETS)
+       AC_DEFINE(NO_IPPORT_RESERVED_CONCEPT)
        AC_DEFINE(DISABLE_FD_PASSING)
        AC_DEFINE(SETGROUPS_NOOP)
        ;;

diff --git a/readconf.c b/readconf.c
index 80d99fef1a4dda59abf31c7bfeec896cba48ded5..bae06be1269c8db2250079e84de78dcff62da08d 100644 (file)
--- a/readconf.c
+++ b/readconf.c
@@ -199,7 +199,7 @@ add_local_forward(Options *options, u_short port, const char *host,
                  u_short host_port)
 {
        Forward *fwd;
-#ifndef HAVE_CYGWIN
+#ifndef NO_IPPORT_RESERVED_CONCEPT
        extern uid_t original_real_uid;
        if (port < IPPORT_RESERVED && original_real_uid != 0)
                fatal("Privileged ports can only be forwarded by root.");

diff --git a/serverloop.c b/serverloop.c
index 1349213554ddb1c9651faa626b3328003330d6a6..912f625015d6b428a4d9cb73ca6cbf3791724a46 100644 (file)
--- a/serverloop.c
+++ b/serverloop.c
@@ -972,8 +972,11 @@ server_input_global_request(int type, u_int32_t seq, void *ctxt)
 
                /* check permissions */
                if (!options.allow_tcp_forwarding ||
-                   no_port_forwarding_flag ||
-                   (listen_port < IPPORT_RESERVED && pw->pw_uid != 0)) {
+                   no_port_forwarding_flag
+#ifndef NO_IPPORT_RESERVED_CONCEPT
+                   || (listen_port < IPPORT_RESERVED && pw->pw_uid != 0)
+#endif
+                  ) {
                        success = 0;
                        packet_send_debug("Server has disabled port forwarding.");
                } else {