diff options
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/readconf.c b/readconf.c index 5cd51f3e6..d1091cbda 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.c,v 1.259 2016/07/22 03:35:11 djm Exp $ */ | 1 | /* $OpenBSD: readconf.c,v 1.262 2016/10/25 04:08:13 jsg Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -327,7 +327,7 @@ add_local_forward(Options *options, const struct Forward *newfwd) | |||
327 | extern uid_t original_real_uid; | 327 | extern uid_t original_real_uid; |
328 | int i; | 328 | int i; |
329 | 329 | ||
330 | if (newfwd->listen_port < IPPORT_RESERVED && original_real_uid != 0 && | 330 | if (!bind_permitted(newfwd->listen_port, original_real_uid) && |
331 | newfwd->listen_path == NULL) | 331 | newfwd->listen_path == NULL) |
332 | fatal("Privileged ports can only be forwarded by root."); | 332 | fatal("Privileged ports can only be forwarded by root."); |
333 | /* Don't add duplicates */ | 333 | /* Don't add duplicates */ |
@@ -873,7 +873,6 @@ process_config_line_depth(Options *options, struct passwd *pw, const char *host, | |||
873 | case oBadOption: | 873 | case oBadOption: |
874 | /* don't panic, but count bad options */ | 874 | /* don't panic, but count bad options */ |
875 | return -1; | 875 | return -1; |
876 | /* NOTREACHED */ | ||
877 | case oIgnoredUnknownOption: | 876 | case oIgnoredUnknownOption: |
878 | debug("%s line %d: Ignored unknown option \"%s\"", | 877 | debug("%s line %d: Ignored unknown option \"%s\"", |
879 | filename, linenum, keyword); | 878 | filename, linenum, keyword); |