From 74fcf6f28d5ab34564c7d32fafaa7b8386439052 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Sun, 22 Oct 2017 20:24:32 +0000 Subject: [PATCH] spelling: interactive --- lib/prototypes.h | 4 +- libmisc/Makefile.am | 2 +- ...erractive.c => pam_pass_non_interactive.c} | 2 +- src/chpasswd.c | 2 +- src/newusers.c | 2 +- tests/chage/01/run | 4 +- tests/chage/02/run | 2 +- .../chage.test | 2 +- .../config.txt | 0 .../config/etc/group | 0 .../config/etc/gshadow | 0 .../config/etc/login.defs | 0 .../config/etc/passwd | 0 .../config/etc/shadow | 0 .../data/shadow | 0 .../run.exp | 0 .../chage.test | 2 +- .../config.txt | 0 .../config/etc/group | 0 .../config/etc/gshadow | 0 .../config/etc/login.defs | 0 .../config/etc/passwd | 0 .../config/etc/shadow | 0 .../data/shadow | 0 .../run.exp | 0 .../chage.test | 2 +- .../config.txt | 0 .../config/etc/group | 0 .../config/etc/gshadow | 0 .../config/etc/login.defs | 0 .../config/etc/passwd | 0 .../config/etc/shadow | 0 .../data/shadow | 0 .../run.exp | 0 .../chage.test | 2 +- .../config.txt | 0 .../config/etc/group | 0 .../config/etc/gshadow | 0 .../config/etc/login.defs | 0 .../config/etc/passwd | 0 .../config/etc/shadow | 0 .../data/shadow | 0 .../run.exp | 0 .../chage.test | 2 +- .../config.txt | 0 .../config/etc/group | 0 .../config/etc/gshadow | 0 .../config/etc/login.defs | 0 .../config/etc/passwd | 0 .../config/etc/shadow | 0 .../run.exp | 0 .../chage.test | 2 +- .../config.txt | 0 .../config/etc/group | 0 .../config/etc/gshadow | 0 .../config/etc/login.defs | 0 .../config/etc/passwd | 0 .../config/etc/shadow | 0 .../run.exp | 0 .../chage.test | 2 +- .../config.txt | 0 .../config/etc/group | 0 .../config/etc/gshadow | 0 .../config/etc/login.defs | 0 .../config/etc/passwd | 0 .../config/etc/shadow | 0 .../run.exp | 0 .../chage.test | 2 +- .../config.txt | 0 .../config/etc/group | 0 .../config/etc/gshadow | 0 .../config/etc/login.defs | 0 .../config/etc/passwd | 0 .../config/etc/shadow | 0 .../run.exp | 0 .../chage.test | 4 +- .../config.txt | 0 .../config/etc/group | 0 .../config/etc/gshadow | 0 .../config/etc/login.defs | 0 .../config/etc/passwd | 0 .../config/etc/shadow | 0 .../run.exp | 0 .../chage.test | 39 +++++++++++++++++++ .../config.txt | 0 .../config/etc/group | 0 .../config/etc/gshadow | 0 .../config/etc/login.defs | 0 .../config/etc/passwd | 0 .../config/etc/shadow | 0 .../run.exp | 0 .../chage.test | 39 ------------------- .../chage/35_chage_interactive-W-1/chage.test | 39 +++++++++++++++++++ .../config.txt | 0 .../config/etc/group | 0 .../config/etc/gshadow | 0 .../config/etc/login.defs | 0 .../config/etc/passwd | 0 .../config/etc/shadow | 0 .../data/shadow | 0 .../run.exp | 0 .../35_chage_interractive-W-1/chage.test | 39 ------------------- .../chage.test | 39 +++++++++++++++++++ .../config.txt | 0 .../config/etc/group | 0 .../config/etc/gshadow | 0 .../config/etc/login.defs | 0 .../config/etc/passwd | 0 .../config/etc/shadow | 0 .../run.exp | 0 .../chage.test | 39 ------------------- .../chage.test | 39 +++++++++++++++++++ .../config.txt | 0 .../config/etc/group | 0 .../config/etc/gshadow | 0 .../config/etc/login.defs | 0 .../config/etc/passwd | 0 .../config/etc/shadow | 0 .../run.exp | 0 .../chage.test | 39 ------------------- .../chage/38_chage_interactive-I-1/chage.test | 39 +++++++++++++++++++ .../config.txt | 0 .../config/etc/group | 0 .../config/etc/gshadow | 0 .../config/etc/login.defs | 0 .../config/etc/passwd | 0 .../config/etc/shadow | 0 .../data/shadow | 0 .../run.exp | 0 .../38_chage_interractive-I-1/chage.test | 39 ------------------- .../chage/39_chage_interactive-d-1/chage.test | 39 +++++++++++++++++++ .../config.txt | 0 .../config/etc/group | 0 .../config/etc/gshadow | 0 .../config/etc/login.defs | 0 .../config/etc/passwd | 0 .../config/etc/shadow | 0 .../data/shadow | 0 .../run.exp | 0 .../39_chage_interractive-d-1/chage.test | 39 ------------------- tests/run_all | 30 +++++++------- tests/run_all.coverage | 30 +++++++------- 142 files changed, 283 insertions(+), 283 deletions(-) rename libmisc/{pam_pass_non_interractive.c => pam_pass_non_interactive.c} (98%) rename tests/chage/{28_chage_interractive_date_EPOCH => 25_chage_interactive}/chage.test (93%) rename tests/chage/{25_chage_interractive => 25_chage_interactive}/config.txt (100%) rename tests/chage/{25_chage_interractive => 25_chage_interactive}/config/etc/group (100%) rename tests/chage/{25_chage_interractive => 25_chage_interactive}/config/etc/gshadow (100%) rename tests/chage/{25_chage_interractive => 25_chage_interactive}/config/etc/login.defs (100%) rename tests/chage/{25_chage_interractive => 25_chage_interactive}/config/etc/passwd (100%) rename tests/chage/{25_chage_interractive => 25_chage_interactive}/config/etc/shadow (100%) rename tests/chage/{25_chage_interractive => 25_chage_interactive}/data/shadow (100%) rename tests/chage/{25_chage_interractive => 25_chage_interactive}/run.exp (100%) rename tests/chage/{25_chage_interractive => 26_chage_interactive_date_0}/chage.test (93%) rename tests/chage/{26_chage_interractive_date_0 => 26_chage_interactive_date_0}/config.txt (100%) rename tests/chage/{26_chage_interractive_date_0 => 26_chage_interactive_date_0}/config/etc/group (100%) rename tests/chage/{26_chage_interractive_date_0 => 26_chage_interactive_date_0}/config/etc/gshadow (100%) rename tests/chage/{26_chage_interractive_date_0 => 26_chage_interactive_date_0}/config/etc/login.defs (100%) rename tests/chage/{26_chage_interractive_date_0 => 26_chage_interactive_date_0}/config/etc/passwd (100%) rename tests/chage/{26_chage_interractive_date_0 => 26_chage_interactive_date_0}/config/etc/shadow (100%) rename tests/chage/{26_chage_interractive_date_0 => 26_chage_interactive_date_0}/data/shadow (100%) rename tests/chage/{26_chage_interractive_date_0 => 26_chage_interactive_date_0}/run.exp (100%) rename tests/chage/{26_chage_interractive_date_0 => 27_chage_interactive_date_-1}/chage.test (93%) rename tests/chage/{27_chage_interractive_date_-1 => 27_chage_interactive_date_-1}/config.txt (100%) rename tests/chage/{27_chage_interractive_date_-1 => 27_chage_interactive_date_-1}/config/etc/group (100%) rename tests/chage/{27_chage_interractive_date_-1 => 27_chage_interactive_date_-1}/config/etc/gshadow (100%) rename tests/chage/{27_chage_interractive_date_-1 => 27_chage_interactive_date_-1}/config/etc/login.defs (100%) rename tests/chage/{27_chage_interractive_date_-1 => 27_chage_interactive_date_-1}/config/etc/passwd (100%) rename tests/chage/{27_chage_interractive_date_-1 => 27_chage_interactive_date_-1}/config/etc/shadow (100%) rename tests/chage/{27_chage_interractive_date_-1 => 27_chage_interactive_date_-1}/data/shadow (100%) rename tests/chage/{27_chage_interractive_date_-1 => 27_chage_interactive_date_-1}/run.exp (100%) rename tests/chage/{27_chage_interractive_date_-1 => 28_chage_interactive_date_EPOCH}/chage.test (93%) rename tests/chage/{28_chage_interractive_date_EPOCH => 28_chage_interactive_date_EPOCH}/config.txt (100%) rename tests/chage/{28_chage_interractive_date_EPOCH => 28_chage_interactive_date_EPOCH}/config/etc/group (100%) rename tests/chage/{28_chage_interractive_date_EPOCH => 28_chage_interactive_date_EPOCH}/config/etc/gshadow (100%) rename tests/chage/{28_chage_interractive_date_EPOCH => 28_chage_interactive_date_EPOCH}/config/etc/login.defs (100%) rename tests/chage/{28_chage_interractive_date_EPOCH => 28_chage_interactive_date_EPOCH}/config/etc/passwd (100%) rename tests/chage/{28_chage_interractive_date_EPOCH => 28_chage_interactive_date_EPOCH}/config/etc/shadow (100%) rename tests/chage/{28_chage_interractive_date_EPOCH => 28_chage_interactive_date_EPOCH}/data/shadow (100%) rename tests/chage/{28_chage_interractive_date_EPOCH => 28_chage_interactive_date_EPOCH}/run.exp (100%) rename tests/chage/{29_chage_interractive_date_pre-EPOCH => 29_chage_interactive_date_pre-EPOCH}/chage.test (93%) rename tests/chage/{29_chage_interractive_date_pre-EPOCH => 29_chage_interactive_date_pre-EPOCH}/config.txt (100%) rename tests/chage/{29_chage_interractive_date_pre-EPOCH => 29_chage_interactive_date_pre-EPOCH}/config/etc/group (100%) rename tests/chage/{29_chage_interractive_date_pre-EPOCH => 29_chage_interactive_date_pre-EPOCH}/config/etc/gshadow (100%) rename tests/chage/{29_chage_interractive_date_pre-EPOCH => 29_chage_interactive_date_pre-EPOCH}/config/etc/login.defs (100%) rename tests/chage/{29_chage_interractive_date_pre-EPOCH => 29_chage_interactive_date_pre-EPOCH}/config/etc/passwd (100%) rename tests/chage/{29_chage_interractive_date_pre-EPOCH => 29_chage_interactive_date_pre-EPOCH}/config/etc/shadow (100%) rename tests/chage/{29_chage_interractive_date_pre-EPOCH => 29_chage_interactive_date_pre-EPOCH}/run.exp (100%) rename tests/chage/{30_chage_interractive_date_pre-EPOCH2 => 30_chage_interactive_date_pre-EPOCH2}/chage.test (93%) rename tests/chage/{30_chage_interractive_date_pre-EPOCH2 => 30_chage_interactive_date_pre-EPOCH2}/config.txt (100%) rename tests/chage/{30_chage_interractive_date_pre-EPOCH2 => 30_chage_interactive_date_pre-EPOCH2}/config/etc/group (100%) rename tests/chage/{30_chage_interractive_date_pre-EPOCH2 => 30_chage_interactive_date_pre-EPOCH2}/config/etc/gshadow (100%) rename tests/chage/{30_chage_interractive_date_pre-EPOCH2 => 30_chage_interactive_date_pre-EPOCH2}/config/etc/login.defs (100%) rename tests/chage/{30_chage_interractive_date_pre-EPOCH2 => 30_chage_interactive_date_pre-EPOCH2}/config/etc/passwd (100%) rename tests/chage/{30_chage_interractive_date_pre-EPOCH2 => 30_chage_interactive_date_pre-EPOCH2}/config/etc/shadow (100%) rename tests/chage/{30_chage_interractive_date_pre-EPOCH2 => 30_chage_interactive_date_pre-EPOCH2}/run.exp (100%) rename tests/chage/{31_chage_interractive_date_invalid => 31_chage_interactive_date_invalid}/chage.test (93%) rename tests/chage/{31_chage_interractive_date_invalid => 31_chage_interactive_date_invalid}/config.txt (100%) rename tests/chage/{31_chage_interractive_date_invalid => 31_chage_interactive_date_invalid}/config/etc/group (100%) rename tests/chage/{31_chage_interractive_date_invalid => 31_chage_interactive_date_invalid}/config/etc/gshadow (100%) rename tests/chage/{31_chage_interractive_date_invalid => 31_chage_interactive_date_invalid}/config/etc/login.defs (100%) rename tests/chage/{31_chage_interractive_date_invalid => 31_chage_interactive_date_invalid}/config/etc/passwd (100%) rename tests/chage/{31_chage_interractive_date_invalid => 31_chage_interactive_date_invalid}/config/etc/shadow (100%) rename tests/chage/{31_chage_interractive_date_invalid => 31_chage_interactive_date_invalid}/run.exp (100%) rename tests/chage/{32_chage_interractive_date_invalid2 => 32_chage_interactive_date_invalid2}/chage.test (93%) rename tests/chage/{32_chage_interractive_date_invalid2 => 32_chage_interactive_date_invalid2}/config.txt (100%) rename tests/chage/{32_chage_interractive_date_invalid2 => 32_chage_interactive_date_invalid2}/config/etc/group (100%) rename tests/chage/{32_chage_interractive_date_invalid2 => 32_chage_interactive_date_invalid2}/config/etc/gshadow (100%) rename tests/chage/{32_chage_interractive_date_invalid2 => 32_chage_interactive_date_invalid2}/config/etc/login.defs (100%) rename tests/chage/{32_chage_interractive_date_invalid2 => 32_chage_interactive_date_invalid2}/config/etc/passwd (100%) rename tests/chage/{32_chage_interractive_date_invalid2 => 32_chage_interactive_date_invalid2}/config/etc/shadow (100%) rename tests/chage/{32_chage_interractive_date_invalid2 => 32_chage_interactive_date_invalid2}/run.exp (100%) rename tests/chage/{33_chage_interractive-W_invalid1 => 33_chage_interactive-W_invalid1}/chage.test (85%) rename tests/chage/{33_chage_interractive-W_invalid1 => 33_chage_interactive-W_invalid1}/config.txt (100%) rename tests/chage/{33_chage_interractive-W_invalid1 => 33_chage_interactive-W_invalid1}/config/etc/group (100%) rename tests/chage/{33_chage_interractive-W_invalid1 => 33_chage_interactive-W_invalid1}/config/etc/gshadow (100%) rename tests/chage/{33_chage_interractive-W_invalid1 => 33_chage_interactive-W_invalid1}/config/etc/login.defs (100%) rename tests/chage/{33_chage_interractive-W_invalid1 => 33_chage_interactive-W_invalid1}/config/etc/passwd (100%) rename tests/chage/{33_chage_interractive-W_invalid1 => 33_chage_interactive-W_invalid1}/config/etc/shadow (100%) rename tests/chage/{33_chage_interractive-W_invalid1 => 33_chage_interactive-W_invalid1}/run.exp (100%) create mode 100755 tests/chage/34_chage_interactive-W_invalid2/chage.test rename tests/chage/{34_chage_interractive-W_invalid2 => 34_chage_interactive-W_invalid2}/config.txt (100%) rename tests/chage/{34_chage_interractive-W_invalid2 => 34_chage_interactive-W_invalid2}/config/etc/group (100%) rename tests/chage/{34_chage_interractive-W_invalid2 => 34_chage_interactive-W_invalid2}/config/etc/gshadow (100%) rename tests/chage/{34_chage_interractive-W_invalid2 => 34_chage_interactive-W_invalid2}/config/etc/login.defs (100%) rename tests/chage/{34_chage_interractive-W_invalid2 => 34_chage_interactive-W_invalid2}/config/etc/passwd (100%) rename tests/chage/{34_chage_interractive-W_invalid2 => 34_chage_interactive-W_invalid2}/config/etc/shadow (100%) rename tests/chage/{34_chage_interractive-W_invalid2 => 34_chage_interactive-W_invalid2}/run.exp (100%) delete mode 100755 tests/chage/34_chage_interractive-W_invalid2/chage.test create mode 100755 tests/chage/35_chage_interactive-W-1/chage.test rename tests/chage/{35_chage_interractive-W-1 => 35_chage_interactive-W-1}/config.txt (100%) rename tests/chage/{35_chage_interractive-W-1 => 35_chage_interactive-W-1}/config/etc/group (100%) rename tests/chage/{35_chage_interractive-W-1 => 35_chage_interactive-W-1}/config/etc/gshadow (100%) rename tests/chage/{35_chage_interractive-W-1 => 35_chage_interactive-W-1}/config/etc/login.defs (100%) rename tests/chage/{35_chage_interractive-W-1 => 35_chage_interactive-W-1}/config/etc/passwd (100%) rename tests/chage/{35_chage_interractive-W-1 => 35_chage_interactive-W-1}/config/etc/shadow (100%) rename tests/chage/{35_chage_interractive-W-1 => 35_chage_interactive-W-1}/data/shadow (100%) rename tests/chage/{35_chage_interractive-W-1 => 35_chage_interactive-W-1}/run.exp (100%) delete mode 100755 tests/chage/35_chage_interractive-W-1/chage.test create mode 100755 tests/chage/36_chage_interactive-I_invalid1/chage.test rename tests/chage/{36_chage_interractive-I_invalid1 => 36_chage_interactive-I_invalid1}/config.txt (100%) rename tests/chage/{36_chage_interractive-I_invalid1 => 36_chage_interactive-I_invalid1}/config/etc/group (100%) rename tests/chage/{36_chage_interractive-I_invalid1 => 36_chage_interactive-I_invalid1}/config/etc/gshadow (100%) rename tests/chage/{36_chage_interractive-I_invalid1 => 36_chage_interactive-I_invalid1}/config/etc/login.defs (100%) rename tests/chage/{36_chage_interractive-I_invalid1 => 36_chage_interactive-I_invalid1}/config/etc/passwd (100%) rename tests/chage/{36_chage_interractive-I_invalid1 => 36_chage_interactive-I_invalid1}/config/etc/shadow (100%) rename tests/chage/{36_chage_interractive-I_invalid1 => 36_chage_interactive-I_invalid1}/run.exp (100%) delete mode 100755 tests/chage/36_chage_interractive-I_invalid1/chage.test create mode 100755 tests/chage/37_chage_interactive-I_invalid2/chage.test rename tests/chage/{37_chage_interractive-I_invalid2 => 37_chage_interactive-I_invalid2}/config.txt (100%) rename tests/chage/{37_chage_interractive-I_invalid2 => 37_chage_interactive-I_invalid2}/config/etc/group (100%) rename tests/chage/{37_chage_interractive-I_invalid2 => 37_chage_interactive-I_invalid2}/config/etc/gshadow (100%) rename tests/chage/{37_chage_interractive-I_invalid2 => 37_chage_interactive-I_invalid2}/config/etc/login.defs (100%) rename tests/chage/{37_chage_interractive-I_invalid2 => 37_chage_interactive-I_invalid2}/config/etc/passwd (100%) rename tests/chage/{37_chage_interractive-I_invalid2 => 37_chage_interactive-I_invalid2}/config/etc/shadow (100%) rename tests/chage/{37_chage_interractive-I_invalid2 => 37_chage_interactive-I_invalid2}/run.exp (100%) delete mode 100755 tests/chage/37_chage_interractive-I_invalid2/chage.test create mode 100755 tests/chage/38_chage_interactive-I-1/chage.test rename tests/chage/{38_chage_interractive-I-1 => 38_chage_interactive-I-1}/config.txt (100%) rename tests/chage/{38_chage_interractive-I-1 => 38_chage_interactive-I-1}/config/etc/group (100%) rename tests/chage/{38_chage_interractive-I-1 => 38_chage_interactive-I-1}/config/etc/gshadow (100%) rename tests/chage/{38_chage_interractive-I-1 => 38_chage_interactive-I-1}/config/etc/login.defs (100%) rename tests/chage/{38_chage_interractive-I-1 => 38_chage_interactive-I-1}/config/etc/passwd (100%) rename tests/chage/{38_chage_interractive-I-1 => 38_chage_interactive-I-1}/config/etc/shadow (100%) rename tests/chage/{38_chage_interractive-I-1 => 38_chage_interactive-I-1}/data/shadow (100%) rename tests/chage/{38_chage_interractive-I-1 => 38_chage_interactive-I-1}/run.exp (100%) delete mode 100755 tests/chage/38_chage_interractive-I-1/chage.test create mode 100755 tests/chage/39_chage_interactive-d-1/chage.test rename tests/chage/{39_chage_interractive-d-1 => 39_chage_interactive-d-1}/config.txt (100%) rename tests/chage/{39_chage_interractive-d-1 => 39_chage_interactive-d-1}/config/etc/group (100%) rename tests/chage/{39_chage_interractive-d-1 => 39_chage_interactive-d-1}/config/etc/gshadow (100%) rename tests/chage/{39_chage_interractive-d-1 => 39_chage_interactive-d-1}/config/etc/login.defs (100%) rename tests/chage/{39_chage_interractive-d-1 => 39_chage_interactive-d-1}/config/etc/passwd (100%) rename tests/chage/{39_chage_interractive-d-1 => 39_chage_interactive-d-1}/config/etc/shadow (100%) rename tests/chage/{39_chage_interractive-d-1 => 39_chage_interactive-d-1}/data/shadow (100%) rename tests/chage/{39_chage_interractive-d-1 => 39_chage_interactive-d-1}/run.exp (100%) delete mode 100755 tests/chage/39_chage_interractive-d-1/chage.test diff --git a/lib/prototypes.h b/lib/prototypes.h index 4808d5d9..830f11d3 100644 --- a/lib/prototypes.h +++ b/lib/prototypes.h @@ -254,9 +254,9 @@ extern void motd (void); /* myname.c */ extern /*@null@*//*@only@*/struct passwd *get_my_pwent (void); -/* pam_pass_non_interractive.c */ +/* pam_pass_non_interactive.c */ #ifdef USE_PAM -extern int do_pam_passwd_non_interractive (const char *pam_service, +extern int do_pam_passwd_non_interactive (const char *pam_service, const char *username, const char* password); #endif /* USE_PAM */ diff --git a/libmisc/Makefile.am b/libmisc/Makefile.am index 4a620495..2e5b81a7 100644 --- a/libmisc/Makefile.am +++ b/libmisc/Makefile.am @@ -44,7 +44,7 @@ libmisc_a_SOURCES = \ myname.c \ obscure.c \ pam_pass.c \ - pam_pass_non_interractive.c \ + pam_pass_non_interactive.c \ pwd2spwd.c \ pwdcheck.c \ pwd_init.c \ diff --git a/libmisc/pam_pass_non_interractive.c b/libmisc/pam_pass_non_interactive.c similarity index 98% rename from libmisc/pam_pass_non_interractive.c rename to libmisc/pam_pass_non_interactive.c index e50648b6..ded5c69e 100644 --- a/libmisc/pam_pass_non_interractive.c +++ b/libmisc/pam_pass_non_interactive.c @@ -134,7 +134,7 @@ failed_conversation: * * Return 0 on success, 1 on failure. */ -int do_pam_passwd_non_interractive (const char *pam_service, +int do_pam_passwd_non_interactive (const char *pam_service, const char *username, const char* password) { diff --git a/src/chpasswd.c b/src/chpasswd.c index f9856726..918b27ee 100644 --- a/src/chpasswd.c +++ b/src/chpasswd.c @@ -464,7 +464,7 @@ int main (int argc, char **argv) #ifdef USE_PAM if (use_pam){ - if (do_pam_passwd_non_interractive ("chpasswd", name, newpwd) != 0) { + if (do_pam_passwd_non_interactive ("chpasswd", name, newpwd) != 0) { fprintf (stderr, _("%s: (line %d, user %s) password not changed\n"), Prog, line, name); diff --git a/src/newusers.c b/src/newusers.c index c38aec4b..c91403d0 100644 --- a/src/newusers.c +++ b/src/newusers.c @@ -1237,7 +1237,7 @@ int main (int argc, char **argv) unsigned int i; /* Now update the passwords using PAM */ for (i = 0; i < nusers; i++) { - if (do_pam_passwd_non_interractive ("newusers", usernames[i], passwords[i]) != 0) { + if (do_pam_passwd_non_interactive ("newusers", usernames[i], passwords[i]) != 0) { fprintf (stderr, _("%s: (line %d, user %s) password not changed\n"), Prog, lines[i], usernames[i]); diff --git a/tests/chage/01/run b/tests/chage/01/run index df64325c..4434fcff 100755 --- a/tests/chage/01/run +++ b/tests/chage/01/run @@ -185,12 +185,12 @@ chage -d 2030-03-02 -E 1979-11-24 -I 10 -m 11 -M 12 --warndays 4 myuser7 ent=$(getent shadow myuser7) [ "$ent" = 'myuser7:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:21975:11:12:4:10:3614:' ] || exit 1 -echo "interractive test" +echo "interactive test" ./run1.exp ent=$(getent shadow myuser7) [ "$ent" = 'myuser7:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12990:13:14:9:35:15548:' ] || exit 1 -echo "interractive test (default)" +echo "interactive test (default)" ./run2.exp ent=$(getent shadow myuser7) [ "$ent" = 'myuser7:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12990:13:14:9:35:15548:' ] || exit 1 diff --git a/tests/chage/02/run b/tests/chage/02/run index 74ac2682..a792f0cc 100755 --- a/tests/chage/02/run +++ b/tests/chage/02/run @@ -44,7 +44,7 @@ do cp data/$i /etc done -echo "interractive test" +echo "interactive test" ./run.exp $(date "+%Y-%m-%d") echo "OK" diff --git a/tests/chage/28_chage_interractive_date_EPOCH/chage.test b/tests/chage/25_chage_interactive/chage.test similarity index 93% rename from tests/chage/28_chage_interractive_date_EPOCH/chage.test rename to tests/chage/25_chage_interactive/chage.test index 01f957f4..8d5f5bef 100755 --- a/tests/chage/28_chage_interractive_date_EPOCH/chage.test +++ b/tests/chage/25_chage_interactive/chage.test @@ -16,7 +16,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0 change_config -echo -n "chage interractive session as myuser1..." +echo -n "chage interactive session as myuser1..." ./run.exp echo "OK" diff --git a/tests/chage/25_chage_interractive/config.txt b/tests/chage/25_chage_interactive/config.txt similarity index 100% rename from tests/chage/25_chage_interractive/config.txt rename to tests/chage/25_chage_interactive/config.txt diff --git a/tests/chage/25_chage_interractive/config/etc/group b/tests/chage/25_chage_interactive/config/etc/group similarity index 100% rename from tests/chage/25_chage_interractive/config/etc/group rename to tests/chage/25_chage_interactive/config/etc/group diff --git a/tests/chage/25_chage_interractive/config/etc/gshadow b/tests/chage/25_chage_interactive/config/etc/gshadow similarity index 100% rename from tests/chage/25_chage_interractive/config/etc/gshadow rename to tests/chage/25_chage_interactive/config/etc/gshadow diff --git a/tests/chage/25_chage_interractive/config/etc/login.defs b/tests/chage/25_chage_interactive/config/etc/login.defs similarity index 100% rename from tests/chage/25_chage_interractive/config/etc/login.defs rename to tests/chage/25_chage_interactive/config/etc/login.defs diff --git a/tests/chage/25_chage_interractive/config/etc/passwd b/tests/chage/25_chage_interactive/config/etc/passwd similarity index 100% rename from tests/chage/25_chage_interractive/config/etc/passwd rename to tests/chage/25_chage_interactive/config/etc/passwd diff --git a/tests/chage/25_chage_interractive/config/etc/shadow b/tests/chage/25_chage_interactive/config/etc/shadow similarity index 100% rename from tests/chage/25_chage_interractive/config/etc/shadow rename to tests/chage/25_chage_interactive/config/etc/shadow diff --git a/tests/chage/25_chage_interractive/data/shadow b/tests/chage/25_chage_interactive/data/shadow similarity index 100% rename from tests/chage/25_chage_interractive/data/shadow rename to tests/chage/25_chage_interactive/data/shadow diff --git a/tests/chage/25_chage_interractive/run.exp b/tests/chage/25_chage_interactive/run.exp similarity index 100% rename from tests/chage/25_chage_interractive/run.exp rename to tests/chage/25_chage_interactive/run.exp diff --git a/tests/chage/25_chage_interractive/chage.test b/tests/chage/26_chage_interactive_date_0/chage.test similarity index 93% rename from tests/chage/25_chage_interractive/chage.test rename to tests/chage/26_chage_interactive_date_0/chage.test index 01f957f4..8d5f5bef 100755 --- a/tests/chage/25_chage_interractive/chage.test +++ b/tests/chage/26_chage_interactive_date_0/chage.test @@ -16,7 +16,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0 change_config -echo -n "chage interractive session as myuser1..." +echo -n "chage interactive session as myuser1..." ./run.exp echo "OK" diff --git a/tests/chage/26_chage_interractive_date_0/config.txt b/tests/chage/26_chage_interactive_date_0/config.txt similarity index 100% rename from tests/chage/26_chage_interractive_date_0/config.txt rename to tests/chage/26_chage_interactive_date_0/config.txt diff --git a/tests/chage/26_chage_interractive_date_0/config/etc/group b/tests/chage/26_chage_interactive_date_0/config/etc/group similarity index 100% rename from tests/chage/26_chage_interractive_date_0/config/etc/group rename to tests/chage/26_chage_interactive_date_0/config/etc/group diff --git a/tests/chage/26_chage_interractive_date_0/config/etc/gshadow b/tests/chage/26_chage_interactive_date_0/config/etc/gshadow similarity index 100% rename from tests/chage/26_chage_interractive_date_0/config/etc/gshadow rename to tests/chage/26_chage_interactive_date_0/config/etc/gshadow diff --git a/tests/chage/26_chage_interractive_date_0/config/etc/login.defs b/tests/chage/26_chage_interactive_date_0/config/etc/login.defs similarity index 100% rename from tests/chage/26_chage_interractive_date_0/config/etc/login.defs rename to tests/chage/26_chage_interactive_date_0/config/etc/login.defs diff --git a/tests/chage/26_chage_interractive_date_0/config/etc/passwd b/tests/chage/26_chage_interactive_date_0/config/etc/passwd similarity index 100% rename from tests/chage/26_chage_interractive_date_0/config/etc/passwd rename to tests/chage/26_chage_interactive_date_0/config/etc/passwd diff --git a/tests/chage/26_chage_interractive_date_0/config/etc/shadow b/tests/chage/26_chage_interactive_date_0/config/etc/shadow similarity index 100% rename from tests/chage/26_chage_interractive_date_0/config/etc/shadow rename to tests/chage/26_chage_interactive_date_0/config/etc/shadow diff --git a/tests/chage/26_chage_interractive_date_0/data/shadow b/tests/chage/26_chage_interactive_date_0/data/shadow similarity index 100% rename from tests/chage/26_chage_interractive_date_0/data/shadow rename to tests/chage/26_chage_interactive_date_0/data/shadow diff --git a/tests/chage/26_chage_interractive_date_0/run.exp b/tests/chage/26_chage_interactive_date_0/run.exp similarity index 100% rename from tests/chage/26_chage_interractive_date_0/run.exp rename to tests/chage/26_chage_interactive_date_0/run.exp diff --git a/tests/chage/26_chage_interractive_date_0/chage.test b/tests/chage/27_chage_interactive_date_-1/chage.test similarity index 93% rename from tests/chage/26_chage_interractive_date_0/chage.test rename to tests/chage/27_chage_interactive_date_-1/chage.test index 01f957f4..8d5f5bef 100755 --- a/tests/chage/26_chage_interractive_date_0/chage.test +++ b/tests/chage/27_chage_interactive_date_-1/chage.test @@ -16,7 +16,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0 change_config -echo -n "chage interractive session as myuser1..." +echo -n "chage interactive session as myuser1..." ./run.exp echo "OK" diff --git a/tests/chage/27_chage_interractive_date_-1/config.txt b/tests/chage/27_chage_interactive_date_-1/config.txt similarity index 100% rename from tests/chage/27_chage_interractive_date_-1/config.txt rename to tests/chage/27_chage_interactive_date_-1/config.txt diff --git a/tests/chage/27_chage_interractive_date_-1/config/etc/group b/tests/chage/27_chage_interactive_date_-1/config/etc/group similarity index 100% rename from tests/chage/27_chage_interractive_date_-1/config/etc/group rename to tests/chage/27_chage_interactive_date_-1/config/etc/group diff --git a/tests/chage/27_chage_interractive_date_-1/config/etc/gshadow b/tests/chage/27_chage_interactive_date_-1/config/etc/gshadow similarity index 100% rename from tests/chage/27_chage_interractive_date_-1/config/etc/gshadow rename to tests/chage/27_chage_interactive_date_-1/config/etc/gshadow diff --git a/tests/chage/27_chage_interractive_date_-1/config/etc/login.defs b/tests/chage/27_chage_interactive_date_-1/config/etc/login.defs similarity index 100% rename from tests/chage/27_chage_interractive_date_-1/config/etc/login.defs rename to tests/chage/27_chage_interactive_date_-1/config/etc/login.defs diff --git a/tests/chage/27_chage_interractive_date_-1/config/etc/passwd b/tests/chage/27_chage_interactive_date_-1/config/etc/passwd similarity index 100% rename from tests/chage/27_chage_interractive_date_-1/config/etc/passwd rename to tests/chage/27_chage_interactive_date_-1/config/etc/passwd diff --git a/tests/chage/27_chage_interractive_date_-1/config/etc/shadow b/tests/chage/27_chage_interactive_date_-1/config/etc/shadow similarity index 100% rename from tests/chage/27_chage_interractive_date_-1/config/etc/shadow rename to tests/chage/27_chage_interactive_date_-1/config/etc/shadow diff --git a/tests/chage/27_chage_interractive_date_-1/data/shadow b/tests/chage/27_chage_interactive_date_-1/data/shadow similarity index 100% rename from tests/chage/27_chage_interractive_date_-1/data/shadow rename to tests/chage/27_chage_interactive_date_-1/data/shadow diff --git a/tests/chage/27_chage_interractive_date_-1/run.exp b/tests/chage/27_chage_interactive_date_-1/run.exp similarity index 100% rename from tests/chage/27_chage_interractive_date_-1/run.exp rename to tests/chage/27_chage_interactive_date_-1/run.exp diff --git a/tests/chage/27_chage_interractive_date_-1/chage.test b/tests/chage/28_chage_interactive_date_EPOCH/chage.test similarity index 93% rename from tests/chage/27_chage_interractive_date_-1/chage.test rename to tests/chage/28_chage_interactive_date_EPOCH/chage.test index 01f957f4..8d5f5bef 100755 --- a/tests/chage/27_chage_interractive_date_-1/chage.test +++ b/tests/chage/28_chage_interactive_date_EPOCH/chage.test @@ -16,7 +16,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0 change_config -echo -n "chage interractive session as myuser1..." +echo -n "chage interactive session as myuser1..." ./run.exp echo "OK" diff --git a/tests/chage/28_chage_interractive_date_EPOCH/config.txt b/tests/chage/28_chage_interactive_date_EPOCH/config.txt similarity index 100% rename from tests/chage/28_chage_interractive_date_EPOCH/config.txt rename to tests/chage/28_chage_interactive_date_EPOCH/config.txt diff --git a/tests/chage/28_chage_interractive_date_EPOCH/config/etc/group b/tests/chage/28_chage_interactive_date_EPOCH/config/etc/group similarity index 100% rename from tests/chage/28_chage_interractive_date_EPOCH/config/etc/group rename to tests/chage/28_chage_interactive_date_EPOCH/config/etc/group diff --git a/tests/chage/28_chage_interractive_date_EPOCH/config/etc/gshadow b/tests/chage/28_chage_interactive_date_EPOCH/config/etc/gshadow similarity index 100% rename from tests/chage/28_chage_interractive_date_EPOCH/config/etc/gshadow rename to tests/chage/28_chage_interactive_date_EPOCH/config/etc/gshadow diff --git a/tests/chage/28_chage_interractive_date_EPOCH/config/etc/login.defs b/tests/chage/28_chage_interactive_date_EPOCH/config/etc/login.defs similarity index 100% rename from tests/chage/28_chage_interractive_date_EPOCH/config/etc/login.defs rename to tests/chage/28_chage_interactive_date_EPOCH/config/etc/login.defs diff --git a/tests/chage/28_chage_interractive_date_EPOCH/config/etc/passwd b/tests/chage/28_chage_interactive_date_EPOCH/config/etc/passwd similarity index 100% rename from tests/chage/28_chage_interractive_date_EPOCH/config/etc/passwd rename to tests/chage/28_chage_interactive_date_EPOCH/config/etc/passwd diff --git a/tests/chage/28_chage_interractive_date_EPOCH/config/etc/shadow b/tests/chage/28_chage_interactive_date_EPOCH/config/etc/shadow similarity index 100% rename from tests/chage/28_chage_interractive_date_EPOCH/config/etc/shadow rename to tests/chage/28_chage_interactive_date_EPOCH/config/etc/shadow diff --git a/tests/chage/28_chage_interractive_date_EPOCH/data/shadow b/tests/chage/28_chage_interactive_date_EPOCH/data/shadow similarity index 100% rename from tests/chage/28_chage_interractive_date_EPOCH/data/shadow rename to tests/chage/28_chage_interactive_date_EPOCH/data/shadow diff --git a/tests/chage/28_chage_interractive_date_EPOCH/run.exp b/tests/chage/28_chage_interactive_date_EPOCH/run.exp similarity index 100% rename from tests/chage/28_chage_interractive_date_EPOCH/run.exp rename to tests/chage/28_chage_interactive_date_EPOCH/run.exp diff --git a/tests/chage/29_chage_interractive_date_pre-EPOCH/chage.test b/tests/chage/29_chage_interactive_date_pre-EPOCH/chage.test similarity index 93% rename from tests/chage/29_chage_interractive_date_pre-EPOCH/chage.test rename to tests/chage/29_chage_interactive_date_pre-EPOCH/chage.test index 99f2df4d..83b4ba2c 100755 --- a/tests/chage/29_chage_interractive_date_pre-EPOCH/chage.test +++ b/tests/chage/29_chage_interactive_date_pre-EPOCH/chage.test @@ -16,7 +16,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0 change_config -echo -n "chage interractive session as myuser1..." +echo -n "chage interactive session as myuser1..." ./run.exp echo "OK" diff --git a/tests/chage/29_chage_interractive_date_pre-EPOCH/config.txt b/tests/chage/29_chage_interactive_date_pre-EPOCH/config.txt similarity index 100% rename from tests/chage/29_chage_interractive_date_pre-EPOCH/config.txt rename to tests/chage/29_chage_interactive_date_pre-EPOCH/config.txt diff --git a/tests/chage/29_chage_interractive_date_pre-EPOCH/config/etc/group b/tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/group similarity index 100% rename from tests/chage/29_chage_interractive_date_pre-EPOCH/config/etc/group rename to tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/group diff --git a/tests/chage/29_chage_interractive_date_pre-EPOCH/config/etc/gshadow b/tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/gshadow similarity index 100% rename from tests/chage/29_chage_interractive_date_pre-EPOCH/config/etc/gshadow rename to tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/gshadow diff --git a/tests/chage/29_chage_interractive_date_pre-EPOCH/config/etc/login.defs b/tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/login.defs similarity index 100% rename from tests/chage/29_chage_interractive_date_pre-EPOCH/config/etc/login.defs rename to tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/login.defs diff --git a/tests/chage/29_chage_interractive_date_pre-EPOCH/config/etc/passwd b/tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/passwd similarity index 100% rename from tests/chage/29_chage_interractive_date_pre-EPOCH/config/etc/passwd rename to tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/passwd diff --git a/tests/chage/29_chage_interractive_date_pre-EPOCH/config/etc/shadow b/tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/shadow similarity index 100% rename from tests/chage/29_chage_interractive_date_pre-EPOCH/config/etc/shadow rename to tests/chage/29_chage_interactive_date_pre-EPOCH/config/etc/shadow diff --git a/tests/chage/29_chage_interractive_date_pre-EPOCH/run.exp b/tests/chage/29_chage_interactive_date_pre-EPOCH/run.exp similarity index 100% rename from tests/chage/29_chage_interractive_date_pre-EPOCH/run.exp rename to tests/chage/29_chage_interactive_date_pre-EPOCH/run.exp diff --git a/tests/chage/30_chage_interractive_date_pre-EPOCH2/chage.test b/tests/chage/30_chage_interactive_date_pre-EPOCH2/chage.test similarity index 93% rename from tests/chage/30_chage_interractive_date_pre-EPOCH2/chage.test rename to tests/chage/30_chage_interactive_date_pre-EPOCH2/chage.test index 99f2df4d..83b4ba2c 100755 --- a/tests/chage/30_chage_interractive_date_pre-EPOCH2/chage.test +++ b/tests/chage/30_chage_interactive_date_pre-EPOCH2/chage.test @@ -16,7 +16,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0 change_config -echo -n "chage interractive session as myuser1..." +echo -n "chage interactive session as myuser1..." ./run.exp echo "OK" diff --git a/tests/chage/30_chage_interractive_date_pre-EPOCH2/config.txt b/tests/chage/30_chage_interactive_date_pre-EPOCH2/config.txt similarity index 100% rename from tests/chage/30_chage_interractive_date_pre-EPOCH2/config.txt rename to tests/chage/30_chage_interactive_date_pre-EPOCH2/config.txt diff --git a/tests/chage/30_chage_interractive_date_pre-EPOCH2/config/etc/group b/tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/group similarity index 100% rename from tests/chage/30_chage_interractive_date_pre-EPOCH2/config/etc/group rename to tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/group diff --git a/tests/chage/30_chage_interractive_date_pre-EPOCH2/config/etc/gshadow b/tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/gshadow similarity index 100% rename from tests/chage/30_chage_interractive_date_pre-EPOCH2/config/etc/gshadow rename to tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/gshadow diff --git a/tests/chage/30_chage_interractive_date_pre-EPOCH2/config/etc/login.defs b/tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/login.defs similarity index 100% rename from tests/chage/30_chage_interractive_date_pre-EPOCH2/config/etc/login.defs rename to tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/login.defs diff --git a/tests/chage/30_chage_interractive_date_pre-EPOCH2/config/etc/passwd b/tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/passwd similarity index 100% rename from tests/chage/30_chage_interractive_date_pre-EPOCH2/config/etc/passwd rename to tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/passwd diff --git a/tests/chage/30_chage_interractive_date_pre-EPOCH2/config/etc/shadow b/tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/shadow similarity index 100% rename from tests/chage/30_chage_interractive_date_pre-EPOCH2/config/etc/shadow rename to tests/chage/30_chage_interactive_date_pre-EPOCH2/config/etc/shadow diff --git a/tests/chage/30_chage_interractive_date_pre-EPOCH2/run.exp b/tests/chage/30_chage_interactive_date_pre-EPOCH2/run.exp similarity index 100% rename from tests/chage/30_chage_interractive_date_pre-EPOCH2/run.exp rename to tests/chage/30_chage_interactive_date_pre-EPOCH2/run.exp diff --git a/tests/chage/31_chage_interractive_date_invalid/chage.test b/tests/chage/31_chage_interactive_date_invalid/chage.test similarity index 93% rename from tests/chage/31_chage_interractive_date_invalid/chage.test rename to tests/chage/31_chage_interactive_date_invalid/chage.test index 84e9390a..1a8606a6 100755 --- a/tests/chage/31_chage_interractive_date_invalid/chage.test +++ b/tests/chage/31_chage_interactive_date_invalid/chage.test @@ -16,7 +16,7 @@ trap 'log_status "$0" "FAILURE"; restore_config; rm -f /etc/passwd.lock /etc/sha change_config -echo -n "chage interractive session as myuser1..." +echo -n "chage interactive session as myuser1..." ./run.exp echo "OK" diff --git a/tests/chage/31_chage_interractive_date_invalid/config.txt b/tests/chage/31_chage_interactive_date_invalid/config.txt similarity index 100% rename from tests/chage/31_chage_interractive_date_invalid/config.txt rename to tests/chage/31_chage_interactive_date_invalid/config.txt diff --git a/tests/chage/31_chage_interractive_date_invalid/config/etc/group b/tests/chage/31_chage_interactive_date_invalid/config/etc/group similarity index 100% rename from tests/chage/31_chage_interractive_date_invalid/config/etc/group rename to tests/chage/31_chage_interactive_date_invalid/config/etc/group diff --git a/tests/chage/31_chage_interractive_date_invalid/config/etc/gshadow b/tests/chage/31_chage_interactive_date_invalid/config/etc/gshadow similarity index 100% rename from tests/chage/31_chage_interractive_date_invalid/config/etc/gshadow rename to tests/chage/31_chage_interactive_date_invalid/config/etc/gshadow diff --git a/tests/chage/31_chage_interractive_date_invalid/config/etc/login.defs b/tests/chage/31_chage_interactive_date_invalid/config/etc/login.defs similarity index 100% rename from tests/chage/31_chage_interractive_date_invalid/config/etc/login.defs rename to tests/chage/31_chage_interactive_date_invalid/config/etc/login.defs diff --git a/tests/chage/31_chage_interractive_date_invalid/config/etc/passwd b/tests/chage/31_chage_interactive_date_invalid/config/etc/passwd similarity index 100% rename from tests/chage/31_chage_interractive_date_invalid/config/etc/passwd rename to tests/chage/31_chage_interactive_date_invalid/config/etc/passwd diff --git a/tests/chage/31_chage_interractive_date_invalid/config/etc/shadow b/tests/chage/31_chage_interactive_date_invalid/config/etc/shadow similarity index 100% rename from tests/chage/31_chage_interractive_date_invalid/config/etc/shadow rename to tests/chage/31_chage_interactive_date_invalid/config/etc/shadow diff --git a/tests/chage/31_chage_interractive_date_invalid/run.exp b/tests/chage/31_chage_interactive_date_invalid/run.exp similarity index 100% rename from tests/chage/31_chage_interractive_date_invalid/run.exp rename to tests/chage/31_chage_interactive_date_invalid/run.exp diff --git a/tests/chage/32_chage_interractive_date_invalid2/chage.test b/tests/chage/32_chage_interactive_date_invalid2/chage.test similarity index 93% rename from tests/chage/32_chage_interractive_date_invalid2/chage.test rename to tests/chage/32_chage_interactive_date_invalid2/chage.test index 99f2df4d..83b4ba2c 100755 --- a/tests/chage/32_chage_interractive_date_invalid2/chage.test +++ b/tests/chage/32_chage_interactive_date_invalid2/chage.test @@ -16,7 +16,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0 change_config -echo -n "chage interractive session as myuser1..." +echo -n "chage interactive session as myuser1..." ./run.exp echo "OK" diff --git a/tests/chage/32_chage_interractive_date_invalid2/config.txt b/tests/chage/32_chage_interactive_date_invalid2/config.txt similarity index 100% rename from tests/chage/32_chage_interractive_date_invalid2/config.txt rename to tests/chage/32_chage_interactive_date_invalid2/config.txt diff --git a/tests/chage/32_chage_interractive_date_invalid2/config/etc/group b/tests/chage/32_chage_interactive_date_invalid2/config/etc/group similarity index 100% rename from tests/chage/32_chage_interractive_date_invalid2/config/etc/group rename to tests/chage/32_chage_interactive_date_invalid2/config/etc/group diff --git a/tests/chage/32_chage_interractive_date_invalid2/config/etc/gshadow b/tests/chage/32_chage_interactive_date_invalid2/config/etc/gshadow similarity index 100% rename from tests/chage/32_chage_interractive_date_invalid2/config/etc/gshadow rename to tests/chage/32_chage_interactive_date_invalid2/config/etc/gshadow diff --git a/tests/chage/32_chage_interractive_date_invalid2/config/etc/login.defs b/tests/chage/32_chage_interactive_date_invalid2/config/etc/login.defs similarity index 100% rename from tests/chage/32_chage_interractive_date_invalid2/config/etc/login.defs rename to tests/chage/32_chage_interactive_date_invalid2/config/etc/login.defs diff --git a/tests/chage/32_chage_interractive_date_invalid2/config/etc/passwd b/tests/chage/32_chage_interactive_date_invalid2/config/etc/passwd similarity index 100% rename from tests/chage/32_chage_interractive_date_invalid2/config/etc/passwd rename to tests/chage/32_chage_interactive_date_invalid2/config/etc/passwd diff --git a/tests/chage/32_chage_interractive_date_invalid2/config/etc/shadow b/tests/chage/32_chage_interactive_date_invalid2/config/etc/shadow similarity index 100% rename from tests/chage/32_chage_interractive_date_invalid2/config/etc/shadow rename to tests/chage/32_chage_interactive_date_invalid2/config/etc/shadow diff --git a/tests/chage/32_chage_interractive_date_invalid2/run.exp b/tests/chage/32_chage_interactive_date_invalid2/run.exp similarity index 100% rename from tests/chage/32_chage_interractive_date_invalid2/run.exp rename to tests/chage/32_chage_interactive_date_invalid2/run.exp diff --git a/tests/chage/33_chage_interractive-W_invalid1/chage.test b/tests/chage/33_chage_interactive-W_invalid1/chage.test similarity index 85% rename from tests/chage/33_chage_interractive-W_invalid1/chage.test rename to tests/chage/33_chage_interactive-W_invalid1/chage.test index fc4dd9d2..b2d6d328 100755 --- a/tests/chage/33_chage_interractive-W_invalid1/chage.test +++ b/tests/chage/33_chage_interactive-W_invalid1/chage.test @@ -7,7 +7,7 @@ cd $(dirname $0) . ../../common/config.sh . ../../common/log.sh -log_start "$0" "chage interractive session checks field validity" +log_start "$0" "chage interactive session checks field validity" save_config @@ -16,7 +16,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0 change_config -echo -n "chage interractive session as myuser1..." +echo -n "chage interactive session as myuser1..." ./run.exp echo "OK" diff --git a/tests/chage/33_chage_interractive-W_invalid1/config.txt b/tests/chage/33_chage_interactive-W_invalid1/config.txt similarity index 100% rename from tests/chage/33_chage_interractive-W_invalid1/config.txt rename to tests/chage/33_chage_interactive-W_invalid1/config.txt diff --git a/tests/chage/33_chage_interractive-W_invalid1/config/etc/group b/tests/chage/33_chage_interactive-W_invalid1/config/etc/group similarity index 100% rename from tests/chage/33_chage_interractive-W_invalid1/config/etc/group rename to tests/chage/33_chage_interactive-W_invalid1/config/etc/group diff --git a/tests/chage/33_chage_interractive-W_invalid1/config/etc/gshadow b/tests/chage/33_chage_interactive-W_invalid1/config/etc/gshadow similarity index 100% rename from tests/chage/33_chage_interractive-W_invalid1/config/etc/gshadow rename to tests/chage/33_chage_interactive-W_invalid1/config/etc/gshadow diff --git a/tests/chage/33_chage_interractive-W_invalid1/config/etc/login.defs b/tests/chage/33_chage_interactive-W_invalid1/config/etc/login.defs similarity index 100% rename from tests/chage/33_chage_interractive-W_invalid1/config/etc/login.defs rename to tests/chage/33_chage_interactive-W_invalid1/config/etc/login.defs diff --git a/tests/chage/33_chage_interractive-W_invalid1/config/etc/passwd b/tests/chage/33_chage_interactive-W_invalid1/config/etc/passwd similarity index 100% rename from tests/chage/33_chage_interractive-W_invalid1/config/etc/passwd rename to tests/chage/33_chage_interactive-W_invalid1/config/etc/passwd diff --git a/tests/chage/33_chage_interractive-W_invalid1/config/etc/shadow b/tests/chage/33_chage_interactive-W_invalid1/config/etc/shadow similarity index 100% rename from tests/chage/33_chage_interractive-W_invalid1/config/etc/shadow rename to tests/chage/33_chage_interactive-W_invalid1/config/etc/shadow diff --git a/tests/chage/33_chage_interractive-W_invalid1/run.exp b/tests/chage/33_chage_interactive-W_invalid1/run.exp similarity index 100% rename from tests/chage/33_chage_interractive-W_invalid1/run.exp rename to tests/chage/33_chage_interactive-W_invalid1/run.exp diff --git a/tests/chage/34_chage_interactive-W_invalid2/chage.test b/tests/chage/34_chage_interactive-W_invalid2/chage.test new file mode 100755 index 00000000..b2d6d328 --- /dev/null +++ b/tests/chage/34_chage_interactive-W_invalid2/chage.test @@ -0,0 +1,39 @@ +#!/bin/sh + +set -e + +cd $(dirname $0) + +. ../../common/config.sh +. ../../common/log.sh + +log_start "$0" "chage interactive session checks field validity" + +save_config + +# restore the files on exit +trap 'log_status "$0" "FAILURE"; restore_config' 0 + +change_config + +echo -n "chage interactive session as myuser1..." +./run.exp +echo "OK" + +echo -n "Check the passwd file..." +../../common/compare_file.pl config/etc/passwd /etc/passwd +echo "OK" +echo -n "Check the group file..." +../../common/compare_file.pl config/etc/group /etc/group +echo "OK" +echo -n "Check the shadow file..." +../../common/compare_file.pl config/etc/shadow /etc/shadow +echo "OK" +echo -n "Check the gshadow file..." +../../common/compare_file.pl config/etc/gshadow /etc/gshadow +echo "OK" + +log_status "$0" "SUCCESS" +restore_config +trap '' 0 + diff --git a/tests/chage/34_chage_interractive-W_invalid2/config.txt b/tests/chage/34_chage_interactive-W_invalid2/config.txt similarity index 100% rename from tests/chage/34_chage_interractive-W_invalid2/config.txt rename to tests/chage/34_chage_interactive-W_invalid2/config.txt diff --git a/tests/chage/34_chage_interractive-W_invalid2/config/etc/group b/tests/chage/34_chage_interactive-W_invalid2/config/etc/group similarity index 100% rename from tests/chage/34_chage_interractive-W_invalid2/config/etc/group rename to tests/chage/34_chage_interactive-W_invalid2/config/etc/group diff --git a/tests/chage/34_chage_interractive-W_invalid2/config/etc/gshadow b/tests/chage/34_chage_interactive-W_invalid2/config/etc/gshadow similarity index 100% rename from tests/chage/34_chage_interractive-W_invalid2/config/etc/gshadow rename to tests/chage/34_chage_interactive-W_invalid2/config/etc/gshadow diff --git a/tests/chage/34_chage_interractive-W_invalid2/config/etc/login.defs b/tests/chage/34_chage_interactive-W_invalid2/config/etc/login.defs similarity index 100% rename from tests/chage/34_chage_interractive-W_invalid2/config/etc/login.defs rename to tests/chage/34_chage_interactive-W_invalid2/config/etc/login.defs diff --git a/tests/chage/34_chage_interractive-W_invalid2/config/etc/passwd b/tests/chage/34_chage_interactive-W_invalid2/config/etc/passwd similarity index 100% rename from tests/chage/34_chage_interractive-W_invalid2/config/etc/passwd rename to tests/chage/34_chage_interactive-W_invalid2/config/etc/passwd diff --git a/tests/chage/34_chage_interractive-W_invalid2/config/etc/shadow b/tests/chage/34_chage_interactive-W_invalid2/config/etc/shadow similarity index 100% rename from tests/chage/34_chage_interractive-W_invalid2/config/etc/shadow rename to tests/chage/34_chage_interactive-W_invalid2/config/etc/shadow diff --git a/tests/chage/34_chage_interractive-W_invalid2/run.exp b/tests/chage/34_chage_interactive-W_invalid2/run.exp similarity index 100% rename from tests/chage/34_chage_interractive-W_invalid2/run.exp rename to tests/chage/34_chage_interactive-W_invalid2/run.exp diff --git a/tests/chage/34_chage_interractive-W_invalid2/chage.test b/tests/chage/34_chage_interractive-W_invalid2/chage.test deleted file mode 100755 index fc4dd9d2..00000000 --- a/tests/chage/34_chage_interractive-W_invalid2/chage.test +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -set -e - -cd $(dirname $0) - -. ../../common/config.sh -. ../../common/log.sh - -log_start "$0" "chage interractive session checks field validity" - -save_config - -# restore the files on exit -trap 'log_status "$0" "FAILURE"; restore_config' 0 - -change_config - -echo -n "chage interractive session as myuser1..." -./run.exp -echo "OK" - -echo -n "Check the passwd file..." -../../common/compare_file.pl config/etc/passwd /etc/passwd -echo "OK" -echo -n "Check the group file..." -../../common/compare_file.pl config/etc/group /etc/group -echo "OK" -echo -n "Check the shadow file..." -../../common/compare_file.pl config/etc/shadow /etc/shadow -echo "OK" -echo -n "Check the gshadow file..." -../../common/compare_file.pl config/etc/gshadow /etc/gshadow -echo "OK" - -log_status "$0" "SUCCESS" -restore_config -trap '' 0 - diff --git a/tests/chage/35_chage_interactive-W-1/chage.test b/tests/chage/35_chage_interactive-W-1/chage.test new file mode 100755 index 00000000..8d5f5bef --- /dev/null +++ b/tests/chage/35_chage_interactive-W-1/chage.test @@ -0,0 +1,39 @@ +#!/bin/sh + +set -e + +cd $(dirname $0) + +. ../../common/config.sh +. ../../common/log.sh + +log_start "$0" "chage creates a shadow entry if there were none" + +save_config + +# restore the files on exit +trap 'log_status "$0" "FAILURE"; restore_config' 0 + +change_config + +echo -n "chage interactive session as myuser1..." +./run.exp +echo "OK" + +echo -n "Check the passwd file..." +../../common/compare_file.pl config/etc/passwd /etc/passwd +echo "OK" +echo -n "Check the group file..." +../../common/compare_file.pl config/etc/group /etc/group +echo "OK" +echo -n "Check the shadow file..." +../../common/compare_file.pl data/shadow /etc/shadow +echo "OK" +echo -n "Check the gshadow file..." +../../common/compare_file.pl config/etc/gshadow /etc/gshadow +echo "OK" + +log_status "$0" "SUCCESS" +restore_config +trap '' 0 + diff --git a/tests/chage/35_chage_interractive-W-1/config.txt b/tests/chage/35_chage_interactive-W-1/config.txt similarity index 100% rename from tests/chage/35_chage_interractive-W-1/config.txt rename to tests/chage/35_chage_interactive-W-1/config.txt diff --git a/tests/chage/35_chage_interractive-W-1/config/etc/group b/tests/chage/35_chage_interactive-W-1/config/etc/group similarity index 100% rename from tests/chage/35_chage_interractive-W-1/config/etc/group rename to tests/chage/35_chage_interactive-W-1/config/etc/group diff --git a/tests/chage/35_chage_interractive-W-1/config/etc/gshadow b/tests/chage/35_chage_interactive-W-1/config/etc/gshadow similarity index 100% rename from tests/chage/35_chage_interractive-W-1/config/etc/gshadow rename to tests/chage/35_chage_interactive-W-1/config/etc/gshadow diff --git a/tests/chage/35_chage_interractive-W-1/config/etc/login.defs b/tests/chage/35_chage_interactive-W-1/config/etc/login.defs similarity index 100% rename from tests/chage/35_chage_interractive-W-1/config/etc/login.defs rename to tests/chage/35_chage_interactive-W-1/config/etc/login.defs diff --git a/tests/chage/35_chage_interractive-W-1/config/etc/passwd b/tests/chage/35_chage_interactive-W-1/config/etc/passwd similarity index 100% rename from tests/chage/35_chage_interractive-W-1/config/etc/passwd rename to tests/chage/35_chage_interactive-W-1/config/etc/passwd diff --git a/tests/chage/35_chage_interractive-W-1/config/etc/shadow b/tests/chage/35_chage_interactive-W-1/config/etc/shadow similarity index 100% rename from tests/chage/35_chage_interractive-W-1/config/etc/shadow rename to tests/chage/35_chage_interactive-W-1/config/etc/shadow diff --git a/tests/chage/35_chage_interractive-W-1/data/shadow b/tests/chage/35_chage_interactive-W-1/data/shadow similarity index 100% rename from tests/chage/35_chage_interractive-W-1/data/shadow rename to tests/chage/35_chage_interactive-W-1/data/shadow diff --git a/tests/chage/35_chage_interractive-W-1/run.exp b/tests/chage/35_chage_interactive-W-1/run.exp similarity index 100% rename from tests/chage/35_chage_interractive-W-1/run.exp rename to tests/chage/35_chage_interactive-W-1/run.exp diff --git a/tests/chage/35_chage_interractive-W-1/chage.test b/tests/chage/35_chage_interractive-W-1/chage.test deleted file mode 100755 index 01f957f4..00000000 --- a/tests/chage/35_chage_interractive-W-1/chage.test +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -set -e - -cd $(dirname $0) - -. ../../common/config.sh -. ../../common/log.sh - -log_start "$0" "chage creates a shadow entry if there were none" - -save_config - -# restore the files on exit -trap 'log_status "$0" "FAILURE"; restore_config' 0 - -change_config - -echo -n "chage interractive session as myuser1..." -./run.exp -echo "OK" - -echo -n "Check the passwd file..." -../../common/compare_file.pl config/etc/passwd /etc/passwd -echo "OK" -echo -n "Check the group file..." -../../common/compare_file.pl config/etc/group /etc/group -echo "OK" -echo -n "Check the shadow file..." -../../common/compare_file.pl data/shadow /etc/shadow -echo "OK" -echo -n "Check the gshadow file..." -../../common/compare_file.pl config/etc/gshadow /etc/gshadow -echo "OK" - -log_status "$0" "SUCCESS" -restore_config -trap '' 0 - diff --git a/tests/chage/36_chage_interactive-I_invalid1/chage.test b/tests/chage/36_chage_interactive-I_invalid1/chage.test new file mode 100755 index 00000000..b2d6d328 --- /dev/null +++ b/tests/chage/36_chage_interactive-I_invalid1/chage.test @@ -0,0 +1,39 @@ +#!/bin/sh + +set -e + +cd $(dirname $0) + +. ../../common/config.sh +. ../../common/log.sh + +log_start "$0" "chage interactive session checks field validity" + +save_config + +# restore the files on exit +trap 'log_status "$0" "FAILURE"; restore_config' 0 + +change_config + +echo -n "chage interactive session as myuser1..." +./run.exp +echo "OK" + +echo -n "Check the passwd file..." +../../common/compare_file.pl config/etc/passwd /etc/passwd +echo "OK" +echo -n "Check the group file..." +../../common/compare_file.pl config/etc/group /etc/group +echo "OK" +echo -n "Check the shadow file..." +../../common/compare_file.pl config/etc/shadow /etc/shadow +echo "OK" +echo -n "Check the gshadow file..." +../../common/compare_file.pl config/etc/gshadow /etc/gshadow +echo "OK" + +log_status "$0" "SUCCESS" +restore_config +trap '' 0 + diff --git a/tests/chage/36_chage_interractive-I_invalid1/config.txt b/tests/chage/36_chage_interactive-I_invalid1/config.txt similarity index 100% rename from tests/chage/36_chage_interractive-I_invalid1/config.txt rename to tests/chage/36_chage_interactive-I_invalid1/config.txt diff --git a/tests/chage/36_chage_interractive-I_invalid1/config/etc/group b/tests/chage/36_chage_interactive-I_invalid1/config/etc/group similarity index 100% rename from tests/chage/36_chage_interractive-I_invalid1/config/etc/group rename to tests/chage/36_chage_interactive-I_invalid1/config/etc/group diff --git a/tests/chage/36_chage_interractive-I_invalid1/config/etc/gshadow b/tests/chage/36_chage_interactive-I_invalid1/config/etc/gshadow similarity index 100% rename from tests/chage/36_chage_interractive-I_invalid1/config/etc/gshadow rename to tests/chage/36_chage_interactive-I_invalid1/config/etc/gshadow diff --git a/tests/chage/36_chage_interractive-I_invalid1/config/etc/login.defs b/tests/chage/36_chage_interactive-I_invalid1/config/etc/login.defs similarity index 100% rename from tests/chage/36_chage_interractive-I_invalid1/config/etc/login.defs rename to tests/chage/36_chage_interactive-I_invalid1/config/etc/login.defs diff --git a/tests/chage/36_chage_interractive-I_invalid1/config/etc/passwd b/tests/chage/36_chage_interactive-I_invalid1/config/etc/passwd similarity index 100% rename from tests/chage/36_chage_interractive-I_invalid1/config/etc/passwd rename to tests/chage/36_chage_interactive-I_invalid1/config/etc/passwd diff --git a/tests/chage/36_chage_interractive-I_invalid1/config/etc/shadow b/tests/chage/36_chage_interactive-I_invalid1/config/etc/shadow similarity index 100% rename from tests/chage/36_chage_interractive-I_invalid1/config/etc/shadow rename to tests/chage/36_chage_interactive-I_invalid1/config/etc/shadow diff --git a/tests/chage/36_chage_interractive-I_invalid1/run.exp b/tests/chage/36_chage_interactive-I_invalid1/run.exp similarity index 100% rename from tests/chage/36_chage_interractive-I_invalid1/run.exp rename to tests/chage/36_chage_interactive-I_invalid1/run.exp diff --git a/tests/chage/36_chage_interractive-I_invalid1/chage.test b/tests/chage/36_chage_interractive-I_invalid1/chage.test deleted file mode 100755 index fc4dd9d2..00000000 --- a/tests/chage/36_chage_interractive-I_invalid1/chage.test +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -set -e - -cd $(dirname $0) - -. ../../common/config.sh -. ../../common/log.sh - -log_start "$0" "chage interractive session checks field validity" - -save_config - -# restore the files on exit -trap 'log_status "$0" "FAILURE"; restore_config' 0 - -change_config - -echo -n "chage interractive session as myuser1..." -./run.exp -echo "OK" - -echo -n "Check the passwd file..." -../../common/compare_file.pl config/etc/passwd /etc/passwd -echo "OK" -echo -n "Check the group file..." -../../common/compare_file.pl config/etc/group /etc/group -echo "OK" -echo -n "Check the shadow file..." -../../common/compare_file.pl config/etc/shadow /etc/shadow -echo "OK" -echo -n "Check the gshadow file..." -../../common/compare_file.pl config/etc/gshadow /etc/gshadow -echo "OK" - -log_status "$0" "SUCCESS" -restore_config -trap '' 0 - diff --git a/tests/chage/37_chage_interactive-I_invalid2/chage.test b/tests/chage/37_chage_interactive-I_invalid2/chage.test new file mode 100755 index 00000000..b2d6d328 --- /dev/null +++ b/tests/chage/37_chage_interactive-I_invalid2/chage.test @@ -0,0 +1,39 @@ +#!/bin/sh + +set -e + +cd $(dirname $0) + +. ../../common/config.sh +. ../../common/log.sh + +log_start "$0" "chage interactive session checks field validity" + +save_config + +# restore the files on exit +trap 'log_status "$0" "FAILURE"; restore_config' 0 + +change_config + +echo -n "chage interactive session as myuser1..." +./run.exp +echo "OK" + +echo -n "Check the passwd file..." +../../common/compare_file.pl config/etc/passwd /etc/passwd +echo "OK" +echo -n "Check the group file..." +../../common/compare_file.pl config/etc/group /etc/group +echo "OK" +echo -n "Check the shadow file..." +../../common/compare_file.pl config/etc/shadow /etc/shadow +echo "OK" +echo -n "Check the gshadow file..." +../../common/compare_file.pl config/etc/gshadow /etc/gshadow +echo "OK" + +log_status "$0" "SUCCESS" +restore_config +trap '' 0 + diff --git a/tests/chage/37_chage_interractive-I_invalid2/config.txt b/tests/chage/37_chage_interactive-I_invalid2/config.txt similarity index 100% rename from tests/chage/37_chage_interractive-I_invalid2/config.txt rename to tests/chage/37_chage_interactive-I_invalid2/config.txt diff --git a/tests/chage/37_chage_interractive-I_invalid2/config/etc/group b/tests/chage/37_chage_interactive-I_invalid2/config/etc/group similarity index 100% rename from tests/chage/37_chage_interractive-I_invalid2/config/etc/group rename to tests/chage/37_chage_interactive-I_invalid2/config/etc/group diff --git a/tests/chage/37_chage_interractive-I_invalid2/config/etc/gshadow b/tests/chage/37_chage_interactive-I_invalid2/config/etc/gshadow similarity index 100% rename from tests/chage/37_chage_interractive-I_invalid2/config/etc/gshadow rename to tests/chage/37_chage_interactive-I_invalid2/config/etc/gshadow diff --git a/tests/chage/37_chage_interractive-I_invalid2/config/etc/login.defs b/tests/chage/37_chage_interactive-I_invalid2/config/etc/login.defs similarity index 100% rename from tests/chage/37_chage_interractive-I_invalid2/config/etc/login.defs rename to tests/chage/37_chage_interactive-I_invalid2/config/etc/login.defs diff --git a/tests/chage/37_chage_interractive-I_invalid2/config/etc/passwd b/tests/chage/37_chage_interactive-I_invalid2/config/etc/passwd similarity index 100% rename from tests/chage/37_chage_interractive-I_invalid2/config/etc/passwd rename to tests/chage/37_chage_interactive-I_invalid2/config/etc/passwd diff --git a/tests/chage/37_chage_interractive-I_invalid2/config/etc/shadow b/tests/chage/37_chage_interactive-I_invalid2/config/etc/shadow similarity index 100% rename from tests/chage/37_chage_interractive-I_invalid2/config/etc/shadow rename to tests/chage/37_chage_interactive-I_invalid2/config/etc/shadow diff --git a/tests/chage/37_chage_interractive-I_invalid2/run.exp b/tests/chage/37_chage_interactive-I_invalid2/run.exp similarity index 100% rename from tests/chage/37_chage_interractive-I_invalid2/run.exp rename to tests/chage/37_chage_interactive-I_invalid2/run.exp diff --git a/tests/chage/37_chage_interractive-I_invalid2/chage.test b/tests/chage/37_chage_interractive-I_invalid2/chage.test deleted file mode 100755 index fc4dd9d2..00000000 --- a/tests/chage/37_chage_interractive-I_invalid2/chage.test +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -set -e - -cd $(dirname $0) - -. ../../common/config.sh -. ../../common/log.sh - -log_start "$0" "chage interractive session checks field validity" - -save_config - -# restore the files on exit -trap 'log_status "$0" "FAILURE"; restore_config' 0 - -change_config - -echo -n "chage interractive session as myuser1..." -./run.exp -echo "OK" - -echo -n "Check the passwd file..." -../../common/compare_file.pl config/etc/passwd /etc/passwd -echo "OK" -echo -n "Check the group file..." -../../common/compare_file.pl config/etc/group /etc/group -echo "OK" -echo -n "Check the shadow file..." -../../common/compare_file.pl config/etc/shadow /etc/shadow -echo "OK" -echo -n "Check the gshadow file..." -../../common/compare_file.pl config/etc/gshadow /etc/gshadow -echo "OK" - -log_status "$0" "SUCCESS" -restore_config -trap '' 0 - diff --git a/tests/chage/38_chage_interactive-I-1/chage.test b/tests/chage/38_chage_interactive-I-1/chage.test new file mode 100755 index 00000000..8d5f5bef --- /dev/null +++ b/tests/chage/38_chage_interactive-I-1/chage.test @@ -0,0 +1,39 @@ +#!/bin/sh + +set -e + +cd $(dirname $0) + +. ../../common/config.sh +. ../../common/log.sh + +log_start "$0" "chage creates a shadow entry if there were none" + +save_config + +# restore the files on exit +trap 'log_status "$0" "FAILURE"; restore_config' 0 + +change_config + +echo -n "chage interactive session as myuser1..." +./run.exp +echo "OK" + +echo -n "Check the passwd file..." +../../common/compare_file.pl config/etc/passwd /etc/passwd +echo "OK" +echo -n "Check the group file..." +../../common/compare_file.pl config/etc/group /etc/group +echo "OK" +echo -n "Check the shadow file..." +../../common/compare_file.pl data/shadow /etc/shadow +echo "OK" +echo -n "Check the gshadow file..." +../../common/compare_file.pl config/etc/gshadow /etc/gshadow +echo "OK" + +log_status "$0" "SUCCESS" +restore_config +trap '' 0 + diff --git a/tests/chage/38_chage_interractive-I-1/config.txt b/tests/chage/38_chage_interactive-I-1/config.txt similarity index 100% rename from tests/chage/38_chage_interractive-I-1/config.txt rename to tests/chage/38_chage_interactive-I-1/config.txt diff --git a/tests/chage/38_chage_interractive-I-1/config/etc/group b/tests/chage/38_chage_interactive-I-1/config/etc/group similarity index 100% rename from tests/chage/38_chage_interractive-I-1/config/etc/group rename to tests/chage/38_chage_interactive-I-1/config/etc/group diff --git a/tests/chage/38_chage_interractive-I-1/config/etc/gshadow b/tests/chage/38_chage_interactive-I-1/config/etc/gshadow similarity index 100% rename from tests/chage/38_chage_interractive-I-1/config/etc/gshadow rename to tests/chage/38_chage_interactive-I-1/config/etc/gshadow diff --git a/tests/chage/38_chage_interractive-I-1/config/etc/login.defs b/tests/chage/38_chage_interactive-I-1/config/etc/login.defs similarity index 100% rename from tests/chage/38_chage_interractive-I-1/config/etc/login.defs rename to tests/chage/38_chage_interactive-I-1/config/etc/login.defs diff --git a/tests/chage/38_chage_interractive-I-1/config/etc/passwd b/tests/chage/38_chage_interactive-I-1/config/etc/passwd similarity index 100% rename from tests/chage/38_chage_interractive-I-1/config/etc/passwd rename to tests/chage/38_chage_interactive-I-1/config/etc/passwd diff --git a/tests/chage/38_chage_interractive-I-1/config/etc/shadow b/tests/chage/38_chage_interactive-I-1/config/etc/shadow similarity index 100% rename from tests/chage/38_chage_interractive-I-1/config/etc/shadow rename to tests/chage/38_chage_interactive-I-1/config/etc/shadow diff --git a/tests/chage/38_chage_interractive-I-1/data/shadow b/tests/chage/38_chage_interactive-I-1/data/shadow similarity index 100% rename from tests/chage/38_chage_interractive-I-1/data/shadow rename to tests/chage/38_chage_interactive-I-1/data/shadow diff --git a/tests/chage/38_chage_interractive-I-1/run.exp b/tests/chage/38_chage_interactive-I-1/run.exp similarity index 100% rename from tests/chage/38_chage_interractive-I-1/run.exp rename to tests/chage/38_chage_interactive-I-1/run.exp diff --git a/tests/chage/38_chage_interractive-I-1/chage.test b/tests/chage/38_chage_interractive-I-1/chage.test deleted file mode 100755 index 01f957f4..00000000 --- a/tests/chage/38_chage_interractive-I-1/chage.test +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -set -e - -cd $(dirname $0) - -. ../../common/config.sh -. ../../common/log.sh - -log_start "$0" "chage creates a shadow entry if there were none" - -save_config - -# restore the files on exit -trap 'log_status "$0" "FAILURE"; restore_config' 0 - -change_config - -echo -n "chage interractive session as myuser1..." -./run.exp -echo "OK" - -echo -n "Check the passwd file..." -../../common/compare_file.pl config/etc/passwd /etc/passwd -echo "OK" -echo -n "Check the group file..." -../../common/compare_file.pl config/etc/group /etc/group -echo "OK" -echo -n "Check the shadow file..." -../../common/compare_file.pl data/shadow /etc/shadow -echo "OK" -echo -n "Check the gshadow file..." -../../common/compare_file.pl config/etc/gshadow /etc/gshadow -echo "OK" - -log_status "$0" "SUCCESS" -restore_config -trap '' 0 - diff --git a/tests/chage/39_chage_interactive-d-1/chage.test b/tests/chage/39_chage_interactive-d-1/chage.test new file mode 100755 index 00000000..8d5f5bef --- /dev/null +++ b/tests/chage/39_chage_interactive-d-1/chage.test @@ -0,0 +1,39 @@ +#!/bin/sh + +set -e + +cd $(dirname $0) + +. ../../common/config.sh +. ../../common/log.sh + +log_start "$0" "chage creates a shadow entry if there were none" + +save_config + +# restore the files on exit +trap 'log_status "$0" "FAILURE"; restore_config' 0 + +change_config + +echo -n "chage interactive session as myuser1..." +./run.exp +echo "OK" + +echo -n "Check the passwd file..." +../../common/compare_file.pl config/etc/passwd /etc/passwd +echo "OK" +echo -n "Check the group file..." +../../common/compare_file.pl config/etc/group /etc/group +echo "OK" +echo -n "Check the shadow file..." +../../common/compare_file.pl data/shadow /etc/shadow +echo "OK" +echo -n "Check the gshadow file..." +../../common/compare_file.pl config/etc/gshadow /etc/gshadow +echo "OK" + +log_status "$0" "SUCCESS" +restore_config +trap '' 0 + diff --git a/tests/chage/39_chage_interractive-d-1/config.txt b/tests/chage/39_chage_interactive-d-1/config.txt similarity index 100% rename from tests/chage/39_chage_interractive-d-1/config.txt rename to tests/chage/39_chage_interactive-d-1/config.txt diff --git a/tests/chage/39_chage_interractive-d-1/config/etc/group b/tests/chage/39_chage_interactive-d-1/config/etc/group similarity index 100% rename from tests/chage/39_chage_interractive-d-1/config/etc/group rename to tests/chage/39_chage_interactive-d-1/config/etc/group diff --git a/tests/chage/39_chage_interractive-d-1/config/etc/gshadow b/tests/chage/39_chage_interactive-d-1/config/etc/gshadow similarity index 100% rename from tests/chage/39_chage_interractive-d-1/config/etc/gshadow rename to tests/chage/39_chage_interactive-d-1/config/etc/gshadow diff --git a/tests/chage/39_chage_interractive-d-1/config/etc/login.defs b/tests/chage/39_chage_interactive-d-1/config/etc/login.defs similarity index 100% rename from tests/chage/39_chage_interractive-d-1/config/etc/login.defs rename to tests/chage/39_chage_interactive-d-1/config/etc/login.defs diff --git a/tests/chage/39_chage_interractive-d-1/config/etc/passwd b/tests/chage/39_chage_interactive-d-1/config/etc/passwd similarity index 100% rename from tests/chage/39_chage_interractive-d-1/config/etc/passwd rename to tests/chage/39_chage_interactive-d-1/config/etc/passwd diff --git a/tests/chage/39_chage_interractive-d-1/config/etc/shadow b/tests/chage/39_chage_interactive-d-1/config/etc/shadow similarity index 100% rename from tests/chage/39_chage_interractive-d-1/config/etc/shadow rename to tests/chage/39_chage_interactive-d-1/config/etc/shadow diff --git a/tests/chage/39_chage_interractive-d-1/data/shadow b/tests/chage/39_chage_interactive-d-1/data/shadow similarity index 100% rename from tests/chage/39_chage_interractive-d-1/data/shadow rename to tests/chage/39_chage_interactive-d-1/data/shadow diff --git a/tests/chage/39_chage_interractive-d-1/run.exp b/tests/chage/39_chage_interactive-d-1/run.exp similarity index 100% rename from tests/chage/39_chage_interractive-d-1/run.exp rename to tests/chage/39_chage_interactive-d-1/run.exp diff --git a/tests/chage/39_chage_interractive-d-1/chage.test b/tests/chage/39_chage_interractive-d-1/chage.test deleted file mode 100755 index 01f957f4..00000000 --- a/tests/chage/39_chage_interractive-d-1/chage.test +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -set -e - -cd $(dirname $0) - -. ../../common/config.sh -. ../../common/log.sh - -log_start "$0" "chage creates a shadow entry if there were none" - -save_config - -# restore the files on exit -trap 'log_status "$0" "FAILURE"; restore_config' 0 - -change_config - -echo -n "chage interractive session as myuser1..." -./run.exp -echo "OK" - -echo -n "Check the passwd file..." -../../common/compare_file.pl config/etc/passwd /etc/passwd -echo "OK" -echo -n "Check the group file..." -../../common/compare_file.pl config/etc/group /etc/group -echo "OK" -echo -n "Check the shadow file..." -../../common/compare_file.pl data/shadow /etc/shadow -echo "OK" -echo -n "Check the gshadow file..." -../../common/compare_file.pl config/etc/gshadow /etc/gshadow -echo "OK" - -log_status "$0" "SUCCESS" -restore_config -trap '' 0 - diff --git a/tests/run_all b/tests/run_all index c5517d52..7f396cf7 100755 --- a/tests/run_all +++ b/tests/run_all @@ -145,21 +145,21 @@ run_test ./chage/21_chage_no_shadow_file/chage.test run_test ./chage/22_chage_myuser-l/chage.test run_test ./chage/23_chage_myuser-I/chage.test run_test ./chage/24_chage_myuser-l_other/chage.test -run_test ./chage/25_chage_interractive/chage.test -run_test ./chage/26_chage_interractive_date_0/chage.test -run_test ./chage/27_chage_interractive_date_-1/chage.test -run_test ./chage/28_chage_interractive_date_EPOCH/chage.test -run_test ./chage/29_chage_interractive_date_pre-EPOCH/chage.test -run_test ./chage/30_chage_interractive_date_pre-EPOCH2/chage.test -run_test ./chage/31_chage_interractive_date_invalid/chage.test -run_test ./chage/32_chage_interractive_date_invalid2/chage.test -run_test ./chage/33_chage_interractive-W_invalid1/chage.test -run_test ./chage/34_chage_interractive-W_invalid2/chage.test -run_test ./chage/35_chage_interractive-W-1/chage.test -run_test ./chage/36_chage_interractive-I_invalid1/chage.test -run_test ./chage/37_chage_interractive-I_invalid2/chage.test -run_test ./chage/38_chage_interractive-I-1/chage.test -run_test ./chage/39_chage_interractive-d-1/chage.test +run_test ./chage/25_chage_interactive/chage.test +run_test ./chage/26_chage_interactive_date_0/chage.test +run_test ./chage/27_chage_interactive_date_-1/chage.test +run_test ./chage/28_chage_interactive_date_EPOCH/chage.test +run_test ./chage/29_chage_interactive_date_pre-EPOCH/chage.test +run_test ./chage/30_chage_interactive_date_pre-EPOCH2/chage.test +run_test ./chage/31_chage_interactive_date_invalid/chage.test +run_test ./chage/32_chage_interactive_date_invalid2/chage.test +run_test ./chage/33_chage_interactive-W_invalid1/chage.test +run_test ./chage/34_chage_interactive-W_invalid2/chage.test +run_test ./chage/35_chage_interactive-W-1/chage.test +run_test ./chage/36_chage_interactive-I_invalid1/chage.test +run_test ./chage/37_chage_interactive-I_invalid2/chage.test +run_test ./chage/38_chage_interactive-I-1/chage.test +run_test ./chage/39_chage_interactive-d-1/chage.test run_test ./chsh/01/run run_test ./chsh/02_chsh_usage/chsh.test run_test ./chsh/03_chsh_usage_invalid_option/chsh.test diff --git a/tests/run_all.coverage b/tests/run_all.coverage index a49be436..16a66a07 100755 --- a/tests/run_all.coverage +++ b/tests/run_all.coverage @@ -161,21 +161,21 @@ run_test ./chage/21_chage_no_shadow_file/chage.test run_test ./chage/22_chage_myuser-l/chage.test run_test ./chage/23_chage_myuser-I/chage.test run_test ./chage/24_chage_myuser-l_other/chage.test -run_test ./chage/25_chage_interractive/chage.test -run_test ./chage/26_chage_interractive_date_0/chage.test -run_test ./chage/27_chage_interractive_date_-1/chage.test -run_test ./chage/28_chage_interractive_date_EPOCH/chage.test -run_test ./chage/29_chage_interractive_date_pre-EPOCH/chage.test -run_test ./chage/30_chage_interractive_date_pre-EPOCH2/chage.test -run_test ./chage/31_chage_interractive_date_invalid/chage.test -run_test ./chage/32_chage_interractive_date_invalid2/chage.test -run_test ./chage/33_chage_interractive-W_invalid1/chage.test -run_test ./chage/34_chage_interractive-W_invalid2/chage.test -run_test ./chage/35_chage_interractive-W-1/chage.test -run_test ./chage/36_chage_interractive-I_invalid1/chage.test -run_test ./chage/37_chage_interractive-I_invalid2/chage.test -run_test ./chage/38_chage_interractive-I-1/chage.test -run_test ./chage/39_chage_interractive-d-1/chage.test +run_test ./chage/25_chage_interactive/chage.test +run_test ./chage/26_chage_interactive_date_0/chage.test +run_test ./chage/27_chage_interactive_date_-1/chage.test +run_test ./chage/28_chage_interactive_date_EPOCH/chage.test +run_test ./chage/29_chage_interactive_date_pre-EPOCH/chage.test +run_test ./chage/30_chage_interactive_date_pre-EPOCH2/chage.test +run_test ./chage/31_chage_interactive_date_invalid/chage.test +run_test ./chage/32_chage_interactive_date_invalid2/chage.test +run_test ./chage/33_chage_interactive-W_invalid1/chage.test +run_test ./chage/34_chage_interactive-W_invalid2/chage.test +run_test ./chage/35_chage_interactive-W-1/chage.test +run_test ./chage/36_chage_interactive-I_invalid1/chage.test +run_test ./chage/37_chage_interactive-I_invalid2/chage.test +run_test ./chage/38_chage_interactive-I-1/chage.test +run_test ./chage/39_chage_interactive-d-1/chage.test run_test ./chsh/01/run run_test ./chsh/02_chsh_usage/chsh.test run_test ./chsh/03_chsh_usage_invalid_option/chsh.test -- 2.40.0