Module Name:    src
Committed By:   tteras
Date:           Fri Mar  5 06:51:26 UTC 2010

Modified Files:
        src/crypto/dist/ipsec-tools/src/libipsec [ipsec-tools-0_7-branch]:
            ipsec_set_policy.3
        src/crypto/dist/ipsec-tools/src/racoon [ipsec-tools-0_7-branch]:
            privsep.c racoon.conf.5
        src/crypto/dist/ipsec-tools/src/racoon/doc [ipsec-tools-0_7-branch]:
            FAQ
        src/crypto/dist/ipsec-tools/src/setkey [ipsec-tools-0_7-branch]:
            setkey.8

Log Message:
>From Stefan Bauer: Fix multiple typoes and manpage formatting errors.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.6.1 \
    src/crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3
cvs rdiff -u -r1.6 -r1.6.6.1 src/crypto/dist/ipsec-tools/src/racoon/privsep.c
cvs rdiff -u -r1.34.4.3 -r1.34.4.4 \
    src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.6.1 \
    src/crypto/dist/ipsec-tools/src/racoon/doc/FAQ
cvs rdiff -u -r1.20 -r1.20.6.1 \
    src/crypto/dist/ipsec-tools/src/setkey/setkey.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3
diff -u src/crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3:1.13 src/crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3:1.13.6.1
--- src/crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3:1.13	Sat Sep  9 16:22:09 2006
+++ src/crypto/dist/ipsec-tools/src/libipsec/ipsec_set_policy.3	Fri Mar  5 06:51:25 2010
@@ -1,4 +1,4 @@
-.\"	$NetBSD: ipsec_set_policy.3,v 1.13 2006/09/09 16:22:09 manu Exp $
+.\"	$NetBSD: ipsec_set_policy.3,v 1.13.6.1 2010/03/05 06:51:25 tteras Exp $
 .\"
 .\"	$KAME: ipsec_set_policy.3,v 1.16 2003/01/06 21:59:03 sumikawa Exp $
 .\"
@@ -128,7 +128,7 @@
 .Ar {priority,prio} offset
 .Xc
 .Ar offset
-is an integer in the range -2147483647..214783648.
+is an integer in the range \-2147483647..214783648.
 .It Xo
 .Ar {priority,prio} base {+,-} offset
 .Xc

Index: src/crypto/dist/ipsec-tools/src/racoon/privsep.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/privsep.c:1.6 src/crypto/dist/ipsec-tools/src/racoon/privsep.c:1.6.6.1
--- src/crypto/dist/ipsec-tools/src/racoon/privsep.c:1.6	Sat Sep  9 16:22:10 2006
+++ src/crypto/dist/ipsec-tools/src/racoon/privsep.c	Fri Mar  5 06:51:25 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: privsep.c,v 1.6 2006/09/09 16:22:10 manu Exp $	*/
+/*	$NetBSD: privsep.c,v 1.6.6.1 2010/03/05 06:51:25 tteras Exp $	*/
 
 /* Id: privsep.c,v 1.15 2005/08/08 11:23:44 vanhu Exp */
 
@@ -1089,7 +1089,7 @@
 }
 
 /*
- * Filter unsafe environement variables
+ * Filter unsafe environment variables
  */
 static int
 unsafe_env(envp)
@@ -1110,7 +1110,7 @@
 	return 0;
 found:
 	plog(LLV_ERROR, LOCATION, NULL, 
-	    "privsep_script_exec: unsafe environement variable\n");
+	    "privsep_script_exec: unsafe environment variable\n");
 	return -1;
 }
 

Index: src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5
diff -u src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5:1.34.4.3 src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5:1.34.4.4
--- src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5:1.34.4.3	Mon Sep  3 18:07:29 2007
+++ src/crypto/dist/ipsec-tools/src/racoon/racoon.conf.5	Fri Mar  5 06:51:25 2010
@@ -1,4 +1,4 @@
-.\"	$NetBSD: racoon.conf.5,v 1.34.4.3 2007/09/03 18:07:29 mgrooms Exp $
+.\"	$NetBSD: racoon.conf.5,v 1.34.4.4 2010/03/05 06:51:25 tteras Exp $
 .\"
 .\"	Id: racoon.conf.5,v 1.54 2006/08/22 18:17:17 manubsd Exp
 .\"
@@ -819,7 +819,7 @@
 The default size is 16 bytes.
 .\"
 .It Ic ph1id Ar number ;
-An optionnal number to identify the remote proposal and to link it
+An optional number to identify the remote proposal and to link it
 only with sainfos who have the same number.
 Defaults to 0.
 .\"

Index: src/crypto/dist/ipsec-tools/src/racoon/doc/FAQ
diff -u src/crypto/dist/ipsec-tools/src/racoon/doc/FAQ:1.1.1.2 src/crypto/dist/ipsec-tools/src/racoon/doc/FAQ:1.1.1.2.6.1
--- src/crypto/dist/ipsec-tools/src/racoon/doc/FAQ:1.1.1.2	Sat Sep  9 16:12:23 2006
+++ src/crypto/dist/ipsec-tools/src/racoon/doc/FAQ	Fri Mar  5 06:51:26 2010
@@ -18,7 +18,7 @@
 
 A:
 	Configure both ends exactly the same.  With just a tiny little
-	differnce, you will be in trouble.
+	difference, you will be in trouble.
 
 Q: How to build racoon on my platform?
 

Index: src/crypto/dist/ipsec-tools/src/setkey/setkey.8
diff -u src/crypto/dist/ipsec-tools/src/setkey/setkey.8:1.20 src/crypto/dist/ipsec-tools/src/setkey/setkey.8:1.20.6.1
--- src/crypto/dist/ipsec-tools/src/setkey/setkey.8:1.20	Fri Oct  6 12:02:27 2006
+++ src/crypto/dist/ipsec-tools/src/setkey/setkey.8	Fri Mar  5 06:51:26 2010
@@ -1,4 +1,4 @@
-.\"	$NetBSD: setkey.8,v 1.20 2006/10/06 12:02:27 manu Exp $
+.\"	$NetBSD: setkey.8,v 1.20.6.1 2010/03/05 06:51:26 tteras Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
 .\" All rights reserved.
@@ -677,7 +677,7 @@
 addresses to get the correct matching.
 Here is an example:
 .Bd -literal -offset
-spdadd 10.0.11.0/24[any] 10.0.11.33/32[any] any -P out ipsec
+spdadd 10.0.11.0/24[any] 10.0.11.33/32[any] any \-P out ipsec
     esp/tunnel/192.168.0.1[4500]-192.168.1.2[30000]/require ;
 
 .Ed
@@ -813,14 +813,14 @@
 .Sh EXAMPLES
 .Bd -literal -offset
 add 3ffe:501:4819::1 3ffe:501:481d::1 esp 123457
-	-E des-cbc 0x3ffe05014819ffff ;
+	\-E des-cbc 0x3ffe05014819ffff ;
 
-add -6 myhost.example.com yourhost.example.com ah 123456
-	-A hmac-sha1 "AH SA configuration!" ;
+add \-6 myhost.example.com yourhost.example.com ah 123456
+	\-A hmac-sha1 "AH SA configuration!" ;
 
 add 10.0.11.41 10.0.11.33 esp 0x10001
-	-E des-cbc 0x3ffe05014819ffff
-	-A hmac-md5 "authentication!!" ;
+	\-E des-cbc 0x3ffe05014819ffff
+	\-A hmac-md5 "authentication!!" ;
 
 get 3ffe:501:4819::1 3ffe:501:481d::1 ah 123456 ;
 
@@ -829,17 +829,17 @@
 dump esp ;
 
 spdadd 10.0.11.41/32[21] 10.0.11.33/32[any] any
-	-P out ipsec esp/tunnel/192.168.0.1-192.168.1.2/require ;
+	\-P out ipsec esp/tunnel/192.168.0.1-192.168.1.2/require ;
 
-add 10.1.10.34 10.1.10.36 tcp 0x1000 -A tcp-md5 "TCP-MD5 BGP secret" ;
+add 10.1.10.34 10.1.10.36 tcp 0x1000 \-A tcp-md5 "TCP-MD5 BGP secret" ;
 
 add 10.0.11.41 10.0.11.33 esp 0x10001
-	-ctx 1 1 "system_u:system_r:unconfined_t:SystemLow-SystemHigh"
-	-E des-cbc 0x3ffe05014819ffff;
+	\-ctx 1 1 "system_u:system_r:unconfined_t:SystemLow-SystemHigh"
+	\-E des-cbc 0x3ffe05014819ffff;
 
 spdadd 10.0.11.41 10.0.11.33 any
-	-ctx 1 1 "system_u:system_r:unconfined_t:SystemLow-SystemHigh"
-	-P out ipsec esp/transport//require ;
+	\-ctx 1 1 "system_u:system_r:unconfined_t:SystemLow-SystemHigh"
+	\-P out ipsec esp/transport//require ;
 .Ed
 .\"
 .Sh SEE ALSO

Reply via email to