Updated usage message for chpasswd, userdel, and usermod.

22 files changed, 22 insertions, 18 deletions

diff --git a/tests/usertools/chpasswd-PAM/06_chpasswd_usage/data/usage.out b/tests/usertools/chpasswd-PAM/06_chpasswd_usage/data/usage.out
index f1ad47b4..59c8b351 100644
--- a/tests/usertools/chpasswd-PAM/06_chpasswd_usage/data/usage.out
+++ b/tests/usertools/chpasswd-PAM/06_chpasswd_usage/data/usage.out
@@ -1,7 +1,7 @@
 Usage: chpasswd [options]
 
 Options:
-  -c, --crypt-method <METHOD>   the crypt method (one of NONE DES MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE DES MD5 SHA256 SHA512)
   -e, --encrypted               supplied passwords are encrypted
   -h, --help                    display this help message and exit
   -m, --md5                     encrypt the clear text password using
diff --git a/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/data/usage.out b/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/data/usage.out
index af9b051e..4e26b6dd 100644
--- a/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/data/usage.out
+++ b/tests/usertools/chpasswd-PAM/07_chpasswd_usage_bad_option/data/usage.out
@@ -2,7 +2,7 @@ chpasswd: unrecognized option '--foo'
 Usage: chpasswd [options]
 
 Options:
-  -c, --crypt-method <METHOD>   the crypt method (one of NONE DES MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE DES MD5 SHA256 SHA512)
   -e, --encrypted               supplied passwords are encrypted
   -h, --help                    display this help message and exit
   -m, --md5                     encrypt the clear text password using
diff --git a/tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/data/usage.out b/tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/data/usage.out
index 32f2e381..799c8ddb 100644
--- a/tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/data/usage.out
+++ b/tests/usertools/chpasswd-PAM/08_chpasswd_usage-e-m_exclusive/data/usage.out
@@ -2,7 +2,7 @@ chpasswd: the -c, -e, and -m flags are exclusive
 Usage: chpasswd [options]
 
 Options:
-  -c, --crypt-method <METHOD>   the crypt method (one of NONE DES MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE DES MD5 SHA256 SHA512)
   -e, --encrypted               supplied passwords are encrypted
   -h, --help                    display this help message and exit
   -m, --md5                     encrypt the clear text password using
diff --git a/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/data/usage.out b/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/data/usage.out
index 32f2e381..799c8ddb 100644
--- a/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/data/usage.out
+++ b/tests/usertools/chpasswd-PAM/09_chpasswd_usage-e-c_exclusive/data/usage.out
@@ -2,7 +2,7 @@ chpasswd: the -c, -e, and -m flags are exclusive
 Usage: chpasswd [options]
 
 Options:
-  -c, --crypt-method <METHOD>   the crypt method (one of NONE DES MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE DES MD5 SHA256 SHA512)
   -e, --encrypted               supplied passwords are encrypted
   -h, --help                    display this help message and exit
   -m, --md5                     encrypt the clear text password using
diff --git a/tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/data/usage.out b/tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/data/usage.out
index 32f2e381..799c8ddb 100644
--- a/tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/data/usage.out
+++ b/tests/usertools/chpasswd-PAM/10_chpasswd_usage-m-c_exclusive/data/usage.out
@@ -2,7 +2,7 @@ chpasswd: the -c, -e, and -m flags are exclusive
 Usage: chpasswd [options]
 
 Options:
-  -c, --crypt-method <METHOD>   the crypt method (one of NONE DES MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE DES MD5 SHA256 SHA512)
   -e, --encrypted               supplied passwords are encrypted
   -h, --help                    display this help message and exit
   -m, --md5                     encrypt the clear text password using
diff --git a/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/data/usage.out b/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/data/usage.out
index 3562b375..ab133e29 100644
--- a/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/data/usage.out
+++ b/tests/usertools/chpasswd-PAM/11_chpasswd_usage-s_without-c/data/usage.out
@@ -2,7 +2,7 @@ chpasswd: -s flag is only allowed with the -c flag
 Usage: chpasswd [options]
 
 Options:
-  -c, --crypt-method <METHOD>   the crypt method (one of NONE DES MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE DES MD5 SHA256 SHA512)
   -e, --encrypted               supplied passwords are encrypted
   -h, --help                    display this help message and exit
   -m, --md5                     encrypt the clear text password using
diff --git a/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/data/usage.out b/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/data/usage.out
index 1ce1fa1f..bcfcf6d0 100644
--- a/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/data/usage.out
+++ b/tests/usertools/chpasswd-PAM/12_chpasswd_usage-s_invalid/data/usage.out
@@ -2,7 +2,7 @@ chpasswd: invalid numeric argument '12foo'
 Usage: chpasswd [options]
 
 Options:
-  -c, --crypt-method <METHOD>   the crypt method (one of NONE DES MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE DES MD5 SHA256 SHA512)
   -e, --encrypted               supplied passwords are encrypted
   -h, --help                    display this help message and exit
   -m, --md5                     encrypt the clear text password using
diff --git a/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/data/usage.out b/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/data/usage.out
index 5b70915e..2c9e5aaf 100644
--- a/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/data/usage.out
+++ b/tests/usertools/chpasswd-PAM/13_chpasswd_usage-c_invalid/data/usage.out
@@ -2,7 +2,7 @@ chpasswd: unsupported crypt method: SHA513
 Usage: chpasswd [options]
 
 Options:
-  -c, --crypt-method <METHOD>   the crypt method (one of NONE DES MD5 SHA256 SHA512)
+  -c, --crypt-method METHOD     the crypt method (one of NONE DES MD5 SHA256 SHA512)
   -e, --encrypted               supplied passwords are encrypted
   -h, --help                    display this help message and exit
   -m, --md5                     encrypt the clear text password using
diff --git a/tests/usertools/userdel/01_userdel_usage/data/usage.out b/tests/usertools/userdel/01_userdel_usage/data/usage.out
index d7b8c226..955c793a 100644
--- a/tests/usertools/userdel/01_userdel_usage/data/usage.out
+++ b/tests/usertools/userdel/01_userdel_usage/data/usage.out
@@ -6,4 +6,5 @@ Options:
   -h, --help                    display this help message and exit
   -r, --remove                  remove home directory and mail spool
   -R, --root CHROOT_DIR         directory to chroot into
+  -Z, --selinux-user            remove any SELinux user mapping for the user
 
diff --git a/tests/usertools/userdel/02_userdel_usage_invalid_option/data/usage.out b/tests/usertools/userdel/02_userdel_usage_invalid_option/data/usage.out
index e04ddc58..a0dcbf8d 100644
--- a/tests/usertools/userdel/02_userdel_usage_invalid_option/data/usage.out
+++ b/tests/usertools/userdel/02_userdel_usage_invalid_option/data/usage.out
@@ -7,4 +7,5 @@ Options:
   -h, --help                    display this help message and exit
   -r, --remove                  remove home directory and mail spool
   -R, --root CHROOT_DIR         directory to chroot into
+  -Z, --selinux-user            remove any SELinux user mapping for the user
 
diff --git a/tests/usertools/userdel/03_userdel_usage_no_users/data/usage.out b/tests/usertools/userdel/03_userdel_usage_no_users/data/usage.out
index d7b8c226..955c793a 100644
--- a/tests/usertools/userdel/03_userdel_usage_no_users/data/usage.out
+++ b/tests/usertools/userdel/03_userdel_usage_no_users/data/usage.out
@@ -6,4 +6,5 @@ Options:
   -h, --help                    display this help message and exit
   -r, --remove                  remove home directory and mail spool
   -R, --root CHROOT_DIR         directory to chroot into
+  -Z, --selinux-user            remove any SELinux user mapping for the user
 
diff --git a/tests/usertools/userdel/04_userdel_usage_2_users/data/usage.out b/tests/usertools/userdel/04_userdel_usage_2_users/data/usage.out
index d7b8c226..955c793a 100644
--- a/tests/usertools/userdel/04_userdel_usage_2_users/data/usage.out
+++ b/tests/usertools/userdel/04_userdel_usage_2_users/data/usage.out
@@ -6,4 +6,5 @@ Options:
   -h, --help                    display this help message and exit
   -r, --remove                  remove home directory and mail spool
   -R, --root CHROOT_DIR         directory to chroot into
+  -Z, --selinux-user            remove any SELinux user mapping for the user
 
diff --git a/tests/usertools/usermod/10_usermod_usage/data/usage.out b/tests/usertools/usermod/10_usermod_usage/data/usage.out
index c99ff91b..be415a1b 100644
--- a/tests/usertools/usermod/10_usermod_usage/data/usage.out
+++ b/tests/usertools/usermod/10_usermod_usage/data/usage.out
@@ -22,5 +22,5 @@ Options:
   -s, --shell SHELL             new login shell for the user account
   -u, --uid UID                 new UID for the user account
   -U, --unlock                  unlock the user account
-  -Z, --selinux-user            new SELinux user mapping for the user account
+  -Z, --selinux-user SEUSER     new SELinux user mapping for the user account
 
diff --git a/tests/usertools/usermod/11_usermod_usage_bad_option/data/usage.out b/tests/usertools/usermod/11_usermod_usage_bad_option/data/usage.out
index 8d88b998..61dcc24e 100644
--- a/tests/usertools/usermod/11_usermod_usage_bad_option/data/usage.out
+++ b/tests/usertools/usermod/11_usermod_usage_bad_option/data/usage.out
@@ -23,5 +23,5 @@ Options:
   -s, --shell SHELL             new login shell for the user account
   -u, --uid UID                 new UID for the user account
   -U, --unlock                  unlock the user account
-  -Z, --selinux-user            new SELinux user mapping for the user account
+  -Z, --selinux-user SEUSER     new SELinux user mapping for the user account
 
diff --git a/tests/usertools/usermod/14_usermod_usage_no_options/data/usage.out b/tests/usertools/usermod/14_usermod_usage_no_options/data/usage.out
index 7033487e..873fced6 100644
--- a/tests/usertools/usermod/14_usermod_usage_no_options/data/usage.out
+++ b/tests/usertools/usermod/14_usermod_usage_no_options/data/usage.out
@@ -23,5 +23,5 @@ Options:
   -s, --shell SHELL             new login shell for the user account
   -u, --uid UID                 new UID for the user account
   -U, --unlock                  unlock the user account
-  -Z, --selinux-user            new SELinux user mapping for the user account
+  -Z, --selinux-user SEUSER     new SELinux user mapping for the user account
 
diff --git a/tests/usertools/usermod/15_usermod_usage_no_user/data/usage.out b/tests/usertools/usermod/15_usermod_usage_no_user/data/usage.out
index c99ff91b..be415a1b 100644
--- a/tests/usertools/usermod/15_usermod_usage_no_user/data/usage.out
+++ b/tests/usertools/usermod/15_usermod_usage_no_user/data/usage.out
@@ -22,5 +22,5 @@ Options:
   -s, --shell SHELL             new login shell for the user account
   -u, --uid UID                 new UID for the user account
   -U, --unlock                  unlock the user account
-  -Z, --selinux-user            new SELinux user mapping for the user account
+  -Z, --selinux-user SEUSER     new SELinux user mapping for the user account
 
diff --git a/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/data/usage.out b/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/data/usage.out
index 0746f7fe..8ae648b7 100644
--- a/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/data/usage.out
+++ b/tests/usertools/usermod/18_usermod_usage-L-p_exclusive/data/usage.out
@@ -23,5 +23,5 @@ Options:
   -s, --shell SHELL             new login shell for the user account
   -u, --uid UID                 new UID for the user account
   -U, --unlock                  unlock the user account
-  -Z, --selinux-user            new SELinux user mapping for the user account
+  -Z, --selinux-user SEUSER     new SELinux user mapping for the user account
 
diff --git a/tests/usertools/usermod/19_usermod_usage-L-U_exclusive/data/usage.out b/tests/usertools/usermod/19_usermod_usage-L-U_exclusive/data/usage.out
index 0746f7fe..8ae648b7 100644
--- a/tests/usertools/usermod/19_usermod_usage-L-U_exclusive/data/usage.out
+++ b/tests/usertools/usermod/19_usermod_usage-L-U_exclusive/data/usage.out
@@ -23,5 +23,5 @@ Options:
   -s, --shell SHELL             new login shell for the user account
   -u, --uid UID                 new UID for the user account
   -U, --unlock                  unlock the user account
-  -Z, --selinux-user            new SELinux user mapping for the user account
+  -Z, --selinux-user SEUSER     new SELinux user mapping for the user account
 
diff --git a/tests/usertools/usermod/20_usermod_usage-p-U_exclusive/data/usage.out b/tests/usertools/usermod/20_usermod_usage-p-U_exclusive/data/usage.out
index 0746f7fe..8ae648b7 100644
--- a/tests/usertools/usermod/20_usermod_usage-p-U_exclusive/data/usage.out
+++ b/tests/usertools/usermod/20_usermod_usage-p-U_exclusive/data/usage.out
@@ -23,5 +23,5 @@ Options:
   -s, --shell SHELL             new login shell for the user account
   -u, --uid UID                 new UID for the user account
   -U, --unlock                  unlock the user account
-  -Z, --selinux-user            new SELinux user mapping for the user account
+  -Z, --selinux-user SEUSER     new SELinux user mapping for the user account
 
diff --git a/tests/usertools/usermod/30_usermod_usage-a_without-G/data/usage.out b/tests/usertools/usermod/30_usermod_usage-a_without-G/data/usage.out
index 133760bd..24b64cbc 100644
--- a/tests/usertools/usermod/30_usermod_usage-a_without-G/data/usage.out
+++ b/tests/usertools/usermod/30_usermod_usage-a_without-G/data/usage.out
@@ -23,5 +23,5 @@ Options:
   -s, --shell SHELL             new login shell for the user account
   -u, --uid UID                 new UID for the user account
   -U, --unlock                  unlock the user account
-  -Z, --selinux-user            new SELinux user mapping for the user account
+  -Z, --selinux-user SEUSER     new SELinux user mapping for the user account
 
diff --git a/tests/usertools/usermod/31_usermod_usage-o_without-u/data/usage.out b/tests/usertools/usermod/31_usermod_usage-o_without-u/data/usage.out
index 22fe1b2c..385b52d0 100644
--- a/tests/usertools/usermod/31_usermod_usage-o_without-u/data/usage.out
+++ b/tests/usertools/usermod/31_usermod_usage-o_without-u/data/usage.out
@@ -23,5 +23,5 @@ Options:
   -s, --shell SHELL             new login shell for the user account
   -u, --uid UID                 new UID for the user account
   -U, --unlock                  unlock the user account
-  -Z, --selinux-user            new SELinux user mapping for the user account
+  -Z, --selinux-user SEUSER     new SELinux user mapping for the user account
 
diff --git a/tests/usertools/usermod/32_usermod_usage-m_without-d/data/usage.out b/tests/usertools/usermod/32_usermod_usage-m_without-d/data/usage.out
index eebca806..85e37146 100644
--- a/tests/usertools/usermod/32_usermod_usage-m_without-d/data/usage.out
+++ b/tests/usertools/usermod/32_usermod_usage-m_without-d/data/usage.out
@@ -23,5 +23,5 @@ Options:
   -s, --shell SHELL             new login shell for the user account
   -u, --uid UID                 new UID for the user account
   -U, --unlock                  unlock the user account
-  -Z, --selinux-user            new SELinux user mapping for the user account
+  -Z, --selinux-user SEUSER     new SELinux user mapping for the user account