From 4eb836546d2a61af1ed9f2e95525124083d53762 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Thu, 15 Dec 2011 13:41:56 -0800 Subject: [PATCH] authx -> cephx everywhere it's used The term authx was in the mount.ceph man page, and got accidentally copied into rbd help. Signed-off-by: Josh Durgin --- doc/man/8/mount.ceph.rst | 4 ++-- man/mount.ceph.8 | 4 ++-- src/rbd.cc | 2 +- src/test/cli/rbd/help.t | 2 +- src/test/cli/rbd/invalid-snap-usage.t | 18 +++++++++--------- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/doc/man/8/mount.ceph.rst b/doc/man/8/mount.ceph.rst index 799e5d3949855..336efc1387a00 100644 --- a/doc/man/8/mount.ceph.rst +++ b/doc/man/8/mount.ceph.rst @@ -81,10 +81,10 @@ Options string, set the name of the hidden snapdir. Default: .snap :command:`name` - string, used with authx, Default: guest + string, used with cephx, Default: guest :command:`secret` - string, used with authx + string, used with cephx :command:`ip` my ip diff --git a/man/mount.ceph.8 b/man/mount.ceph.8 index 5bb3a02d6f078..90177945026f0 100644 --- a/man/mount.ceph.8 +++ b/man/mount.ceph.8 @@ -107,10 +107,10 @@ memory. Default: calculated from available memory string, set the name of the hidden snapdir. Default: .snap .TP .B \fBname\fP -string, used with authx, Default: guest +string, used with cephx, Default: guest .TP .B \fBsecret\fP -string, used with authx +string, used with cephx .TP .B \fBip\fP my ip diff --git a/src/rbd.cc b/src/rbd.cc index a4850c3174425..216d0f9f2c729 100644 --- a/src/rbd.cc +++ b/src/rbd.cc @@ -99,7 +99,7 @@ void usage() << "\n" << "For the map command:\n" << " --user rados user to authenticate as\n" - << " --secret file containing secret key for use with authx\n"; + << " --secret file containing secret key for use with cephx\n"; } void usage_exit() diff --git a/src/test/cli/rbd/help.t b/src/test/cli/rbd/help.t index 675da6b324db0..e9aafff4e235c 100644 --- a/src/test/cli/rbd/help.t +++ b/src/test/cli/rbd/help.t @@ -37,4 +37,4 @@ For the map command: --user rados user to authenticate as - --secret file containing secret key for use with authx + --secret file containing secret key for use with cephx diff --git a/src/test/cli/rbd/invalid-snap-usage.t b/src/test/cli/rbd/invalid-snap-usage.t index 386a23a232c02..44037e4b13cff 100644 --- a/src/test/cli/rbd/invalid-snap-usage.t +++ b/src/test/cli/rbd/invalid-snap-usage.t @@ -38,7 +38,7 @@ For the map command: --user rados user to authenticate as - --secret file containing secret key for use with authx + --secret file containing secret key for use with cephx [1] $ rbd resize img@snap error: snapname specified for a command that doesn't use it @@ -80,7 +80,7 @@ For the map command: --user rados user to authenticate as - --secret file containing secret key for use with authx + --secret file containing secret key for use with cephx [1] $ rbd import --snap=snap1 /bin/ls ls error: snapname specified for a command that doesn't use it @@ -122,7 +122,7 @@ For the map command: --user rados user to authenticate as - --secret file containing secret key for use with authx + --secret file containing secret key for use with cephx [1] $ rbd create --snap=snap img error: snapname specified for a command that doesn't use it @@ -164,7 +164,7 @@ For the map command: --user rados user to authenticate as - --secret file containing secret key for use with authx + --secret file containing secret key for use with cephx [1] $ rbd rm --snap=snap img error: snapname specified for a command that doesn't use it @@ -206,7 +206,7 @@ For the map command: --user rados user to authenticate as - --secret file containing secret key for use with authx + --secret file containing secret key for use with cephx [1] $ rbd rename --snap=snap img error: snapname specified for a command that doesn't use it @@ -248,7 +248,7 @@ For the map command: --user rados user to authenticate as - --secret file containing secret key for use with authx + --secret file containing secret key for use with cephx [1] $ rbd ls --snap=snap rbd error: snapname specified for a command that doesn't use it @@ -290,7 +290,7 @@ For the map command: --user rados user to authenticate as - --secret file containing secret key for use with authx + --secret file containing secret key for use with cephx [1] $ rbd snap ls --snap=snap img error: snapname specified for a command that doesn't use it @@ -332,7 +332,7 @@ For the map command: --user rados user to authenticate as - --secret file containing secret key for use with authx + --secret file containing secret key for use with cephx [1] $ rbd watch --snap=snap img error: snapname specified for a command that doesn't use it @@ -374,5 +374,5 @@ For the map command: --user rados user to authenticate as - --secret file containing secret key for use with authx + --secret file containing secret key for use with cephx [1] -- 2.39.5