diff options
| author | Hakan Olsson <ho@cvs.openbsd.org> | 2006-08-31 19:01:17 +0000 |
|---|---|---|
| committer | Hakan Olsson <ho@cvs.openbsd.org> | 2006-08-31 19:01:17 +0000 |
| commit | 88d0f9edf4b2edcee4bafddc724ce039c1e9f857 (patch) | |
| tree | 28f25f3b8a4fad2c2bcde24da955441ba13242cd /sbin/ipsecctl | |
| parent | 41fce8d53cef658b9545d3febb87a79921572241 (diff) | |
Security Association Database is abbreviated 'SAD' (RFC 2401 et al), not 'SADB'. jmc@, hshoexer@ ok.
Diffstat (limited to 'sbin/ipsecctl')
| -rw-r--r-- | sbin/ipsecctl/ipsecctl.8 | 10 | ||||
| -rw-r--r-- | sbin/ipsecctl/ipsecctl.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sbin/ipsecctl/ipsecctl.8 b/sbin/ipsecctl/ipsecctl.8 index d287c2f5bc0..8c616d74548 100644 --- a/sbin/ipsecctl/ipsecctl.8 +++ b/sbin/ipsecctl/ipsecctl.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ipsecctl.8,v 1.20 2006/06/09 13:48:10 jmc Exp $ +.\" $OpenBSD: ipsecctl.8,v 1.21 2006/08/31 19:01:16 ho Exp $ .\" .\" Copyright (c) 2004, 2005 Hans-Joerg Hoexer <hshoexer@openbsd.org> .\" @@ -33,7 +33,7 @@ The utility controls flows that determine which packets are to be processed by IPsec. It allows ruleset configuration, and retrieval of status information from the -kernel's SPD (Security Policy Database) and SADB (Security Association +kernel's SPD (Security Policy Database) and SAD (Security Association Database). .Pp It also can control @@ -43,7 +43,7 @@ and establish tunnels using automatic keying with .Pp Additionally, .Nm -can be used to configure the SADB for use with TCP MD5 +can be used to configure the SAD for use with TCP MD5 signatures, as described in RFC 2385. See .Xr tcp 4 @@ -73,7 +73,7 @@ will add flows. .It Fl F The .Fl F -option flushes the SPD and the SADB. +option flushes the SPD and the SAD. .It Fl f Ar file Load the rules contained in .Ar file . @@ -92,7 +92,7 @@ Show the kernel's databases, specified by .It Fl s Cm flow Show the ruleset loaded into the SPD. .It Fl s Cm sa -Show the active SADB entries. +Show the active SAD entries. .It Fl s Cm all Show all of the above. .El diff --git a/sbin/ipsecctl/ipsecctl.c b/sbin/ipsecctl/ipsecctl.c index c961ebd2d4b..e89ecafa3b6 100644 --- a/sbin/ipsecctl/ipsecctl.c +++ b/sbin/ipsecctl/ipsecctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsecctl.c,v 1.58 2006/06/08 23:05:14 hshoexer Exp $ */ +/* $OpenBSD: ipsecctl.c,v 1.59 2006/08/31 19:01:16 ho Exp $ */ /* * Copyright (c) 2004, 2005 Hans-Joerg Hoexer <hshoexer@openbsd.org> * @@ -526,9 +526,9 @@ ipsecctl_show_sas(int opts) mib[4] = SADB_SATYPE_UNSPEC; if (opts & IPSECCTL_OPT_SHOWALL) - ipsecctl_print_title("SADB:"); + ipsecctl_print_title("SAD:"); - /* When the SADB is empty we get ENOENT, no need to err(). */ + /* When the SAD is empty we get ENOENT, no need to err(). */ if (sysctl(mib, 5, NULL, &need, NULL, 0) == -1 && errno != ENOENT) err(1, "ipsecctl_show_sas: sysctl"); if (need == 0) { |