From edac7dae7c64b7dbeef08029e6e5848d287dcca5 Mon Sep 17 00:00:00 2001
From: mgrooms <mgrooms@NetBSD.org>
Date: Mon, 3 Sep 2007 18:08:42 +0000
Subject: [PATCH] Correct the syntax for wins4 in the man page and add nbns4 as
 an alias. Pointed out by Claas Langbehn.

---
 crypto/dist/ipsec-tools/ChangeLog                | 4 ++++
 crypto/dist/ipsec-tools/src/racoon/cftoken.l     | 3 ++-
 crypto/dist/ipsec-tools/src/racoon/racoon.conf.5 | 9 ++++++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/crypto/dist/ipsec-tools/ChangeLog b/crypto/dist/ipsec-tools/ChangeLog
index 97ab79531f98..d73592f51357 100644
--- a/crypto/dist/ipsec-tools/ChangeLog
+++ b/crypto/dist/ipsec-tools/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-03  Matthew Grooms <mgrooms@shrew.net>
+	* src/racoon/racoon.conf.5: Correct wins4 and nbns4 modecfg option syntax.
+	* src/racoon/cftoken.l: Add nbns4 as an alias for wins4.
+
 2007-08-07  Emmanuel Dreyfus  <manu@netbsd.org>
 	* src/racoon/isakmp_xauth.c: Don't mix up RADIUS authentication and
 	  authorization ports. Allow interoperability with freeradius
diff --git a/crypto/dist/ipsec-tools/src/racoon/cftoken.l b/crypto/dist/ipsec-tools/src/racoon/cftoken.l
index a8d76630bbae..c68611bbad63 100644
--- a/crypto/dist/ipsec-tools/src/racoon/cftoken.l
+++ b/crypto/dist/ipsec-tools/src/racoon/cftoken.l
@@ -1,4 +1,4 @@
-/*	$NetBSD: cftoken.l,v 1.12 2007/07/18 12:07:51 vanhu Exp $	*/
+/*	$NetBSD: cftoken.l,v 1.13 2007/09/03 18:08:43 mgrooms Exp $	*/
 
 /* Id: cftoken.l,v 1.53 2006/08/22 18:17:17 manubsd Exp */
 
@@ -237,6 +237,7 @@ hexstring	0x{hexdigit}+
 <S_CFG>network4		{ YYD; return(CFG_NET4); }
 <S_CFG>netmask4		{ YYD; return(CFG_MASK4); }
 <S_CFG>dns4		{ YYD; return(CFG_DNS4); }
+<S_CFG>nbns4		{ YYD; return(CFG_NBNS4); }
 <S_CFG>wins4		{ YYD; return(CFG_NBNS4); }
 <S_CFG>default_domain	{ YYD; return(CFG_DEFAULT_DOMAIN); }
 <S_CFG>auth_source	{ YYD; return(CFG_AUTH_SOURCE); }
diff --git a/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5 b/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5
index 9cbdb4cae144..53343cb4bc66 100644
--- a/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5
+++ b/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5
@@ -1,4 +1,4 @@
-.\"	$NetBSD: racoon.conf.5,v 1.39 2007/07/18 22:50:48 mgrooms Exp $
+.\"	$NetBSD: racoon.conf.5,v 1.40 2007/09/03 18:08:43 mgrooms Exp $
 .\"
 .\"	Id: racoon.conf.5,v 1.54 2006/08/22 18:17:17 manubsd Exp
 .\"
@@ -1199,8 +1199,11 @@ Default is
 A list of IPv4 addresses for DNS servers, separated by commas, or on multiple
 .Ic dns4
 lines.
-.It Ic nbns4 Ar addresses ;
-A list of IPv4 address for WINS servers.
+.It Ic wins4 Ar addresses ;
+A list of IPv4 address for WINS servers. The keyword
+.It nbns4
+can also be used as an alias for
+.It wins4 .
 .It Ic split_network (include | local_lan) Ar network/mask, ...
 The network configuration to send, in cidr notation (e.g. 192.168.1.0/24).
 If