summaryrefslogtreecommitdiff
path: root/servconf.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2012-05-18 12:16:05 +0100
committerColin Watson <cjwatson@debian.org>2012-05-18 12:16:05 +0100
commitdabbdfacc9f6995b0739772a47704186dcf34ea5 (patch)
tree0a0b306a637bc85eb719261b74884f0b9573ec41 /servconf.c
parent1e0d51b642cac9a6bfb719e6320905625aa5f943 (diff)
parentdd5ed53e20d218607260916a6b04d1c8c5b3d88f (diff)
* New upstream release (http://www.openssh.org/txt/release-6.0).
- Fix IPQoS not being set on non-mapped v4-in-v6 addressed connections (closes: #643312, #650512). - Add a new privilege separation sandbox implementation for Linux's new seccomp sandbox, automatically enabled on platforms that support it. (Note: privilege separation sandboxing is still experimental.)
Diffstat (limited to 'servconf.c')
-rw-r--r--servconf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/servconf.c b/servconf.c
index 1911ac540..5b3f6f50b 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
@@ -1387,7 +1387,7 @@ process_server_config_line(ServerOptions *options, char *line,
1387 fatal("%s line %d: missing host in PermitOpen", 1387 fatal("%s line %d: missing host in PermitOpen",
1388 filename, linenum); 1388 filename, linenum);
1389 p = cleanhostname(p); 1389 p = cleanhostname(p);
1390 if (arg == NULL || (port = a2port(arg)) <= 0) 1390 if (arg == NULL || ((port = permitopen_port(arg)) < 0))
1391 fatal("%s line %d: bad port number in " 1391 fatal("%s line %d: bad port number in "
1392 "PermitOpen", filename, linenum); 1392 "PermitOpen", filename, linenum);
1393 if (*activep && n == -1) 1393 if (*activep && n == -1)