diff options
| author | Colin Watson <cjwatson@debian.org> | 2012-05-17 13:04:02 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2012-05-17 13:04:02 +0100 |
| commit | dd5ed53e20d218607260916a6b04d1c8c5b3d88f (patch) | |
| tree | c59b4dbcc610f10700945f885adf3bddc2542c26 /servconf.c | |
| parent | 8241a65bf12ac53c1b7304bba7ce739aad80b8b8 (diff) | |
| parent | b9bc38990c5eb5d99e28ca5af6d3491fd4a0060a (diff) | |
merge 6.0p1
Diffstat (limited to 'servconf.c')
| -rw-r--r-- | servconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servconf.c b/servconf.c index 9bff59de3..9937f8f2f 100644 --- a/servconf.c +++ b/servconf.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: servconf.c,v 1.222 2011/06/22 21:57:01 djm Exp $ */ | 1 | /* $OpenBSD: servconf.c,v 1.223 2011/09/23 00:22:04 dtucker Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
| 4 | * All rights reserved | 4 | * All rights reserved |
| @@ -1374,7 +1374,7 @@ process_server_config_line(ServerOptions *options, char *line, | |||
| 1374 | fatal("%s line %d: missing host in PermitOpen", | 1374 | fatal("%s line %d: missing host in PermitOpen", |
| 1375 | filename, linenum); | 1375 | filename, linenum); |
| 1376 | p = cleanhostname(p); | 1376 | p = cleanhostname(p); |
| 1377 | if (arg == NULL || (port = a2port(arg)) <= 0) | 1377 | if (arg == NULL || ((port = permitopen_port(arg)) < 0)) |
| 1378 | fatal("%s line %d: bad port number in " | 1378 | fatal("%s line %d: bad port number in " |
| 1379 | "PermitOpen", filename, linenum); | 1379 | "PermitOpen", filename, linenum); |
| 1380 | if (*activep && n == -1) | 1380 | if (*activep && n == -1) |