summaryrefslogtreecommitdiffstats
path: root/sbin
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2002-10-20 19:08:56 +0000
committerphk <phk@FreeBSD.org>2002-10-20 19:08:56 +0000
commit6539d532098bbfd2bef664a338eed9447e734f60 (patch)
tree6f65f42f69377c99d016c957cedab4162d972c10 /sbin
parent536319e74068e70486e4ae4127774b8cdfbb3aa9 (diff)
downloadFreeBSD-src-6539d532098bbfd2bef664a338eed9447e734f60.zip
FreeBSD-src-6539d532098bbfd2bef664a338eed9447e734f60.tar.gz
s/dettach/detach/g etc.
Pointed out by: chris
Diffstat (limited to 'sbin')
-rw-r--r--sbin/gbde/gbde.810
-rw-r--r--sbin/gbde/gbde.c14
2 files changed, 12 insertions, 12 deletions
diff --git a/sbin/gbde/gbde.8 b/sbin/gbde/gbde.8
index f11d14b..c7174b6 100644
--- a/sbin/gbde/gbde.8
+++ b/sbin/gbde/gbde.8
@@ -47,7 +47,7 @@ attach
.Op Fl l Ar lockfile
.Op Fl p Ar pass-phrase
.Nm
-dettach
+detach
.Ar destination
.Nm
init
@@ -81,7 +81,7 @@ The interaction between the
program and the kernel part is not a published interface.
.Pp
The operational aspect consists of two subcommands, one to open and attach
-a device and one to close and dettach
+a device and one to close and detach
a device to the in-kernel cryptographic gbde module.
.Pp
The management part allows initialization of the master key and lock sectors
@@ -131,10 +131,10 @@ To initialize a device, using default parameters:
To attach an encrypted device:
.Dl # gbde attach ad0s1f -l /etc/ad0s1f.lock
.Pp
-To dettach an encrypted device:
-.Dl # gbde dettach ad0s1f
+To detach an encrypted device:
+.Dl # gbde detach ad0s1f
.Pp
-To initialize the second key using a dettached lockfile and a trivial
+To initialize the second key using a detached lockfile and a trivial
pass-phrase:
.Dl # gbde setkey ad0s1f -n 2 -P foo -L key2.lockfile
.Pp
diff --git a/sbin/gbde/gbde.c b/sbin/gbde/gbde.c
index 2df31c4..1b8a12a 100644
--- a/sbin/gbde/gbde.c
+++ b/sbin/gbde/gbde.c
@@ -67,7 +67,7 @@ usage(const char *reason)
fprintf(stderr, "Usage error: %s", reason);
fprintf(stderr, "Usage:\n");
fprintf(stderr, "\t%s attach dest -l filename\n", p);
- fprintf(stderr, "\t%s dettach dest\n", p);
+ fprintf(stderr, "\t%s detach dest\n", p);
fprintf(stderr, "\t%s init dest [-i] [-f filename] -l filename\n", p);
fprintf(stderr, "\t%s setkey dest [-n key] -l filename\n", p);
fprintf(stderr, "\t%s destroy dest [-n key] -l filename\n", p);
@@ -219,7 +219,7 @@ cmd_attach(const struct g_bde_softc *sc, const char *dest, const char *lfile)
}
static void
-cmd_dettach(const char *dest)
+cmd_detach(const char *dest)
{
int i, gfd;
struct geomconfiggeom gcg;
@@ -601,7 +601,7 @@ cmd_init(struct g_bde_key *gl, int dfd, const char *f_opt, int i_opt, const char
static enum action {
ACT_HUH,
- ACT_ATTACH, ACT_DETTACH,
+ ACT_ATTACH, ACT_DETACH,
ACT_INIT, ACT_SETKEY, ACT_DESTROY, ACT_NUKE
} action;
@@ -626,8 +626,8 @@ main(int argc, char **argv)
if (!strcmp(argv[1], "attach")) {
action = ACT_ATTACH;
opts = "l:p:";
- } else if (!strcmp(argv[1], "dettach")) {
- action = ACT_DETTACH;
+ } else if (!strcmp(argv[1], "detach")) {
+ action = ACT_DETACH;
opts = "";
} else if (!strcmp(argv[1], "init")) {
action = ACT_INIT;
@@ -707,8 +707,8 @@ main(int argc, char **argv)
setup_passphrase(&sc, 0, p_opt);
cmd_attach(&sc, dest, l_opt);
break;
- case ACT_DETTACH:
- cmd_dettach(dest);
+ case ACT_DETACH:
+ cmd_detach(dest);
break;
case ACT_INIT:
cmd_init(gl, dfd, f_opt, i_opt, L_opt);
OpenPOWER on IntegriCloud