summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--misc.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 01822ab3b..644bbc51a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,10 @@
24 [scp.1 sftp.1] 24 [scp.1 sftp.1]
25 mention ControlPersist and KbdInteractiveAuthentication in the -o 25 mention ControlPersist and KbdInteractiveAuthentication in the -o
26 verbiage in these pages too (prompted by jmc@) 26 verbiage in these pages too (prompted by jmc@)
27 - djm@cvs.openbsd.org 2011/09/05 05:59:08
28 [misc.c]
29 fix typo in IPQoS parsing: there is no "AF14" class, but there is
30 an "AF21" class. Spotted by giesen AT snickers.org; ok markus stevesk
27 31
2820110909 3220110909
29 - (dtucker) [entropy.h] Bug #1932: remove old definition of init_rng. From 33 - (dtucker) [entropy.h] Bug #1932: remove old definition of init_rng. From
diff --git a/misc.c b/misc.c
index 5f63090d9..a7a23dcc6 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.
@@ -941,7 +941,7 @@ static const struct {
941 { "af11", IPTOS_DSCP_AF11 }, 941 { "af11", IPTOS_DSCP_AF11 },
942 { "af12", IPTOS_DSCP_AF12 }, 942 { "af12", IPTOS_DSCP_AF12 },
943 { "af13", IPTOS_DSCP_AF13 }, 943 { "af13", IPTOS_DSCP_AF13 },
944 { "af14", IPTOS_DSCP_AF21 }, 944 { "af21", IPTOS_DSCP_AF21 },
945 { "af22", IPTOS_DSCP_AF22 }, 945 { "af22", IPTOS_DSCP_AF22 },
946 { "af23", IPTOS_DSCP_AF23 }, 946 { "af23", IPTOS_DSCP_AF23 },
947 { "af31", IPTOS_DSCP_AF31 }, 947 { "af31", IPTOS_DSCP_AF31 },