Import openssh_7.4p1.orig.tar.gz

1 files changed, 2 insertions, 3 deletions

diff --git a/readconf.c b/readconf.c
index c177202b1..fa3fab8f0 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.259 2016/07/22 03:35:11 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.262 2016/10/25 04:08:13 jsg Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -312,7 +312,7 @@ add_local_forward(Options *options, const struct Forward *newfwd)
         extern uid_t original_real_uid;
         int i;
 
-        if (newfwd->listen_port < IPPORT_RESERVED && original_real_uid != 0 &&
+        if (!bind_permitted(newfwd->listen_port, original_real_uid) &&
             newfwd->listen_path == NULL)
                 fatal("Privileged ports can only be forwarded by root.");
         /* Don't add duplicates */
@@ -858,7 +858,6 @@ process_config_line_depth(Options *options, struct passwd *pw, const char *host,
         case oBadOption:
                 /* don't panic, but count bad options */
                 return -1;
-                /* NOTREACHED */
         case oIgnoredUnknownOption:
                 debug("%s line %d: Ignored unknown option \"%s\"",
                     filename, linenum, keyword);