From 557a6020260d2af67f55ce4b29744c0b7e1c3943 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sun, 14 Sep 2008 12:17:29 +0000 Subject: [PATCH] Updated error messages. --- .../01/05_useradd_invalid_numeric_primary_group/useradd.err | 2 +- .../01/06_useradd_invalid_named_primary_group/useradd.err | 2 +- .../usertools/01/11_usermod_unlock_empty_password/usermod.err | 4 ++-- .../data/usermod.err | 2 +- .../data/usermod.err | 2 +- tests/usertools/24_usermod_locked_passwd/data/usermod.err | 2 +- tests/usertools/25_usermod-G_locked_group/data/usermod.err | 2 +- tests/usertools/26_usermod_locked_shadow/data/usermod.err | 2 +- tests/usertools/27_usermod-G_locked_gshadow/data/usermod.err | 2 +- tests/usertools/30_usermod-l_locked_group/data/usermod.err | 2 +- tests/usertools/31_usermod-l_locked_gshadow/data/usermod.err | 2 +- tests/usertools/33_usermod-u_existing_UID/data/usermod.err | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/usertools/01/05_useradd_invalid_numeric_primary_group/useradd.err b/tests/usertools/01/05_useradd_invalid_numeric_primary_group/useradd.err index 150a30e2..eb2629d2 100644 --- a/tests/usertools/01/05_useradd_invalid_numeric_primary_group/useradd.err +++ b/tests/usertools/01/05_useradd_invalid_numeric_primary_group/useradd.err @@ -1 +1 @@ -useradd: unknown group 4242 +useradd: group '4242' does not exist diff --git a/tests/usertools/01/06_useradd_invalid_named_primary_group/useradd.err b/tests/usertools/01/06_useradd_invalid_named_primary_group/useradd.err index 486c42e8..2b201fe0 100644 --- a/tests/usertools/01/06_useradd_invalid_named_primary_group/useradd.err +++ b/tests/usertools/01/06_useradd_invalid_named_primary_group/useradd.err @@ -1 +1 @@ -useradd: unknown group nekral +useradd: group 'nekral' does not exist diff --git a/tests/usertools/01/11_usermod_unlock_empty_password/usermod.err b/tests/usertools/01/11_usermod_unlock_empty_password/usermod.err index 8782fc41..2564dbfc 100644 --- a/tests/usertools/01/11_usermod_unlock_empty_password/usermod.err +++ b/tests/usertools/01/11_usermod_unlock_empty_password/usermod.err @@ -1,2 +1,2 @@ -usermod: unlocking the user would result in a passwordless account. -You should set a password with usermod -p to unlock this user account. +usermod: unlocking the user's password would result in a passwordless account. +You should set a password with usermod -p to unlock this user's password. diff --git a/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/usermod.err b/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/usermod.err index ed117162..6cf0f1f9 100644 --- a/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/usermod.err +++ b/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/usermod.err @@ -1 +1 @@ -usermod: unknown group damon +usermod: group 'damon' does not exist diff --git a/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/usermod.err b/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/usermod.err index 4bd01260..57021779 100644 --- a/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/usermod.err +++ b/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/usermod.err @@ -1 +1 @@ -usermod: unknown group 4242 +usermod: group '4242' does not exist diff --git a/tests/usertools/24_usermod_locked_passwd/data/usermod.err b/tests/usertools/24_usermod_locked_passwd/data/usermod.err index 70ed9550..3d1b7302 100644 --- a/tests/usertools/24_usermod_locked_passwd/data/usermod.err +++ b/tests/usertools/24_usermod_locked_passwd/data/usermod.err @@ -1 +1 @@ -usermod: unable to lock password file +usermod: cannot lock /etc/passwd; try again later. diff --git a/tests/usertools/25_usermod-G_locked_group/data/usermod.err b/tests/usertools/25_usermod-G_locked_group/data/usermod.err index 8b35925f..a84ef88d 100644 --- a/tests/usertools/25_usermod-G_locked_group/data/usermod.err +++ b/tests/usertools/25_usermod-G_locked_group/data/usermod.err @@ -1 +1 @@ -usermod: error locking group file +usermod: cannot lock /etc/group; try again later. diff --git a/tests/usertools/26_usermod_locked_shadow/data/usermod.err b/tests/usertools/26_usermod_locked_shadow/data/usermod.err index 696b0ced..6f819a0a 100644 --- a/tests/usertools/26_usermod_locked_shadow/data/usermod.err +++ b/tests/usertools/26_usermod_locked_shadow/data/usermod.err @@ -1 +1 @@ -usermod: cannot lock shadow password file +usermod: cannot lock /etc/shadow; try again later. diff --git a/tests/usertools/27_usermod-G_locked_gshadow/data/usermod.err b/tests/usertools/27_usermod-G_locked_gshadow/data/usermod.err index e4716d89..be31f738 100644 --- a/tests/usertools/27_usermod-G_locked_gshadow/data/usermod.err +++ b/tests/usertools/27_usermod-G_locked_gshadow/data/usermod.err @@ -1 +1 @@ -usermod: error locking shadow group file +usermod: cannot lock /etc/gshadow; try again later. diff --git a/tests/usertools/30_usermod-l_locked_group/data/usermod.err b/tests/usertools/30_usermod-l_locked_group/data/usermod.err index 8b35925f..a84ef88d 100644 --- a/tests/usertools/30_usermod-l_locked_group/data/usermod.err +++ b/tests/usertools/30_usermod-l_locked_group/data/usermod.err @@ -1 +1 @@ -usermod: error locking group file +usermod: cannot lock /etc/group; try again later. diff --git a/tests/usertools/31_usermod-l_locked_gshadow/data/usermod.err b/tests/usertools/31_usermod-l_locked_gshadow/data/usermod.err index e4716d89..be31f738 100644 --- a/tests/usertools/31_usermod-l_locked_gshadow/data/usermod.err +++ b/tests/usertools/31_usermod-l_locked_gshadow/data/usermod.err @@ -1 +1 @@ -usermod: error locking shadow group file +usermod: cannot lock /etc/gshadow; try again later. diff --git a/tests/usertools/33_usermod-u_existing_UID/data/usermod.err b/tests/usertools/33_usermod-u_existing_UID/data/usermod.err index 912f6831..dd2fa8ad 100644 --- a/tests/usertools/33_usermod-u_existing_UID/data/usermod.err +++ b/tests/usertools/33_usermod-u_existing_UID/data/usermod.err @@ -1 +1 @@ -usermod: uid 1001 is not unique +usermod: UID '1001' already exists