summaryrefslogtreecommitdiff
path: root/misc.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 /misc.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 'misc.c')
-rw-r--r--misc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/misc.c b/misc.c
index 1814ae3af..ddff00e52 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: misc.c,v 1.85 2011/03/29 18:54:17 stevesk Exp $ */ 1/* $OpenBSD: misc.c,v 1.86 2011/09/05 05:59:08 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2005,2006 Damien Miller. All rights reserved. 4 * Copyright (c) 2005,2006 Damien Miller. All rights reserved.
@@ -991,7 +991,7 @@ static const struct {
991 { "af11", IPTOS_DSCP_AF11 }, 991 { "af11", IPTOS_DSCP_AF11 },
992 { "af12", IPTOS_DSCP_AF12 }, 992 { "af12", IPTOS_DSCP_AF12 },
993 { "af13", IPTOS_DSCP_AF13 }, 993 { "af13", IPTOS_DSCP_AF13 },
994 { "af14", IPTOS_DSCP_AF21 }, 994 { "af21", IPTOS_DSCP_AF21 },
995 { "af22", IPTOS_DSCP_AF22 }, 995 { "af22", IPTOS_DSCP_AF22 },
996 { "af23", IPTOS_DSCP_AF23 }, 996 { "af23", IPTOS_DSCP_AF23 },
997 { "af31", IPTOS_DSCP_AF31 }, 997 { "af31", IPTOS_DSCP_AF31 },