From 12e0029b68f9e3dcb8f7b0120e979b9d698880b2 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sun, 17 Jul 2011 12:00:16 +0000 Subject: [PATCH] Remove unused files or files identical to config. --- tests/cktools/02_pwck_sort/data/group | 42 ----------------- tests/cktools/02_pwck_sort/pwck.test | 4 +- tests/cktools/03_grpck_sort/data/passwd | 20 -------- tests/cktools/03_grpck_sort/data/shadow | 20 -------- tests/cktools/03_grpck_sort/grpck.test | 4 +- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../pwck.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../grpck.test | 4 +- .../06_pwck_sort_NIS_server/data/group | 43 ----------------- .../06_pwck_sort_NIS_server/data/gshadow | 43 ----------------- .../cktools/06_pwck_sort_NIS_server/pwck.test | 4 +- .../07_pwck_sort_NIS_client/data/group | 45 ------------------ .../07_pwck_sort_NIS_client/data/gshadow | 43 ----------------- .../cktools/07_pwck_sort_NIS_client/pwck.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../grpck.test | 4 +- .../data/group | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../grpck.test | 6 +-- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../grpck.test | 8 ++-- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../grpck.test | 6 +-- .../data/group | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../grpck.test | 6 +-- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../grpck.test | 8 ++-- .../data/passwd | 20 -------- .../12_grpck_unknown_user_group/data/gshadow | 42 ----------------- .../12_grpck_unknown_user_group/data/passwd | 20 -------- .../12_grpck_unknown_user_group/data/shadow | 20 -------- .../12_grpck_unknown_user_group/grpck.test | 6 +-- .../13_grpck_unknown_user_gshadow/data/group | 42 ----------------- .../13_grpck_unknown_user_gshadow/data/passwd | 20 -------- .../13_grpck_unknown_user_gshadow/data/shadow | 20 -------- .../13_grpck_unknown_user_gshadow/grpck.test | 6 +-- .../data/group | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../grpck.test | 6 +-- .../data/gshadow | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../grpck.test | 6 +-- .../data/gshadow | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../16_grpck_duplicate_entry_group/grpck.test | 6 +-- .../data/group | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../grpck.test | 6 +-- .../data/group | 43 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../grpck.test | 8 ++-- .../data/group | 42 ----------------- .../data/gshadow | 43 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../grpck.test | 8 ++-- .../data/group | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../grpck.test | 6 +-- .../21_grpck_invalid_group_name/data/group | 42 ----------------- .../21_grpck_invalid_group_name/data/gshadow | 42 ----------------- .../21_grpck_invalid_group_name/data/passwd | 20 -------- .../21_grpck_invalid_group_name/data/shadow | 20 -------- .../21_grpck_invalid_group_name/grpck.test | 8 ++-- .../22_grpck_invalid_group_ID_-1/data/passwd | 20 -------- .../22_grpck_invalid_group_ID_-1/data/shadow | 20 -------- .../22_grpck_invalid_group_ID_-1/grpck.test | 4 +- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../grpck.test | 8 ++-- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../grpck.test | 4 +- .../grpck/26_grpck_no_gshadow_file/data/group | 42 ----------------- .../26_grpck_no_gshadow_file/data/passwd | 20 -------- .../26_grpck_no_gshadow_file/data/shadow | 20 -------- .../grpck/26_grpck_no_gshadow_file/grpck.test | 6 +-- .../27_grpck_sort_no_gshadow_file/data/passwd | 20 -------- .../27_grpck_sort_no_gshadow_file/data/shadow | 20 -------- .../27_grpck_sort_no_gshadow_file/grpck.test | 4 +- .../data/gshadow | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../grpck.test | 6 +-- .../data/passwd | 11 ----- .../pwck.test | 2 +- .../data/passwd | 11 ----- .../pwck.test | 2 +- .../data/passwd | 11 ----- .../pwck.test | 2 +- .../config.txt | 0 .../config/etc}/group | 0 .../config/etc}/gshadow | 0 .../config/etc/passwd | 0 .../config/etc/shadow | 0 .../data/passwd | 0 .../pwck.exp | 0 .../pwck.test | 2 +- .../config/etc/group | 42 ----------------- .../config/etc/gshadow | 42 ----------------- .../data/shadow | 11 ----- .../data/passwd | 11 ----- .../14_pwck_duplicate_entry_shadow/pwck.test | 2 +- .../data/shadow | 11 ----- .../pwck.test | 2 +- .../data/passwd | 10 ---- .../data/shadow | 10 ---- .../data/group | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../grpconv.test | 6 +-- .../03_grpconv_copy_passwd/data/passwd | 19 -------- .../03_grpconv_copy_passwd/data/shadow | 19 -------- .../03_grpconv_copy_passwd/grpconv.test | 4 +- .../04_grpconv_no_password/data/passwd | 19 -------- .../04_grpconv_no_password/data/shadow | 19 -------- .../04_grpconv_no_password/grpconv.test | 4 +- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../grpconv.test | 4 +- .../06_grpconv_error_group_locked/data/group | 42 ----------------- .../data/gshadow | 41 ----------------- .../06_grpconv_error_group_locked/data/passwd | 19 -------- .../06_grpconv_error_group_locked/data/shadow | 19 -------- .../grpconv.test | 8 ++-- .../data/group | 42 ----------------- .../data/gshadow | 41 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../grpconv.test | 8 ++-- .../08_grpunconv_no_gshadow_file/data/group | 42 ----------------- .../08_grpunconv_no_gshadow_file/data/passwd | 20 -------- .../08_grpunconv_no_gshadow_file/data/shadow | 20 -------- .../grpunconv.test | 6 +-- .../data/group | 42 ----------------- .../data/gshadow | 41 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../grpunconv.test | 8 ++-- .../data/group | 42 ----------------- .../data/gshadow | 41 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../grpunconv.test | 8 ++-- .../11_pwconv_error_passwd_locked/data/group | 42 ----------------- .../data/gshadow | 41 ----------------- .../11_pwconv_error_passwd_locked/data/passwd | 19 -------- .../11_pwconv_error_passwd_locked/data/shadow | 19 -------- .../11_pwconv_error_passwd_locked/pwconv.test | 8 ++-- .../12_pwconv_error_shadow_locked/data/group | 42 ----------------- .../data/gshadow | 41 ----------------- .../12_pwconv_error_shadow_locked/data/passwd | 19 -------- .../12_pwconv_error_shadow_locked/data/shadow | 19 -------- .../12_pwconv_error_shadow_locked/pwconv.test | 8 ++-- .../data/group | 42 ----------------- .../data/gshadow | 41 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../pwunconv.test | 8 ++-- .../data/group | 42 ----------------- .../data/gshadow | 41 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../pwunconv.test | 8 ++-- .../data/group | 42 ----------------- .../data/gshadow | 43 ----------------- .../data/passwd | 20 -------- .../pwconv.test | 6 +-- .../16_pwconv_copy_passwd/data/group | 42 ----------------- .../16_pwconv_copy_passwd/data/gshadow | 41 ----------------- .../16_pwconv_copy_passwd/pwconv.test | 4 +- .../17_pwunconv_no_shadow_file/data/group | 42 ----------------- .../17_pwunconv_no_shadow_file/data/gshadow | 43 ----------------- .../17_pwunconv_no_shadow_file/data/passwd | 20 -------- .../17_pwunconv_no_shadow_file/pwunconv.test | 6 +-- .../18_pwunconv_user_not_in_shadow/data/group | 42 ----------------- .../data/gshadow | 41 ----------------- .../pwunconv.test | 4 +- .../data/shadow | 19 -------- .../data/gshadow | 41 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupadd.test | 6 +-- .../data/group | 41 ----------------- .../data/gshadow | 41 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupadd.test | 8 ++-- .../data/group | 41 ----------------- .../data/gshadow | 41 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupadd.test | 8 ++-- .../04_groupadd_group_open_failure/data/group | 41 ----------------- .../data/gshadow | 41 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupadd.test | 8 ++-- .../data/gshadow | 42 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupdel.test | 6 +-- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupdel.test | 8 ++-- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupdel.test | 8 ++-- .../04_groupdel_group_open_failure/data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupdel.test | 8 ++-- .../data/gshadow | 42 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 6 +-- .../data/gshadow | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../groupmod.test | 6 +-- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 8 ++-- .../04_groupmod_group_open_failure/data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 8 ++-- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 8 ++-- .../data/groupmod.err | 2 - .../data/gshadow | 42 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 6 +-- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../groupmod.test | 8 ++-- .../data/group | 42 ----------------- .../data/groupmod.err | 2 - .../data/gshadow | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../groupmod.test | 8 ++-- .../data/groupmod.err | 2 - .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../groupmod.test | 4 +- .../02_grpck_group_open_failure/data/group | 42 ----------------- .../data/group | 42 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../data/gshadow | 42 ----------------- .../usermod.test | 2 +- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../usermod.test | 8 ++-- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../usermod.test | 4 +- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/usermod.err | 2 - .../usermod.test | 4 +- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/shadow | 20 -------- .../usermod.test | 6 +-- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../01_gpasswd_change_member_list/data/passwd | 20 -------- .../01_gpasswd_change_member_list/data/shadow | 20 -------- .../gpasswd.test | 4 +- .../02_gpasswd_change_member_list/data/passwd | 20 -------- .../02_gpasswd_change_member_list/data/shadow | 20 -------- .../gpasswd.test | 4 +- .../03_gpasswd_change_member_list/data/passwd | 20 -------- .../03_gpasswd_change_member_list/data/shadow | 20 -------- .../gpasswd.test | 4 +- .../04_gpasswd_change_member_list/data/passwd | 20 -------- .../04_gpasswd_change_member_list/data/shadow | 20 -------- .../gpasswd.test | 4 +- .../05_gpasswd_change_member_list/data/passwd | 20 -------- .../05_gpasswd_change_member_list/data/shadow | 20 -------- .../gpasswd.test | 4 +- .../06_gpasswd_change_member_list/data/passwd | 20 -------- .../06_gpasswd_change_member_list/data/shadow | 20 -------- .../gpasswd.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../data/gshadow | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../data/gshadow | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../data/gshadow | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../data/gshadow | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../data/gshadow | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../data/gshadow | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../19_gpasswd_change_passwd-root/data/group | 42 ----------------- .../19_gpasswd_change_passwd-root/data/passwd | 20 -------- .../19_gpasswd_change_passwd-root/data/shadow | 20 -------- .../gpasswd.test | 6 +-- .../data/group | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 6 +-- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../data/group | 42 ----------------- .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../gpasswd.test | 6 +-- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../gpasswd.test | 8 ++-- .../data/group | 42 ----------------- .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../gpasswd.test | 6 +-- .../25_gpasswd_remove_password/data/passwd | 20 -------- .../25_gpasswd_remove_password/data/shadow | 20 -------- .../25_gpasswd_remove_password/gpasswd.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../28_gpasswd_lock_password/data/passwd | 20 -------- .../28_gpasswd_lock_password/data/shadow | 20 -------- .../28_gpasswd_lock_password/gpasswd.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../31_gpasswd_add_user_to_group/data/passwd | 20 -------- .../31_gpasswd_add_user_to_group/data/shadow | 20 -------- .../31_gpasswd_add_user_to_group/gpasswd.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../data/gshadow | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../43_gpasswd_-r_locked_group/data/group | 42 ----------------- .../43_gpasswd_-r_locked_group/data/gshadow | 42 ----------------- .../43_gpasswd_-r_locked_group/data/passwd | 20 -------- .../43_gpasswd_-r_locked_group/data/shadow | 20 -------- .../43_gpasswd_-r_locked_group/gpasswd.test | 8 ++-- .../44_gpasswd_-r_locked_gshadow/data/group | 42 ----------------- .../44_gpasswd_-r_locked_gshadow/data/gshadow | 42 ----------------- .../44_gpasswd_-r_locked_gshadow/data/passwd | 20 -------- .../44_gpasswd_-r_locked_gshadow/data/shadow | 20 -------- .../44_gpasswd_-r_locked_gshadow/gpasswd.test | 8 ++-- .../45_gpasswd_-r_unknown_group/data/group | 42 ----------------- .../45_gpasswd_-r_unknown_group/data/gshadow | 42 ----------------- .../45_gpasswd_-r_unknown_group/data/passwd | 20 -------- .../45_gpasswd_-r_unknown_group/data/shadow | 20 -------- .../45_gpasswd_-r_unknown_group/gpasswd.test | 8 ++-- .../46_gpasswd_-a_unknown_user/data/group | 42 ----------------- .../46_gpasswd_-a_unknown_user/data/gshadow | 42 ----------------- .../46_gpasswd_-a_unknown_user/data/passwd | 20 -------- .../46_gpasswd_-a_unknown_user/data/shadow | 20 -------- .../46_gpasswd_-a_unknown_user/gpasswd.test | 8 ++-- .../47_gpasswd_-M_unknown_user/data/group | 42 ----------------- .../47_gpasswd_-M_unknown_user/data/gshadow | 42 ----------------- .../47_gpasswd_-M_unknown_user/data/passwd | 20 -------- .../47_gpasswd_-M_unknown_user/data/shadow | 20 -------- .../47_gpasswd_-M_unknown_user/gpasswd.test | 8 ++-- .../48_gpasswd_change_admin_list/data/group | 42 ----------------- .../48_gpasswd_change_admin_list/data/passwd | 20 -------- .../48_gpasswd_change_admin_list/data/shadow | 20 -------- .../48_gpasswd_change_admin_list/gpasswd.test | 6 +-- .../49_gpasswd_change_admin_list/data/group | 42 ----------------- .../49_gpasswd_change_admin_list/data/passwd | 20 -------- .../49_gpasswd_change_admin_list/data/shadow | 20 -------- .../49_gpasswd_change_admin_list/gpasswd.test | 6 +-- .../50_gpasswd_change_admin_list/data/group | 42 ----------------- .../50_gpasswd_change_admin_list/data/passwd | 20 -------- .../50_gpasswd_change_admin_list/data/shadow | 20 -------- .../50_gpasswd_change_admin_list/gpasswd.test | 6 +-- .../51_gpasswd_change_admin_list/data/group | 42 ----------------- .../51_gpasswd_change_admin_list/data/passwd | 20 -------- .../51_gpasswd_change_admin_list/data/shadow | 20 -------- .../51_gpasswd_change_admin_list/gpasswd.test | 6 +-- .../52_gpasswd_change_admin_list/data/group | 42 ----------------- .../52_gpasswd_change_admin_list/data/passwd | 20 -------- .../52_gpasswd_change_admin_list/data/shadow | 20 -------- .../52_gpasswd_change_admin_list/gpasswd.test | 6 +-- .../53_gpasswd_change_admin_list/data/group | 42 ----------------- .../53_gpasswd_change_admin_list/data/passwd | 20 -------- .../53_gpasswd_change_admin_list/data/shadow | 20 -------- .../53_gpasswd_change_admin_list/gpasswd.test | 6 +-- .../data/group | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 6 +-- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 6 +-- .../56_gpasswd_add_user_to_group/data/group | 42 ----------------- .../56_gpasswd_add_user_to_group/data/gshadow | 42 ----------------- .../56_gpasswd_add_user_to_group/data/passwd | 20 -------- .../56_gpasswd_add_user_to_group/data/shadow | 20 -------- .../56_gpasswd_add_user_to_group/gpasswd.test | 8 ++-- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 8 ++-- .../data/gshadow | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 6 +-- .../data/group | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 6 +-- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../gpasswd.test | 4 +- .../01_groupadd_add_group/data/passwd | 19 -------- .../01_groupadd_add_group/data/shadow | 19 -------- .../01_groupadd_add_group/groupadd.test | 4 +- .../02_groupadd_add_group_GID_MIN/data/passwd | 19 -------- .../02_groupadd_add_group_GID_MIN/data/shadow | 19 -------- .../groupadd.test | 4 +- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupadd.test | 4 +- .../04_groupadd_set_password/data/passwd | 19 -------- .../04_groupadd_set_password/data/shadow | 19 -------- .../04_groupadd_set_password/groupadd.test | 4 +- .../groupadd/05_groupadd_set_GID/data/passwd | 19 -------- .../groupadd/05_groupadd_set_GID/data/shadow | 19 -------- .../05_groupadd_set_GID/groupadd.test | 4 +- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupadd.test | 8 ++-- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupadd.test | 4 +- .../08_groupadd_locked_group/data/group | 41 ----------------- .../08_groupadd_locked_group/data/gshadow | 41 ----------------- .../08_groupadd_locked_group/data/passwd | 19 -------- .../08_groupadd_locked_group/data/shadow | 19 -------- .../08_groupadd_locked_group/groupadd.test | 8 ++-- .../09_groupadd_locked_gshadow/data/group | 41 ----------------- .../09_groupadd_locked_gshadow/data/gshadow | 41 ----------------- .../09_groupadd_locked_gshadow/data/passwd | 19 -------- .../09_groupadd_locked_gshadow/data/shadow | 19 -------- .../09_groupadd_locked_gshadow/groupadd.test | 8 ++-- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupadd.test | 4 +- .../11_groupadd_invalid_GID/data/group | 41 ----------------- .../11_groupadd_invalid_GID/data/gshadow | 41 ----------------- .../11_groupadd_invalid_GID/data/passwd | 19 -------- .../11_groupadd_invalid_GID/data/shadow | 19 -------- .../11_groupadd_invalid_GID/groupadd.test | 8 ++-- .../12_groupadd_negativ_GID/data/group | 41 ----------------- .../12_groupadd_negativ_GID/data/gshadow | 41 ----------------- .../12_groupadd_negativ_GID/data/passwd | 19 -------- .../12_groupadd_negativ_GID/data/shadow | 19 -------- .../12_groupadd_negativ_GID/groupadd.test | 8 ++-- .../13_groupadd_invalid_name/data/group | 41 ----------------- .../13_groupadd_invalid_name/data/gshadow | 41 ----------------- .../13_groupadd_invalid_name/data/passwd | 19 -------- .../13_groupadd_invalid_name/data/shadow | 19 -------- .../13_groupadd_invalid_name/groupadd.test | 8 ++-- .../14_groupadd_invalid_-K_option/data/group | 41 ----------------- .../data/gshadow | 41 ----------------- .../14_groupadd_invalid_-K_option/data/passwd | 19 -------- .../14_groupadd_invalid_-K_option/data/shadow | 19 -------- .../groupadd.test | 8 ++-- .../15_groupadd_invalid_-K_no_=/data/group | 41 ----------------- .../15_groupadd_invalid_-K_no_=/data/gshadow | 41 ----------------- .../15_groupadd_invalid_-K_no_=/data/passwd | 19 -------- .../15_groupadd_invalid_-K_no_=/data/shadow | 19 -------- .../15_groupadd_invalid_-K_no_=/groupadd.test | 8 ++-- .../16_groupadd_existing_group/data/group | 42 ----------------- .../16_groupadd_existing_group/data/gshadow | 42 ----------------- .../16_groupadd_existing_group/data/passwd | 19 -------- .../16_groupadd_existing_group/data/shadow | 19 -------- .../16_groupadd_existing_group/groupadd.test | 8 ++-- .../17_groupadd_add_systemgroup/data/passwd | 19 -------- .../17_groupadd_add_systemgroup/data/shadow | 19 -------- .../17_groupadd_add_systemgroup/groupadd.test | 4 +- .../18_groupadd_no_more_GID/data/group | 43 ----------------- .../18_groupadd_no_more_GID/data/gshadow | 42 ----------------- .../18_groupadd_no_more_GID/data/passwd | 19 -------- .../18_groupadd_no_more_GID/data/shadow | 19 -------- .../18_groupadd_no_more_GID/groupadd.test | 8 ++-- .../data/group | 43 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupadd.test | 8 ++-- .../20_groupadd_add_existing_GID/data/group | 42 ----------------- .../20_groupadd_add_existing_GID/data/gshadow | 42 ----------------- .../20_groupadd_add_existing_GID/data/passwd | 19 -------- .../20_groupadd_add_existing_GID/data/shadow | 19 -------- .../groupadd.test | 8 ++-- .../25_groupadd_no_gshadow/data/passwd | 19 -------- .../25_groupadd_no_gshadow/data/shadow | 19 -------- .../25_groupadd_no_gshadow/groupadd.test | 4 +- .../01_groupdel_delete_group/data/passwd | 19 -------- .../01_groupdel_delete_group/data/shadow | 19 -------- .../01_groupdel_delete_group/groupdel.test | 4 +- .../data/gshadow | 41 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupdel.test | 6 +-- .../data/gshadow | 41 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupdel.test | 4 +- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../groupdel.test | 8 ++-- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../groupdel.test | 8 ++-- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupdel.test | 8 ++-- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupdel.test | 8 ++-- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../groupdel.test | 8 ++-- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../groupdel.test | 8 ++-- .../01_groupmems_root_add_user/data/passwd | 20 -------- .../01_groupmems_root_add_user/data/shadow | 20 -------- .../01_groupmems_root_add_user/groupmems.test | 4 +- .../02_groupmems_root_del_user/data/passwd | 20 -------- .../02_groupmems_root_del_user/data/shadow | 20 -------- .../02_groupmems_root_del_user/groupmems.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../groupmems.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../groupmems.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../groupmems.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../groupmems.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../groupmems.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../groupmems.test | 4 +- .../09_groupmems_root_purge_user/data/passwd | 20 -------- .../09_groupmems_root_purge_user/data/shadow | 20 -------- .../groupmems.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../groupmems.test | 4 +- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../groupmems.test | 4 +- .../12_groupmems_user_add_user/data/passwd | 21 --------- .../12_groupmems_user_add_user/data/shadow | 21 --------- .../12_groupmems_user_add_user/groupmems.test | 4 +- .../13_groupmems_user_del_user/data/passwd | 21 --------- .../13_groupmems_user_del_user/data/shadow | 21 --------- .../13_groupmems_user_del_user/groupmems.test | 4 +- .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 4 +- .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 4 +- .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 4 +- .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 4 +- .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 4 +- .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 4 +- .../20_groupmems_user_purge_user/data/passwd | 21 --------- .../20_groupmems_user_purge_user/data/shadow | 21 --------- .../groupmems.test | 4 +- .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 4 +- .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 4 +- .../data/group | 44 ------------------ .../data/gshadow | 44 ------------------ .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 8 ++-- .../data/group | 45 ------------------ .../data/gshadow | 45 ------------------ .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 8 ++-- .../data/group | 45 ------------------ .../data/gshadow | 45 ------------------ .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 8 ++-- .../data/group | 44 ------------------ .../data/gshadow | 44 ------------------ .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 8 ++-- .../data/group | 44 ------------------ .../data/gshadow | 44 ------------------ .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 8 ++-- .../data/gshadow | 44 ------------------ .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 6 +-- .../data/group | 44 ------------------ .../data/gshadow | 44 ------------------ .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 8 ++-- .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 4 +- .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 4 +- .../data/group | 44 ------------------ .../data/gshadow | 44 ------------------ .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 8 ++-- .../data/gshadow | 44 ------------------ .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 6 +-- .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 4 +- .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 4 +- .../data/gshadow | 44 ------------------ .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 4 +- .../data/group | 44 ------------------ .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 6 +-- .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 4 +- .../data/gshadow | 44 ------------------ .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 4 +- .../data/group | 45 ------------------ .../data/gshadow | 45 ------------------ .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 8 ++-- .../data/group | 45 ------------------ .../data/gshadow | 45 ------------------ .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 8 ++-- .../42_groupmems_user_list_users/data/group | 44 ------------------ .../42_groupmems_user_list_users/data/gshadow | 44 ------------------ .../42_groupmems_user_list_users/data/passwd | 21 --------- .../42_groupmems_user_list_users/data/shadow | 21 --------- .../groupmems.test | 8 ++-- .../data/group | 44 ------------------ .../data/gshadow | 44 ------------------ .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 8 ++-- .../data/group | 45 ------------------ .../data/gshadow | 45 ------------------ .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 8 ++-- .../data/group | 44 ------------------ .../data/gshadow | 44 ------------------ .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 8 ++-- .../data/group | 44 ------------------ .../data/gshadow | 44 ------------------ .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 8 ++-- .../data/group | 44 ------------------ .../data/gshadow | 44 ------------------ .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 8 ++-- .../data/group | 44 ------------------ .../data/gshadow | 44 ------------------ .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 8 ++-- .../data/group | 44 ------------------ .../data/gshadow | 44 ------------------ .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 8 ++-- .../data/group | 44 ------------------ .../data/gshadow | 44 ------------------ .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 8 ++-- .../data/group | 44 ------------------ .../data/gshadow | 44 ------------------ .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 8 ++-- .../data/group | 44 ------------------ .../data/gshadow | 44 ------------------ .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../groupmems.test | 8 ++-- .../01_groupmod_change_gid/data/gshadow | 42 ----------------- .../01_groupmod_change_gid/data/passwd | 19 -------- .../01_groupmod_change_gid/data/shadow | 19 -------- .../01_groupmod_change_gid/groupmod.test | 6 +-- .../data/gshadow | 42 ----------------- .../data/shadow | 20 -------- .../groupmod.test | 4 +- .../data/gshadow | 41 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 6 +-- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 4 +- .../data/gshadow | 43 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 6 +-- .../06_groupmod_change_group_name/data/passwd | 19 -------- .../06_groupmod_change_group_name/data/shadow | 19 -------- .../groupmod.test | 4 +- .../data/gshadow | 41 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 6 +-- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 4 +- .../09_groupmod_set_password/data/group | 42 ----------------- .../09_groupmod_set_password/data/passwd | 19 -------- .../09_groupmod_set_password/data/shadow | 19 -------- .../09_groupmod_set_password/groupmod.test | 6 +-- .../data/group | 42 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 6 +-- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 4 +- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 8 ++-- .../data/group | 43 ----------------- .../data/gshadow | 43 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 8 ++-- .../data/group | 43 ----------------- .../data/gshadow | 43 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 8 ++-- .../data/group | 43 ----------------- .../data/gshadow | 43 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 8 ++-- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 8 ++-- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 8 ++-- .../data/gshadow | 42 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 6 +-- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 8 ++-- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 8 ++-- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 8 ++-- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 4 +- .../data/shadow | 19 -------- .../groupmod.test | 2 +- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 8 ++-- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 8 ++-- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 4 +- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 4 +- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 8 ++-- .../31_groupmod_-g_same_gid/data/group | 42 ----------------- .../31_groupmod_-g_same_gid/data/gshadow | 42 ----------------- .../31_groupmod_-g_same_gid/data/passwd | 19 -------- .../31_groupmod_-g_same_gid/data/shadow | 19 -------- .../31_groupmod_-g_same_gid/groupmod.test | 8 ++-- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../groupmod.test | 4 +- tests/newusers/02_update_password/data/group | 42 ----------------- .../newusers/02_update_password/data/gshadow | 41 ----------------- tests/newusers/02_update_password/data/passwd | 20 -------- .../newusers/02_update_password/newusers.test | 6 +-- tests/newusers/03_no_update_pid/data/group | 42 ----------------- tests/newusers/03_no_update_pid/data/gshadow | 41 ----------------- tests/newusers/03_no_update_pid/data/passwd | 20 -------- tests/newusers/03_no_update_pid/newusers.test | 6 +-- tests/newusers/04_no_update_gid/data/group | 42 ----------------- tests/newusers/04_no_update_gid/data/gshadow | 41 ----------------- tests/newusers/04_no_update_gid/data/passwd | 20 -------- tests/newusers/04_no_update_gid/newusers.test | 6 +-- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../newusers.test | 4 +- tests/newusers/11_update_gecos/data/group | 42 ----------------- tests/newusers/11_update_gecos/data/gshadow | 41 ----------------- tests/newusers/11_update_gecos/newusers.test | 4 +- tests/newusers/12_update_shell/data/group | 42 ----------------- tests/newusers/12_update_shell/data/gshadow | 41 ----------------- tests/newusers/12_update_shell/newusers.test | 4 +- tests/newusers/15_update_new-home/data/group | 42 ----------------- .../newusers/15_update_new-home/data/gshadow | 41 ----------------- .../newusers/15_update_new-home/newusers.test | 4 +- .../16_update_existing-home/data/group | 42 ----------------- .../16_update_existing-home/data/gshadow | 41 ----------------- .../16_update_existing-home/newusers.test | 4 +- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../newusers.test | 4 +- .../19_update_keep-old-home/data/group | 42 ----------------- .../19_update_keep-old-home/data/gshadow | 41 ----------------- .../19_update_keep-old-home/newusers.test | 4 +- .../data/group | 41 ----------------- .../data/gshadow | 41 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../newusers.test | 8 ++-- .../data/group | 41 ----------------- .../data/gshadow | 41 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../newusers.test | 8 ++-- .../data/group | 41 ----------------- .../data/gshadow | 41 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../newusers.test | 8 ++-- .../data/group | 41 ----------------- .../data/gshadow | 41 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../newusers.test | 8 ++-- .../data/group | 41 ----------------- .../data/gshadow | 41 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../newusers.test | 8 ++-- .../data/group | 41 ----------------- .../data/gshadow | 41 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../newusers.test | 8 ++-- .../data/group | 41 ----------------- .../data/gshadow | 41 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../newusers.test | 8 ++-- .../data/group | 41 ----------------- .../data/gshadow | 41 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../newusers.test | 8 ++-- .../data/group | 41 ----------------- .../data/gshadow | 42 ----------------- .../data/passwd | 19 -------- .../data/shadow | 19 -------- .../newusers.test | 8 ++-- .../data/group | 42 ----------------- .../data/gshadow | 41 ----------------- .../data/shadow | 19 -------- .../newusers.test | 6 +-- .../34_update_password_no_shadow/data/group | 42 ----------------- .../34_update_password_no_shadow/data/gshadow | 41 ----------------- .../34_update_password_no_shadow/data/shadow | 19 -------- .../newusers.test | 2 +- .../data/group | 42 ----------------- .../data/gshadow | 41 ----------------- .../data/shadow | 19 -------- .../data/group | 42 ----------------- .../data/gshadow | 41 ----------------- .../data/shadow | 19 -------- .../40_update_password_encrypted/data/group | 42 ----------------- .../40_update_password_encrypted/data/gshadow | 41 ----------------- .../40_update_password_encrypted/data/passwd | 20 -------- .../data/group | 46 ------------------- .../data/gshadow | 45 ------------------ .../data/passwd | 22 --------- .../data/shadow | 22 --------- .../useradd.test | 8 ++-- .../data/group | 46 ------------------- .../data/gshadow | 45 ------------------ .../data/passwd | 22 --------- .../data/shadow | 22 --------- .../useradd.test | 8 ++-- .../data/group | 46 ------------------- .../data/gshadow | 45 ------------------ .../data/passwd | 22 --------- .../data/shadow | 22 --------- .../useradd.test | 8 ++-- .../data/passwd | 22 --------- .../data/shadow | 22 --------- .../groupdel.test | 4 +- .../data/group | 46 ------------------- .../data/gshadow | 45 ------------------ .../data/passwd | 22 --------- .../data/shadow | 22 --------- .../data/useradd.err | 2 - .../groupdel.test | 8 ++-- .../11_usermod_move_homedir/data/group | 42 ----------------- .../11_usermod_move_homedir/data/gshadow | 42 ----------------- .../11_usermod_move_homedir/data/shadow | 20 -------- .../11_usermod_move_homedir/usermod.test | 6 +-- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/shadow | 20 -------- .../usermod.test | 6 +-- .../13_usermod_move_homedir_file/data/group | 42 ----------------- .../13_usermod_move_homedir_file/data/gshadow | 42 ----------------- .../13_usermod_move_homedir_file/data/shadow | 20 -------- .../13_usermod_move_homedir_file/usermod.test | 6 +-- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/shadow | 20 -------- .../usermod.test | 6 +-- .../data/home_ls-a | 3 -- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../usermod.test | 4 +- .../data/home_ls-a | 3 -- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../usermod.test | 4 +- .../data/home_ls-a | 3 -- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../usermod.test | 4 +- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/home_ls-a | 3 -- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../usermod.test | 8 ++-- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/home_ls-a | 3 -- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../usermod.test | 8 ++-- .../data/home_ls-a | 3 -- .../data/home_ls-a | 3 -- .../data/home_ls-a | 3 -- .../data/passwd | 20 -------- .../data/shadow | 20 -------- .../usermod.test | 4 +- .../data/home_ls-a | 3 -- .../usertools/32_usermod-u_new_UID/data/group | 42 ----------------- .../32_usermod-u_new_UID/data/gshadow | 42 ----------------- .../32_usermod-u_new_UID/data/home_ls-a | 3 -- .../32_usermod-u_new_UID/data/shadow | 20 -------- .../32_usermod-u_new_UID/usermod.test | 6 +-- .../33_usermod-u_existing_UID/data/group | 43 ----------------- .../33_usermod-u_existing_UID/data/gshadow | 43 ----------------- .../33_usermod-u_existing_UID/data/home_ls-a | 3 -- .../33_usermod-u_existing_UID/data/passwd | 21 --------- .../33_usermod-u_existing_UID/data/shadow | 21 --------- .../33_usermod-u_existing_UID/usermod.test | 8 ++-- .../34_usermod-u-o_existing_UID/data/group | 43 ----------------- .../34_usermod-u-o_existing_UID/data/gshadow | 43 ----------------- .../data/home_ls-a | 3 -- .../34_usermod-u-o_existing_UID/data/shadow | 21 --------- .../34_usermod-u-o_existing_UID/usermod.test | 6 +-- .../35_usermod-u_invalid_UID/data/group | 43 ----------------- .../35_usermod-u_invalid_UID/data/gshadow | 43 ----------------- .../35_usermod-u_invalid_UID/data/home_ls-a | 3 -- .../35_usermod-u_invalid_UID/data/passwd | 21 --------- .../35_usermod-u_invalid_UID/data/shadow | 21 --------- .../35_usermod-u_invalid_UID/usermod.test | 8 ++-- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/shadow | 20 -------- .../usermod.test | 6 +-- .../37_Debian_Bug_470745/data/home_ls-a | 3 -- .../38_usermod_invalid_user/data/group | 43 ----------------- .../38_usermod_invalid_user/data/gshadow | 43 ----------------- .../38_usermod_invalid_user/data/home_ls-a | 3 -- .../38_usermod_invalid_user/data/passwd | 21 --------- .../38_usermod_invalid_user/data/shadow | 21 --------- .../38_usermod_invalid_user/usermod.test | 8 ++-- .../39_usermod_-c_invalid_comment/data/group | 43 ----------------- .../data/gshadow | 43 ----------------- .../data/home_ls-a | 3 -- .../39_usermod_-c_invalid_comment/data/passwd | 21 --------- .../39_usermod_-c_invalid_comment/data/shadow | 21 --------- .../usermod.test | 8 ++-- .../40_usermod_-d_invalid_homedir/data/group | 43 ----------------- .../data/gshadow | 43 ----------------- .../data/home_ls-a | 3 -- .../40_usermod_-d_invalid_homedir/data/passwd | 21 --------- .../40_usermod_-d_invalid_homedir/data/shadow | 21 --------- .../usermod.test | 8 ++-- .../41_usermod_-d_invalid_shell/data/group | 43 ----------------- .../41_usermod_-d_invalid_shell/data/gshadow | 43 ----------------- .../data/home_ls-a | 3 -- .../41_usermod_-d_invalid_shell/data/passwd | 21 --------- .../41_usermod_-d_invalid_shell/data/shadow | 21 --------- .../41_usermod_-d_invalid_shell/usermod.test | 8 ++-- .../data/group | 43 ----------------- .../data/gshadow | 43 ----------------- .../data/home_ls-a | 3 -- .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../usermod.test | 8 ++-- .../43_usermod_-g_invalid_group_ID/data/group | 43 ----------------- .../data/gshadow | 43 ----------------- .../data/home_ls-a | 3 -- .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../usermod.test | 8 ++-- .../44_usermod-l_existing_username/data/group | 43 ----------------- .../data/gshadow | 43 ----------------- .../data/home_ls-a | 3 -- .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../usermod.test | 8 ++-- .../data/group | 43 ----------------- .../data/gshadow | 43 ----------------- .../data/home_ls-a | 3 -- .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../usermod.test | 8 ++-- .../data/group | 43 ----------------- .../data/gshadow | 43 ----------------- .../data/home_ls-a | 3 -- .../data/passwd | 21 --------- .../data/shadow | 21 --------- .../usermod.test | 8 ++-- .../data/home_ls-a | 3 -- .../data/gshadow | 42 ----------------- .../userdel.test | 2 +- .../data/gshadow | 43 ----------------- .../userdel.test | 2 +- .../data/shadow | 21 --------- .../userdel.test | 2 +- .../data/chpasswd.err | 6 --- .../data/passwd | 19 -------- .../data/passwd | 20 -------- .../data/passwd | 20 -------- .../data/gshadow | 42 ----------------- .../usermod.test | 2 +- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/shadow | 20 -------- .../data/group | 42 ----------------- .../data/gshadow | 42 ----------------- .../data/shadow | 20 -------- .../data/gshadow | 42 ----------------- .../usermod.test | 2 +- 1246 files changed, 866 insertions(+), 26970 deletions(-) delete mode 100644 tests/cktools/02_pwck_sort/data/group delete mode 100644 tests/cktools/03_grpck_sort/data/passwd delete mode 100644 tests/cktools/03_grpck_sort/data/shadow delete mode 100644 tests/cktools/04_pwck_sort_missing_shadow_user/data/group delete mode 100644 tests/cktools/04_pwck_sort_missing_shadow_user/data/gshadow delete mode 100644 tests/cktools/05_grpck_sort_missing_shadow_group/data/passwd delete mode 100644 tests/cktools/05_grpck_sort_missing_shadow_group/data/shadow delete mode 100644 tests/cktools/06_pwck_sort_NIS_server/data/group delete mode 100644 tests/cktools/06_pwck_sort_NIS_server/data/gshadow delete mode 100644 tests/cktools/07_pwck_sort_NIS_client/data/group delete mode 100644 tests/cktools/07_pwck_sort_NIS_client/data/gshadow delete mode 100644 tests/cktools/grpck/04_grpck_missing_field_group_delete/data/passwd delete mode 100644 tests/cktools/grpck/04_grpck_missing_field_group_delete/data/shadow delete mode 100644 tests/cktools/grpck/05_grpck_missing_field_group_keep/data/group delete mode 100644 tests/cktools/grpck/05_grpck_missing_field_group_keep/data/passwd delete mode 100644 tests/cktools/grpck/05_grpck_missing_field_group_keep/data/shadow delete mode 100644 tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/group delete mode 100644 tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/gshadow delete mode 100644 tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/passwd delete mode 100644 tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/shadow delete mode 100644 tests/cktools/grpck/07_grpck_missing_field_gshadow_add/data/passwd delete mode 100644 tests/cktools/grpck/07_grpck_missing_field_gshadow_add/data/shadow delete mode 100644 tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/data/group delete mode 100644 tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/data/passwd delete mode 100644 tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/data/shadow delete mode 100644 tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/group delete mode 100644 tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/gshadow delete mode 100644 tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/passwd delete mode 100644 tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/shadow delete mode 100644 tests/cktools/grpck/11_grpck_missing_field_gshadow_local/data/passwd delete mode 100644 tests/cktools/grpck/12_grpck_unknown_user_group/data/gshadow delete mode 100644 tests/cktools/grpck/12_grpck_unknown_user_group/data/passwd delete mode 100644 tests/cktools/grpck/12_grpck_unknown_user_group/data/shadow delete mode 100644 tests/cktools/grpck/13_grpck_unknown_user_gshadow/data/group delete mode 100644 tests/cktools/grpck/13_grpck_unknown_user_gshadow/data/passwd delete mode 100644 tests/cktools/grpck/13_grpck_unknown_user_gshadow/data/shadow delete mode 100644 tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/data/group delete mode 100644 tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/data/passwd delete mode 100644 tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/data/shadow delete mode 100644 tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/data/gshadow delete mode 100644 tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/data/passwd delete mode 100644 tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/data/shadow delete mode 100644 tests/cktools/grpck/16_grpck_duplicate_entry_group/data/gshadow delete mode 100644 tests/cktools/grpck/16_grpck_duplicate_entry_group/data/passwd delete mode 100644 tests/cktools/grpck/16_grpck_duplicate_entry_group/data/shadow delete mode 100644 tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/data/group delete mode 100644 tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/data/passwd delete mode 100644 tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/data/shadow delete mode 100644 tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/group delete mode 100644 tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/gshadow delete mode 100644 tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/passwd delete mode 100644 tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/shadow delete mode 100644 tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/group delete mode 100644 tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/gshadow delete mode 100644 tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/passwd delete mode 100644 tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/shadow delete mode 100644 tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data/group delete mode 100644 tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data/passwd delete mode 100644 tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data/shadow delete mode 100644 tests/cktools/grpck/21_grpck_invalid_group_name/data/group delete mode 100644 tests/cktools/grpck/21_grpck_invalid_group_name/data/gshadow delete mode 100644 tests/cktools/grpck/21_grpck_invalid_group_name/data/passwd delete mode 100644 tests/cktools/grpck/21_grpck_invalid_group_name/data/shadow delete mode 100644 tests/cktools/grpck/22_grpck_invalid_group_ID_-1/data/passwd delete mode 100644 tests/cktools/grpck/22_grpck_invalid_group_ID_-1/data/shadow delete mode 100644 tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/group delete mode 100644 tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/gshadow delete mode 100644 tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/passwd delete mode 100644 tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/shadow delete mode 100644 tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/data/passwd delete mode 100644 tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/data/shadow delete mode 100644 tests/cktools/grpck/26_grpck_no_gshadow_file/data/group delete mode 100644 tests/cktools/grpck/26_grpck_no_gshadow_file/data/passwd delete mode 100644 tests/cktools/grpck/26_grpck_no_gshadow_file/data/shadow delete mode 100644 tests/cktools/grpck/27_grpck_sort_no_gshadow_file/data/passwd delete mode 100644 tests/cktools/grpck/27_grpck_sort_no_gshadow_file/data/shadow delete mode 100644 tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/data/gshadow delete mode 100644 tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/data/passwd delete mode 100644 tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/data/shadow delete mode 100644 tests/cktools/pwck/05_pwck_missing_field_passwd_keep/data/passwd delete mode 100644 tests/cktools/pwck/07_pwck_missing_field_shadow_add/data/passwd delete mode 100644 tests/cktools/pwck/08_pwck_missing_field_shadow_delete/data/passwd rename tests/cktools/pwck/{13_pwpck_duplicate_entry_passwd => 13_pwck_duplicate_entry_passwd}/config.txt (100%) rename tests/cktools/{grpck/07_grpck_missing_field_gshadow_add/data => pwck/13_pwck_duplicate_entry_passwd/config/etc}/group (100%) rename tests/cktools/{02_pwck_sort/data => pwck/13_pwck_duplicate_entry_passwd/config/etc}/gshadow (100%) rename tests/cktools/pwck/{13_pwpck_duplicate_entry_passwd => 13_pwck_duplicate_entry_passwd}/config/etc/passwd (100%) rename tests/cktools/pwck/{13_pwpck_duplicate_entry_passwd => 13_pwck_duplicate_entry_passwd}/config/etc/shadow (100%) rename tests/cktools/pwck/{13_pwpck_duplicate_entry_passwd => 13_pwck_duplicate_entry_passwd}/data/passwd (100%) rename tests/cktools/pwck/{13_pwpck_duplicate_entry_passwd => 13_pwck_duplicate_entry_passwd}/pwck.exp (100%) rename tests/cktools/pwck/{13_pwpck_duplicate_entry_passwd => 13_pwck_duplicate_entry_passwd}/pwck.test (91%) delete mode 100644 tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/config/etc/group delete mode 100644 tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/config/etc/gshadow delete mode 100644 tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/data/shadow delete mode 100644 tests/cktools/pwck/14_pwck_duplicate_entry_shadow/data/passwd delete mode 100644 tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/data/shadow delete mode 100644 tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/data/passwd delete mode 100644 tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/data/shadow delete mode 100644 tests/convtools/02_grpconv_remove_gshadow_only_entries/data/group delete mode 100644 tests/convtools/02_grpconv_remove_gshadow_only_entries/data/passwd delete mode 100644 tests/convtools/02_grpconv_remove_gshadow_only_entries/data/shadow delete mode 100644 tests/convtools/03_grpconv_copy_passwd/data/passwd delete mode 100644 tests/convtools/03_grpconv_copy_passwd/data/shadow delete mode 100644 tests/convtools/04_grpconv_no_password/data/passwd delete mode 100644 tests/convtools/04_grpconv_no_password/data/shadow delete mode 100644 tests/convtools/05_grpconv_copy_passwd_existing_gshadow/data/passwd delete mode 100644 tests/convtools/05_grpconv_copy_passwd_existing_gshadow/data/shadow delete mode 100644 tests/convtools/06_grpconv_error_group_locked/data/group delete mode 100644 tests/convtools/06_grpconv_error_group_locked/data/gshadow delete mode 100644 tests/convtools/06_grpconv_error_group_locked/data/passwd delete mode 100644 tests/convtools/06_grpconv_error_group_locked/data/shadow delete mode 100644 tests/convtools/07_grpconv_error_gshadow_locked/data/group delete mode 100644 tests/convtools/07_grpconv_error_gshadow_locked/data/gshadow delete mode 100644 tests/convtools/07_grpconv_error_gshadow_locked/data/passwd delete mode 100644 tests/convtools/07_grpconv_error_gshadow_locked/data/shadow delete mode 100644 tests/convtools/08_grpunconv_no_gshadow_file/data/group delete mode 100644 tests/convtools/08_grpunconv_no_gshadow_file/data/passwd delete mode 100644 tests/convtools/08_grpunconv_no_gshadow_file/data/shadow delete mode 100644 tests/convtools/09_grpunconv_error_group_locked/data/group delete mode 100644 tests/convtools/09_grpunconv_error_group_locked/data/gshadow delete mode 100644 tests/convtools/09_grpunconv_error_group_locked/data/passwd delete mode 100644 tests/convtools/09_grpunconv_error_group_locked/data/shadow delete mode 100644 tests/convtools/10_grpunconv_error_gshadow_locked/data/group delete mode 100644 tests/convtools/10_grpunconv_error_gshadow_locked/data/gshadow delete mode 100644 tests/convtools/10_grpunconv_error_gshadow_locked/data/passwd delete mode 100644 tests/convtools/10_grpunconv_error_gshadow_locked/data/shadow delete mode 100644 tests/convtools/11_pwconv_error_passwd_locked/data/group delete mode 100644 tests/convtools/11_pwconv_error_passwd_locked/data/gshadow delete mode 100644 tests/convtools/11_pwconv_error_passwd_locked/data/passwd delete mode 100644 tests/convtools/11_pwconv_error_passwd_locked/data/shadow delete mode 100644 tests/convtools/12_pwconv_error_shadow_locked/data/group delete mode 100644 tests/convtools/12_pwconv_error_shadow_locked/data/gshadow delete mode 100644 tests/convtools/12_pwconv_error_shadow_locked/data/passwd delete mode 100644 tests/convtools/12_pwconv_error_shadow_locked/data/shadow delete mode 100644 tests/convtools/13_pwunconv_error_passwd_locked/data/group delete mode 100644 tests/convtools/13_pwunconv_error_passwd_locked/data/gshadow delete mode 100644 tests/convtools/13_pwunconv_error_passwd_locked/data/passwd delete mode 100644 tests/convtools/13_pwunconv_error_passwd_locked/data/shadow delete mode 100644 tests/convtools/14_pwunconv_error_shadow_locked/data/group delete mode 100644 tests/convtools/14_pwunconv_error_shadow_locked/data/gshadow delete mode 100644 tests/convtools/14_pwunconv_error_shadow_locked/data/passwd delete mode 100644 tests/convtools/14_pwunconv_error_shadow_locked/data/shadow delete mode 100644 tests/convtools/15_pwconv_remove_shadow_only_entries/data/group delete mode 100644 tests/convtools/15_pwconv_remove_shadow_only_entries/data/gshadow delete mode 100644 tests/convtools/15_pwconv_remove_shadow_only_entries/data/passwd delete mode 100644 tests/convtools/16_pwconv_copy_passwd/data/group delete mode 100644 tests/convtools/16_pwconv_copy_passwd/data/gshadow delete mode 100644 tests/convtools/17_pwunconv_no_shadow_file/data/group delete mode 100644 tests/convtools/17_pwunconv_no_shadow_file/data/gshadow delete mode 100644 tests/convtools/17_pwunconv_no_shadow_file/data/passwd delete mode 100644 tests/convtools/18_pwunconv_user_not_in_shadow/data/group delete mode 100644 tests/convtools/18_pwunconv_user_not_in_shadow/data/gshadow delete mode 100644 tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/data/shadow delete mode 100644 tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/gshadow delete mode 100644 tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/passwd delete mode 100644 tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/shadow delete mode 100644 tests/failures/groupadd/02_groupadd_group_rename_failure/data/group delete mode 100644 tests/failures/groupadd/02_groupadd_group_rename_failure/data/gshadow delete mode 100644 tests/failures/groupadd/02_groupadd_group_rename_failure/data/passwd delete mode 100644 tests/failures/groupadd/02_groupadd_group_rename_failure/data/shadow delete mode 100644 tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/group delete mode 100644 tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/gshadow delete mode 100644 tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/passwd delete mode 100644 tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/shadow delete mode 100644 tests/failures/groupadd/04_groupadd_group_open_failure/data/group delete mode 100644 tests/failures/groupadd/04_groupadd_group_open_failure/data/gshadow delete mode 100644 tests/failures/groupadd/04_groupadd_group_open_failure/data/passwd delete mode 100644 tests/failures/groupadd/04_groupadd_group_open_failure/data/shadow delete mode 100644 tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/gshadow delete mode 100644 tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/passwd delete mode 100644 tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/shadow delete mode 100644 tests/failures/groupdel/02_groupdel_group_rename_failure/data/group delete mode 100644 tests/failures/groupdel/02_groupdel_group_rename_failure/data/gshadow delete mode 100644 tests/failures/groupdel/02_groupdel_group_rename_failure/data/passwd delete mode 100644 tests/failures/groupdel/02_groupdel_group_rename_failure/data/shadow delete mode 100644 tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/group delete mode 100644 tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/gshadow delete mode 100644 tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/passwd delete mode 100644 tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/shadow delete mode 100644 tests/failures/groupdel/04_groupdel_group_open_failure/data/group delete mode 100644 tests/failures/groupdel/04_groupdel_group_open_failure/data/gshadow delete mode 100644 tests/failures/groupdel/04_groupdel_group_open_failure/data/passwd delete mode 100644 tests/failures/groupdel/04_groupdel_group_open_failure/data/shadow delete mode 100644 tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/gshadow delete mode 100644 tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/passwd delete mode 100644 tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/shadow delete mode 100644 tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/gshadow delete mode 100644 tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/passwd delete mode 100644 tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/shadow delete mode 100644 tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/group delete mode 100644 tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/gshadow delete mode 100644 tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/passwd delete mode 100644 tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/shadow delete mode 100644 tests/failures/groupmod/04_groupmod_group_open_failure/data/group delete mode 100644 tests/failures/groupmod/04_groupmod_group_open_failure/data/gshadow delete mode 100644 tests/failures/groupmod/04_groupmod_group_open_failure/data/passwd delete mode 100644 tests/failures/groupmod/04_groupmod_group_open_failure/data/shadow delete mode 100644 tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/group delete mode 100644 tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/gshadow delete mode 100644 tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/passwd delete mode 100644 tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/shadow delete mode 100644 tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/groupmod.err delete mode 100644 tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/gshadow delete mode 100644 tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/passwd delete mode 100644 tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/shadow delete mode 100644 tests/failures/groupmod/07_groupmod_passwd_open_failure/data/group delete mode 100644 tests/failures/groupmod/07_groupmod_passwd_open_failure/data/gshadow delete mode 100644 tests/failures/groupmod/07_groupmod_passwd_open_failure/data/passwd delete mode 100644 tests/failures/groupmod/07_groupmod_passwd_open_failure/data/shadow delete mode 100644 tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/group delete mode 100644 tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/groupmod.err delete mode 100644 tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/gshadow delete mode 100644 tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/passwd delete mode 100644 tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/shadow delete mode 100644 tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/groupmod.err delete mode 100644 tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/passwd delete mode 100644 tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/shadow delete mode 100644 tests/failures/grpck/02_grpck_group_open_failure/data/group delete mode 100644 tests/failures/userdel/04_userdel_passwd_rename_failure/data/group delete mode 100644 tests/failures/userdel/04_userdel_passwd_rename_failure/data/passwd delete mode 100644 tests/failures/userdel/04_userdel_passwd_rename_failure/data/shadow delete mode 100644 tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/gshadow delete mode 100644 tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/group delete mode 100644 tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/gshadow delete mode 100644 tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/passwd delete mode 100644 tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/shadow delete mode 100644 tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/data/group delete mode 100644 tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/data/gshadow delete mode 100644 tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/group delete mode 100644 tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/gshadow delete mode 100644 tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/usermod.err delete mode 100644 tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/group delete mode 100644 tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/gshadow delete mode 100644 tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/shadow delete mode 100644 tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/group delete mode 100644 tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/gshadow delete mode 100644 tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/passwd delete mode 100644 tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/shadow delete mode 100644 tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/passwd delete mode 100644 tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/shadow delete mode 100644 tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/passwd delete mode 100644 tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/shadow delete mode 100644 tests/grouptools/gpasswd/03_gpasswd_change_member_list/data/passwd delete mode 100644 tests/grouptools/gpasswd/03_gpasswd_change_member_list/data/shadow delete mode 100644 tests/grouptools/gpasswd/04_gpasswd_change_member_list/data/passwd delete mode 100644 tests/grouptools/gpasswd/04_gpasswd_change_member_list/data/shadow delete mode 100644 tests/grouptools/gpasswd/05_gpasswd_change_member_list/data/passwd delete mode 100644 tests/grouptools/gpasswd/05_gpasswd_change_member_list/data/shadow delete mode 100644 tests/grouptools/gpasswd/06_gpasswd_change_member_list/data/passwd delete mode 100644 tests/grouptools/gpasswd/06_gpasswd_change_member_list/data/shadow delete mode 100644 tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/data/passwd delete mode 100644 tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/data/shadow delete mode 100644 tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/data/passwd delete mode 100644 tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/data/shadow delete mode 100644 tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/data/passwd delete mode 100644 tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/data/shadow delete mode 100644 tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/data/passwd delete mode 100644 tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/data/shadow delete mode 100644 tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/data/passwd delete mode 100644 tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/data/shadow delete mode 100644 tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/data/passwd delete mode 100644 tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/data/shadow delete mode 100644 tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/gshadow delete mode 100644 tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/passwd delete mode 100644 tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/shadow delete mode 100644 tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data/gshadow delete mode 100644 tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data/passwd delete mode 100644 tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data/shadow delete mode 100644 tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data/gshadow delete mode 100644 tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data/passwd delete mode 100644 tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data/shadow delete mode 100644 tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data/gshadow delete mode 100644 tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data/passwd delete mode 100644 tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data/shadow delete mode 100644 tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data/gshadow delete mode 100644 tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data/passwd delete mode 100644 tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data/shadow delete mode 100644 tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data/gshadow delete mode 100644 tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data/passwd delete mode 100644 tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data/shadow delete mode 100644 tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/data/group delete mode 100644 tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/data/passwd delete mode 100644 tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/data/shadow delete mode 100644 tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data/group delete mode 100644 tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data/passwd delete mode 100644 tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data/shadow delete mode 100644 tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/data/passwd delete mode 100644 tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/data/shadow delete mode 100644 tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data/group delete mode 100644 tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data/passwd delete mode 100644 tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data/shadow delete mode 100644 tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/group delete mode 100644 tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/gshadow delete mode 100644 tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/passwd delete mode 100644 tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/shadow delete mode 100644 tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/data/group delete mode 100644 tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/data/passwd delete mode 100644 tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/data/shadow delete mode 100644 tests/grouptools/gpasswd/25_gpasswd_remove_password/data/passwd delete mode 100644 tests/grouptools/gpasswd/25_gpasswd_remove_password/data/shadow delete mode 100644 tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/data/passwd delete mode 100644 tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/data/shadow delete mode 100644 tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/data/passwd delete mode 100644 tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/data/shadow delete mode 100644 tests/grouptools/gpasswd/28_gpasswd_lock_password/data/passwd delete mode 100644 tests/grouptools/gpasswd/28_gpasswd_lock_password/data/shadow delete mode 100644 tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/data/passwd delete mode 100644 tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/data/shadow delete mode 100644 tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/data/passwd delete mode 100644 tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/data/shadow delete mode 100644 tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/data/passwd delete mode 100644 tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/data/shadow delete mode 100644 tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/data/passwd delete mode 100644 tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/data/shadow delete mode 100644 tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data/gshadow delete mode 100644 tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data/passwd delete mode 100644 tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data/shadow delete mode 100644 tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/passwd delete mode 100644 tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/shadow delete mode 100644 tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/data/passwd delete mode 100644 tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/data/shadow delete mode 100644 tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/data/passwd delete mode 100644 tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/data/shadow delete mode 100644 tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/data/passwd delete mode 100644 tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/data/shadow delete mode 100644 tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/data/passwd delete mode 100644 tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/data/shadow delete mode 100644 tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/data/passwd delete mode 100644 tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/data/shadow delete mode 100644 tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/data/passwd delete mode 100644 tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/data/shadow delete mode 100644 tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/data/passwd delete mode 100644 tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/data/shadow delete mode 100644 tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/data/passwd delete mode 100644 tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/data/shadow delete mode 100644 tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/group delete mode 100644 tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/gshadow delete mode 100644 tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/passwd delete mode 100644 tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/shadow delete mode 100644 tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/group delete mode 100644 tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/gshadow delete mode 100644 tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/passwd delete mode 100644 tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/shadow delete mode 100644 tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/group delete mode 100644 tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/gshadow delete mode 100644 tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/passwd delete mode 100644 tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/shadow delete mode 100644 tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/group delete mode 100644 tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/gshadow delete mode 100644 tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/passwd delete mode 100644 tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/shadow delete mode 100644 tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/group delete mode 100644 tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/gshadow delete mode 100644 tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/passwd delete mode 100644 tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/shadow delete mode 100644 tests/grouptools/gpasswd/48_gpasswd_change_admin_list/data/group delete mode 100644 tests/grouptools/gpasswd/48_gpasswd_change_admin_list/data/passwd delete mode 100644 tests/grouptools/gpasswd/48_gpasswd_change_admin_list/data/shadow delete mode 100644 tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/group delete mode 100644 tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/passwd delete mode 100644 tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/shadow delete mode 100644 tests/grouptools/gpasswd/50_gpasswd_change_admin_list/data/group delete mode 100644 tests/grouptools/gpasswd/50_gpasswd_change_admin_list/data/passwd delete mode 100644 tests/grouptools/gpasswd/50_gpasswd_change_admin_list/data/shadow delete mode 100644 tests/grouptools/gpasswd/51_gpasswd_change_admin_list/data/group delete mode 100644 tests/grouptools/gpasswd/51_gpasswd_change_admin_list/data/passwd delete mode 100644 tests/grouptools/gpasswd/51_gpasswd_change_admin_list/data/shadow delete mode 100644 tests/grouptools/gpasswd/52_gpasswd_change_admin_list/data/group delete mode 100644 tests/grouptools/gpasswd/52_gpasswd_change_admin_list/data/passwd delete mode 100644 tests/grouptools/gpasswd/52_gpasswd_change_admin_list/data/shadow delete mode 100644 tests/grouptools/gpasswd/53_gpasswd_change_admin_list/data/group delete mode 100644 tests/grouptools/gpasswd/53_gpasswd_change_admin_list/data/passwd delete mode 100644 tests/grouptools/gpasswd/53_gpasswd_change_admin_list/data/shadow delete mode 100644 tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data/group delete mode 100644 tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data/passwd delete mode 100644 tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data/shadow delete mode 100644 tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/group delete mode 100644 tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/gshadow delete mode 100644 tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/passwd delete mode 100644 tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/shadow delete mode 100644 tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/group delete mode 100644 tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/gshadow delete mode 100644 tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/passwd delete mode 100644 tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/shadow delete mode 100644 tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/group delete mode 100644 tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/gshadow delete mode 100644 tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/passwd delete mode 100644 tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/shadow delete mode 100644 tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data/gshadow delete mode 100644 tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data/passwd delete mode 100644 tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data/shadow delete mode 100644 tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data/group delete mode 100644 tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data/passwd delete mode 100644 tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data/shadow delete mode 100644 tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/passwd delete mode 100644 tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/shadow delete mode 100644 tests/grouptools/groupadd/01_groupadd_add_group/data/passwd delete mode 100644 tests/grouptools/groupadd/01_groupadd_add_group/data/shadow delete mode 100644 tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/data/passwd delete mode 100644 tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/data/shadow delete mode 100644 tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/data/passwd delete mode 100644 tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/data/shadow delete mode 100644 tests/grouptools/groupadd/04_groupadd_set_password/data/passwd delete mode 100644 tests/grouptools/groupadd/04_groupadd_set_password/data/shadow delete mode 100644 tests/grouptools/groupadd/05_groupadd_set_GID/data/passwd delete mode 100644 tests/grouptools/groupadd/05_groupadd_set_GID/data/shadow delete mode 100644 tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/group delete mode 100644 tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/gshadow delete mode 100644 tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/passwd delete mode 100644 tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/shadow delete mode 100644 tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/data/passwd delete mode 100644 tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/data/shadow delete mode 100644 tests/grouptools/groupadd/08_groupadd_locked_group/data/group delete mode 100644 tests/grouptools/groupadd/08_groupadd_locked_group/data/gshadow delete mode 100644 tests/grouptools/groupadd/08_groupadd_locked_group/data/passwd delete mode 100644 tests/grouptools/groupadd/08_groupadd_locked_group/data/shadow delete mode 100644 tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/group delete mode 100644 tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/gshadow delete mode 100644 tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/passwd delete mode 100644 tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/shadow delete mode 100644 tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/data/passwd delete mode 100644 tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/data/shadow delete mode 100644 tests/grouptools/groupadd/11_groupadd_invalid_GID/data/group delete mode 100644 tests/grouptools/groupadd/11_groupadd_invalid_GID/data/gshadow delete mode 100644 tests/grouptools/groupadd/11_groupadd_invalid_GID/data/passwd delete mode 100644 tests/grouptools/groupadd/11_groupadd_invalid_GID/data/shadow delete mode 100644 tests/grouptools/groupadd/12_groupadd_negativ_GID/data/group delete mode 100644 tests/grouptools/groupadd/12_groupadd_negativ_GID/data/gshadow delete mode 100644 tests/grouptools/groupadd/12_groupadd_negativ_GID/data/passwd delete mode 100644 tests/grouptools/groupadd/12_groupadd_negativ_GID/data/shadow delete mode 100644 tests/grouptools/groupadd/13_groupadd_invalid_name/data/group delete mode 100644 tests/grouptools/groupadd/13_groupadd_invalid_name/data/gshadow delete mode 100644 tests/grouptools/groupadd/13_groupadd_invalid_name/data/passwd delete mode 100644 tests/grouptools/groupadd/13_groupadd_invalid_name/data/shadow delete mode 100644 tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/group delete mode 100644 tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/gshadow delete mode 100644 tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/passwd delete mode 100644 tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/shadow delete mode 100644 tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/group delete mode 100644 tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/gshadow delete mode 100644 tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/passwd delete mode 100644 tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/shadow delete mode 100644 tests/grouptools/groupadd/16_groupadd_existing_group/data/group delete mode 100644 tests/grouptools/groupadd/16_groupadd_existing_group/data/gshadow delete mode 100644 tests/grouptools/groupadd/16_groupadd_existing_group/data/passwd delete mode 100644 tests/grouptools/groupadd/16_groupadd_existing_group/data/shadow delete mode 100644 tests/grouptools/groupadd/17_groupadd_add_systemgroup/data/passwd delete mode 100644 tests/grouptools/groupadd/17_groupadd_add_systemgroup/data/shadow delete mode 100644 tests/grouptools/groupadd/18_groupadd_no_more_GID/data/group delete mode 100644 tests/grouptools/groupadd/18_groupadd_no_more_GID/data/gshadow delete mode 100644 tests/grouptools/groupadd/18_groupadd_no_more_GID/data/passwd delete mode 100644 tests/grouptools/groupadd/18_groupadd_no_more_GID/data/shadow delete mode 100644 tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/group delete mode 100644 tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/gshadow delete mode 100644 tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/passwd delete mode 100644 tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/shadow delete mode 100644 tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/group delete mode 100644 tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/gshadow delete mode 100644 tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/passwd delete mode 100644 tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/shadow delete mode 100644 tests/grouptools/groupadd/25_groupadd_no_gshadow/data/passwd delete mode 100644 tests/grouptools/groupadd/25_groupadd_no_gshadow/data/shadow delete mode 100644 tests/grouptools/groupdel/01_groupdel_delete_group/data/passwd delete mode 100644 tests/grouptools/groupdel/01_groupdel_delete_group/data/shadow delete mode 100644 tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data/gshadow delete mode 100644 tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data/passwd delete mode 100644 tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data/shadow delete mode 100644 tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/gshadow delete mode 100644 tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/passwd delete mode 100644 tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/shadow delete mode 100644 tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/group delete mode 100644 tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/gshadow delete mode 100644 tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/passwd delete mode 100644 tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/shadow delete mode 100644 tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/group delete mode 100644 tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/gshadow delete mode 100644 tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/passwd delete mode 100644 tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/shadow delete mode 100644 tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/group delete mode 100644 tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/gshadow delete mode 100644 tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/passwd delete mode 100644 tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/shadow delete mode 100644 tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/group delete mode 100644 tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/gshadow delete mode 100644 tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/passwd delete mode 100644 tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/shadow delete mode 100644 tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/group delete mode 100644 tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/gshadow delete mode 100644 tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/passwd delete mode 100644 tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/shadow delete mode 100644 tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/group delete mode 100644 tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/gshadow delete mode 100644 tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/passwd delete mode 100644 tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/shadow delete mode 100644 tests/grouptools/groupmems/01_groupmems_root_add_user/data/passwd delete mode 100644 tests/grouptools/groupmems/01_groupmems_root_add_user/data/shadow delete mode 100644 tests/grouptools/groupmems/02_groupmems_root_del_user/data/passwd delete mode 100644 tests/grouptools/groupmems/02_groupmems_root_del_user/data/shadow delete mode 100644 tests/grouptools/groupmems/03_groupmems_root_del_user_admin/data/passwd delete mode 100644 tests/grouptools/groupmems/03_groupmems_root_del_user_admin/data/shadow delete mode 100644 tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/data/passwd delete mode 100644 tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/data/shadow delete mode 100644 tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/data/passwd delete mode 100644 tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/data/shadow delete mode 100644 tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/data/passwd delete mode 100644 tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/data/shadow delete mode 100644 tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/data/passwd delete mode 100644 tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/data/shadow delete mode 100644 tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/data/passwd delete mode 100644 tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/data/shadow delete mode 100644 tests/grouptools/groupmems/09_groupmems_root_purge_user/data/passwd delete mode 100644 tests/grouptools/groupmems/09_groupmems_root_purge_user/data/shadow delete mode 100644 tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/data/passwd delete mode 100644 tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/data/shadow delete mode 100644 tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/data/passwd delete mode 100644 tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/data/shadow delete mode 100644 tests/grouptools/groupmems/12_groupmems_user_add_user/data/passwd delete mode 100644 tests/grouptools/groupmems/12_groupmems_user_add_user/data/shadow delete mode 100644 tests/grouptools/groupmems/13_groupmems_user_del_user/data/passwd delete mode 100644 tests/grouptools/groupmems/13_groupmems_user_del_user/data/shadow delete mode 100644 tests/grouptools/groupmems/14_groupmems_user_del_user_admin/data/passwd delete mode 100644 tests/grouptools/groupmems/14_groupmems_user_del_user_admin/data/shadow delete mode 100644 tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/data/passwd delete mode 100644 tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/data/shadow delete mode 100644 tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/data/passwd delete mode 100644 tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/data/shadow delete mode 100644 tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/data/passwd delete mode 100644 tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/data/shadow delete mode 100644 tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/data/passwd delete mode 100644 tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/data/shadow delete mode 100644 tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/data/passwd delete mode 100644 tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/data/shadow delete mode 100644 tests/grouptools/groupmems/20_groupmems_user_purge_user/data/passwd delete mode 100644 tests/grouptools/groupmems/20_groupmems_user_purge_user/data/shadow delete mode 100644 tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/data/passwd delete mode 100644 tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/data/shadow delete mode 100644 tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/data/passwd delete mode 100644 tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/data/shadow delete mode 100644 tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/group delete mode 100644 tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/gshadow delete mode 100644 tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/passwd delete mode 100644 tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/shadow delete mode 100644 tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/group delete mode 100644 tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/gshadow delete mode 100644 tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/passwd delete mode 100644 tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/shadow delete mode 100644 tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/group delete mode 100644 tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/gshadow delete mode 100644 tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/passwd delete mode 100644 tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/shadow delete mode 100644 tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/group delete mode 100644 tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/gshadow delete mode 100644 tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/passwd delete mode 100644 tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/shadow delete mode 100644 tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/group delete mode 100644 tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/gshadow delete mode 100644 tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/passwd delete mode 100644 tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/shadow delete mode 100644 tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data/gshadow delete mode 100644 tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data/passwd delete mode 100644 tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data/shadow delete mode 100644 tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/group delete mode 100644 tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/gshadow delete mode 100644 tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/passwd delete mode 100644 tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/shadow delete mode 100644 tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/data/passwd delete mode 100644 tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/data/shadow delete mode 100644 tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/data/passwd delete mode 100644 tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/data/shadow delete mode 100644 tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/group delete mode 100644 tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/gshadow delete mode 100644 tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/passwd delete mode 100644 tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/shadow delete mode 100644 tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data/gshadow delete mode 100644 tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data/passwd delete mode 100644 tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data/shadow delete mode 100644 tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/data/passwd delete mode 100644 tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/data/shadow delete mode 100644 tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/data/passwd delete mode 100644 tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/data/shadow delete mode 100644 tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data/gshadow delete mode 100644 tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data/passwd delete mode 100644 tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data/shadow delete mode 100644 tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data/group delete mode 100644 tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data/passwd delete mode 100644 tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data/shadow delete mode 100644 tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/data/passwd delete mode 100644 tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/data/shadow delete mode 100644 tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data/gshadow delete mode 100644 tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data/passwd delete mode 100644 tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data/shadow delete mode 100644 tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/group delete mode 100644 tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/gshadow delete mode 100644 tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/passwd delete mode 100644 tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/shadow delete mode 100644 tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/group delete mode 100644 tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/gshadow delete mode 100644 tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/passwd delete mode 100644 tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/shadow delete mode 100644 tests/grouptools/groupmems/42_groupmems_user_list_users/data/group delete mode 100644 tests/grouptools/groupmems/42_groupmems_user_list_users/data/gshadow delete mode 100644 tests/grouptools/groupmems/42_groupmems_user_list_users/data/passwd delete mode 100644 tests/grouptools/groupmems/42_groupmems_user_list_users/data/shadow delete mode 100644 tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/group delete mode 100644 tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/gshadow delete mode 100644 tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/passwd delete mode 100644 tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/shadow delete mode 100644 tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/group delete mode 100644 tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/gshadow delete mode 100644 tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/passwd delete mode 100644 tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/shadow delete mode 100644 tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/group delete mode 100644 tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/gshadow delete mode 100644 tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/passwd delete mode 100644 tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/shadow delete mode 100644 tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/group delete mode 100644 tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/gshadow delete mode 100644 tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/passwd delete mode 100644 tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/shadow delete mode 100644 tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/group delete mode 100644 tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/gshadow delete mode 100644 tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/passwd delete mode 100644 tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/shadow delete mode 100644 tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/group delete mode 100644 tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/gshadow delete mode 100644 tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/passwd delete mode 100644 tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/shadow delete mode 100644 tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/group delete mode 100644 tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/gshadow delete mode 100644 tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/passwd delete mode 100644 tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/shadow delete mode 100644 tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/group delete mode 100644 tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/gshadow delete mode 100644 tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/passwd delete mode 100644 tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/shadow delete mode 100644 tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/group delete mode 100644 tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/gshadow delete mode 100644 tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/passwd delete mode 100644 tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/shadow delete mode 100644 tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/group delete mode 100644 tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/gshadow delete mode 100644 tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/passwd delete mode 100644 tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/shadow delete mode 100644 tests/grouptools/groupmod/01_groupmod_change_gid/data/gshadow delete mode 100644 tests/grouptools/groupmod/01_groupmod_change_gid/data/passwd delete mode 100644 tests/grouptools/groupmod/01_groupmod_change_gid/data/shadow delete mode 100644 tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/data/gshadow delete mode 100644 tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/data/shadow delete mode 100644 tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data/gshadow delete mode 100644 tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data/passwd delete mode 100644 tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data/shadow delete mode 100644 tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/data/passwd delete mode 100644 tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/data/shadow delete mode 100644 tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data/gshadow delete mode 100644 tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data/passwd delete mode 100644 tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data/shadow delete mode 100644 tests/grouptools/groupmod/06_groupmod_change_group_name/data/passwd delete mode 100644 tests/grouptools/groupmod/06_groupmod_change_group_name/data/shadow delete mode 100644 tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data/gshadow delete mode 100644 tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data/passwd delete mode 100644 tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data/shadow delete mode 100644 tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/data/passwd delete mode 100644 tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/data/shadow delete mode 100644 tests/grouptools/groupmod/09_groupmod_set_password/data/group delete mode 100644 tests/grouptools/groupmod/09_groupmod_set_password/data/passwd delete mode 100644 tests/grouptools/groupmod/09_groupmod_set_password/data/shadow delete mode 100644 tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data/group delete mode 100644 tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data/passwd delete mode 100644 tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data/shadow delete mode 100644 tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/data/passwd delete mode 100644 tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/data/shadow delete mode 100644 tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/group delete mode 100644 tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/gshadow delete mode 100644 tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/passwd delete mode 100644 tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/shadow delete mode 100644 tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/group delete mode 100644 tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/gshadow delete mode 100644 tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/passwd delete mode 100644 tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/shadow delete mode 100644 tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/group delete mode 100644 tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/gshadow delete mode 100644 tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/passwd delete mode 100644 tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/shadow delete mode 100644 tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/group delete mode 100644 tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/gshadow delete mode 100644 tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/passwd delete mode 100644 tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/shadow delete mode 100644 tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/group delete mode 100644 tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/gshadow delete mode 100644 tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/passwd delete mode 100644 tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/shadow delete mode 100644 tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/group delete mode 100644 tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/gshadow delete mode 100644 tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/passwd delete mode 100644 tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/shadow delete mode 100644 tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/gshadow delete mode 100644 tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/passwd delete mode 100644 tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/shadow delete mode 100644 tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/group delete mode 100644 tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/gshadow delete mode 100644 tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/passwd delete mode 100644 tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/shadow delete mode 100644 tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/group delete mode 100644 tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/gshadow delete mode 100644 tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/passwd delete mode 100644 tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/shadow delete mode 100644 tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/group delete mode 100644 tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/gshadow delete mode 100644 tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/passwd delete mode 100644 tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/shadow delete mode 100644 tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/data/passwd delete mode 100644 tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/data/shadow delete mode 100644 tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/data/shadow delete mode 100644 tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/group delete mode 100644 tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/gshadow delete mode 100644 tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/passwd delete mode 100644 tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/shadow delete mode 100644 tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/group delete mode 100644 tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/gshadow delete mode 100644 tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/passwd delete mode 100644 tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/shadow delete mode 100644 tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/data/passwd delete mode 100644 tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/data/shadow delete mode 100644 tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/data/passwd delete mode 100644 tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/data/shadow delete mode 100644 tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/group delete mode 100644 tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/gshadow delete mode 100644 tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/passwd delete mode 100644 tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/shadow delete mode 100644 tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/group delete mode 100644 tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/gshadow delete mode 100644 tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/passwd delete mode 100644 tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/shadow delete mode 100644 tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/data/passwd delete mode 100644 tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/data/shadow delete mode 100644 tests/newusers/02_update_password/data/group delete mode 100644 tests/newusers/02_update_password/data/gshadow delete mode 100644 tests/newusers/02_update_password/data/passwd delete mode 100644 tests/newusers/03_no_update_pid/data/group delete mode 100644 tests/newusers/03_no_update_pid/data/gshadow delete mode 100644 tests/newusers/03_no_update_pid/data/passwd delete mode 100644 tests/newusers/04_no_update_gid/data/group delete mode 100644 tests/newusers/04_no_update_gid/data/gshadow delete mode 100644 tests/newusers/04_no_update_gid/data/passwd delete mode 100644 tests/newusers/10_create_user_gid-as-group-bar/data/group delete mode 100644 tests/newusers/10_create_user_gid-as-group-bar/data/gshadow delete mode 100644 tests/newusers/11_update_gecos/data/group delete mode 100644 tests/newusers/11_update_gecos/data/gshadow delete mode 100644 tests/newusers/12_update_shell/data/group delete mode 100644 tests/newusers/12_update_shell/data/gshadow delete mode 100644 tests/newusers/15_update_new-home/data/group delete mode 100644 tests/newusers/15_update_new-home/data/gshadow delete mode 100644 tests/newusers/16_update_existing-home/data/group delete mode 100644 tests/newusers/16_update_existing-home/data/gshadow delete mode 100644 tests/newusers/18_create_user_gid-already-used/data/group delete mode 100644 tests/newusers/18_create_user_gid-already-used/data/gshadow delete mode 100644 tests/newusers/19_update_keep-old-home/data/group delete mode 100644 tests/newusers/19_update_keep-old-home/data/gshadow delete mode 100644 tests/newusers/23_create_user_error_negativ_UID/data/group delete mode 100644 tests/newusers/23_create_user_error_negativ_UID/data/gshadow delete mode 100644 tests/newusers/23_create_user_error_negativ_UID/data/passwd delete mode 100644 tests/newusers/23_create_user_error_negativ_UID/data/shadow delete mode 100644 tests/newusers/24_create_user_error_invalid_UID/data/group delete mode 100644 tests/newusers/24_create_user_error_invalid_UID/data/gshadow delete mode 100644 tests/newusers/24_create_user_error_invalid_UID/data/passwd delete mode 100644 tests/newusers/24_create_user_error_invalid_UID/data/shadow delete mode 100644 tests/newusers/25_create_user_error_no_remaining_UID/data/group delete mode 100644 tests/newusers/25_create_user_error_no_remaining_UID/data/gshadow delete mode 100644 tests/newusers/25_create_user_error_no_remaining_UID/data/passwd delete mode 100644 tests/newusers/25_create_user_error_no_remaining_UID/data/shadow delete mode 100644 tests/newusers/26_create_user_error_no_remaining_GID/data/group delete mode 100644 tests/newusers/26_create_user_error_no_remaining_GID/data/gshadow delete mode 100644 tests/newusers/26_create_user_error_no_remaining_GID/data/passwd delete mode 100644 tests/newusers/26_create_user_error_no_remaining_GID/data/shadow delete mode 100644 tests/newusers/27_create_user_error_invalid_username/data/group delete mode 100644 tests/newusers/27_create_user_error_invalid_username/data/gshadow delete mode 100644 tests/newusers/27_create_user_error_invalid_username/data/passwd delete mode 100644 tests/newusers/27_create_user_error_invalid_username/data/shadow delete mode 100644 tests/newusers/28_create_user_error_invalid_groupname/data/group delete mode 100644 tests/newusers/28_create_user_error_invalid_groupname/data/gshadow delete mode 100644 tests/newusers/28_create_user_error_invalid_groupname/data/passwd delete mode 100644 tests/newusers/28_create_user_error_invalid_groupname/data/shadow delete mode 100644 tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/group delete mode 100644 tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/gshadow delete mode 100644 tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/passwd delete mode 100644 tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/shadow delete mode 100644 tests/newusers/31_create_user_error_invalid_GID/data/group delete mode 100644 tests/newusers/31_create_user_error_invalid_GID/data/gshadow delete mode 100644 tests/newusers/31_create_user_error_invalid_GID/data/passwd delete mode 100644 tests/newusers/31_create_user_error_invalid_GID/data/shadow delete mode 100644 tests/newusers/32_create_user_error_gshadow_group_exists/data/group delete mode 100644 tests/newusers/32_create_user_error_gshadow_group_exists/data/gshadow delete mode 100644 tests/newusers/32_create_user_error_gshadow_group_exists/data/passwd delete mode 100644 tests/newusers/32_create_user_error_gshadow_group_exists/data/shadow delete mode 100644 tests/newusers/33_update_password_no_shadow_password/data/group delete mode 100644 tests/newusers/33_update_password_no_shadow_password/data/gshadow delete mode 100644 tests/newusers/33_update_password_no_shadow_password/data/shadow delete mode 100644 tests/newusers/34_update_password_no_shadow/data/group delete mode 100644 tests/newusers/34_update_password_no_shadow/data/gshadow delete mode 100644 tests/newusers/34_update_password_no_shadow/data/shadow delete mode 100644 tests/newusers/38_update_password_no_shadow_encrypted/data/group delete mode 100644 tests/newusers/38_update_password_no_shadow_encrypted/data/gshadow delete mode 100644 tests/newusers/38_update_password_no_shadow_encrypted/data/shadow delete mode 100644 tests/newusers/39_update_password_no_shadow_password_encrypted/data/group delete mode 100644 tests/newusers/39_update_password_no_shadow_password_encrypted/data/gshadow delete mode 100644 tests/newusers/39_update_password_no_shadow_password_encrypted/data/shadow delete mode 100644 tests/newusers/40_update_password_encrypted/data/group delete mode 100644 tests/newusers/40_update_password_encrypted/data/gshadow delete mode 100644 tests/newusers/40_update_password_encrypted/data/passwd delete mode 100644 tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/group delete mode 100644 tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/gshadow delete mode 100644 tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/passwd delete mode 100644 tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/shadow delete mode 100644 tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/group delete mode 100644 tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/gshadow delete mode 100644 tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/passwd delete mode 100644 tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/shadow delete mode 100644 tests/split_groups/08_useradd_no_split_group_already_split/data/group delete mode 100644 tests/split_groups/08_useradd_no_split_group_already_split/data/gshadow delete mode 100644 tests/split_groups/08_useradd_no_split_group_already_split/data/passwd delete mode 100644 tests/split_groups/08_useradd_no_split_group_already_split/data/shadow delete mode 100644 tests/split_groups/09_groupdel_split_group_already_split/data/passwd delete mode 100644 tests/split_groups/09_groupdel_split_group_already_split/data/shadow delete mode 100644 tests/split_groups/10_groupdel_no_split_group_already_split/data/group delete mode 100644 tests/split_groups/10_groupdel_no_split_group_already_split/data/gshadow delete mode 100644 tests/split_groups/10_groupdel_no_split_group_already_split/data/passwd delete mode 100644 tests/split_groups/10_groupdel_no_split_group_already_split/data/shadow delete mode 100644 tests/split_groups/10_groupdel_no_split_group_already_split/data/useradd.err delete mode 100644 tests/usertools/11_usermod_move_homedir/data/group delete mode 100644 tests/usertools/11_usermod_move_homedir/data/gshadow delete mode 100644 tests/usertools/11_usermod_move_homedir/data/shadow delete mode 100644 tests/usertools/12_usermod_move_homedir_dev_null/data/group delete mode 100644 tests/usertools/12_usermod_move_homedir_dev_null/data/gshadow delete mode 100644 tests/usertools/12_usermod_move_homedir_dev_null/data/shadow delete mode 100644 tests/usertools/13_usermod_move_homedir_file/data/group delete mode 100644 tests/usertools/13_usermod_move_homedir_file/data/gshadow delete mode 100644 tests/usertools/13_usermod_move_homedir_file/data/shadow delete mode 100644 tests/usertools/14_usermod_move_homedir_other_device/data/group delete mode 100644 tests/usertools/14_usermod_move_homedir_other_device/data/gshadow delete mode 100644 tests/usertools/14_usermod_move_homedir_other_device/data/shadow delete mode 100644 tests/usertools/15_usermod_change_supplementary_groups/data/home_ls-a delete mode 100644 tests/usertools/15_usermod_change_supplementary_groups/data/passwd delete mode 100644 tests/usertools/15_usermod_change_supplementary_groups/data/shadow delete mode 100644 tests/usertools/16_usermod_remove_supplementary_groups/data/home_ls-a delete mode 100644 tests/usertools/16_usermod_remove_supplementary_groups/data/passwd delete mode 100644 tests/usertools/16_usermod_remove_supplementary_groups/data/shadow delete mode 100644 tests/usertools/17_usermod_change_supplementary_groups_numerical/data/home_ls-a delete mode 100644 tests/usertools/17_usermod_change_supplementary_groups_numerical/data/passwd delete mode 100644 tests/usertools/17_usermod_change_supplementary_groups_numerical/data/shadow delete mode 100644 tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/group delete mode 100644 tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/gshadow delete mode 100644 tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/home_ls-a delete mode 100644 tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/passwd delete mode 100644 tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/shadow delete mode 100644 tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/group delete mode 100644 tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/gshadow delete mode 100644 tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/home_ls-a delete mode 100644 tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/passwd delete mode 100644 tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/shadow delete mode 100644 tests/usertools/20_usermod_rename_user_in_member_lists/data/home_ls-a delete mode 100644 tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/data/home_ls-a delete mode 100644 tests/usertools/22_usermod-a_existing_supplementary_group/data/home_ls-a delete mode 100644 tests/usertools/22_usermod-a_existing_supplementary_group/data/passwd delete mode 100644 tests/usertools/22_usermod-a_existing_supplementary_group/data/shadow delete mode 100644 tests/usertools/23_usermod-a_existing_supplementary_group+rename/data/home_ls-a delete mode 100644 tests/usertools/32_usermod-u_new_UID/data/group delete mode 100644 tests/usertools/32_usermod-u_new_UID/data/gshadow delete mode 100644 tests/usertools/32_usermod-u_new_UID/data/home_ls-a delete mode 100644 tests/usertools/32_usermod-u_new_UID/data/shadow delete mode 100644 tests/usertools/33_usermod-u_existing_UID/data/group delete mode 100644 tests/usertools/33_usermod-u_existing_UID/data/gshadow delete mode 100644 tests/usertools/33_usermod-u_existing_UID/data/home_ls-a delete mode 100644 tests/usertools/33_usermod-u_existing_UID/data/passwd delete mode 100644 tests/usertools/33_usermod-u_existing_UID/data/shadow delete mode 100644 tests/usertools/34_usermod-u-o_existing_UID/data/group delete mode 100644 tests/usertools/34_usermod-u-o_existing_UID/data/gshadow delete mode 100644 tests/usertools/34_usermod-u-o_existing_UID/data/home_ls-a delete mode 100644 tests/usertools/34_usermod-u-o_existing_UID/data/shadow delete mode 100644 tests/usertools/35_usermod-u_invalid_UID/data/group delete mode 100644 tests/usertools/35_usermod-u_invalid_UID/data/gshadow delete mode 100644 tests/usertools/35_usermod-u_invalid_UID/data/home_ls-a delete mode 100644 tests/usertools/35_usermod-u_invalid_UID/data/passwd delete mode 100644 tests/usertools/35_usermod-u_invalid_UID/data/shadow delete mode 100644 tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/group delete mode 100644 tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/gshadow delete mode 100644 tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/shadow delete mode 100644 tests/usertools/37_Debian_Bug_470745/data/home_ls-a delete mode 100644 tests/usertools/38_usermod_invalid_user/data/group delete mode 100644 tests/usertools/38_usermod_invalid_user/data/gshadow delete mode 100644 tests/usertools/38_usermod_invalid_user/data/home_ls-a delete mode 100644 tests/usertools/38_usermod_invalid_user/data/passwd delete mode 100644 tests/usertools/38_usermod_invalid_user/data/shadow delete mode 100644 tests/usertools/39_usermod_-c_invalid_comment/data/group delete mode 100644 tests/usertools/39_usermod_-c_invalid_comment/data/gshadow delete mode 100644 tests/usertools/39_usermod_-c_invalid_comment/data/home_ls-a delete mode 100644 tests/usertools/39_usermod_-c_invalid_comment/data/passwd delete mode 100644 tests/usertools/39_usermod_-c_invalid_comment/data/shadow delete mode 100644 tests/usertools/40_usermod_-d_invalid_homedir/data/group delete mode 100644 tests/usertools/40_usermod_-d_invalid_homedir/data/gshadow delete mode 100644 tests/usertools/40_usermod_-d_invalid_homedir/data/home_ls-a delete mode 100644 tests/usertools/40_usermod_-d_invalid_homedir/data/passwd delete mode 100644 tests/usertools/40_usermod_-d_invalid_homedir/data/shadow delete mode 100644 tests/usertools/41_usermod_-d_invalid_shell/data/group delete mode 100644 tests/usertools/41_usermod_-d_invalid_shell/data/gshadow delete mode 100644 tests/usertools/41_usermod_-d_invalid_shell/data/home_ls-a delete mode 100644 tests/usertools/41_usermod_-d_invalid_shell/data/passwd delete mode 100644 tests/usertools/41_usermod_-d_invalid_shell/data/shadow delete mode 100644 tests/usertools/42_usermod_-g_invalid_group_name/data/group delete mode 100644 tests/usertools/42_usermod_-g_invalid_group_name/data/gshadow delete mode 100644 tests/usertools/42_usermod_-g_invalid_group_name/data/home_ls-a delete mode 100644 tests/usertools/42_usermod_-g_invalid_group_name/data/passwd delete mode 100644 tests/usertools/42_usermod_-g_invalid_group_name/data/shadow delete mode 100644 tests/usertools/43_usermod_-g_invalid_group_ID/data/group delete mode 100644 tests/usertools/43_usermod_-g_invalid_group_ID/data/gshadow delete mode 100644 tests/usertools/43_usermod_-g_invalid_group_ID/data/home_ls-a delete mode 100644 tests/usertools/43_usermod_-g_invalid_group_ID/data/passwd delete mode 100644 tests/usertools/43_usermod_-g_invalid_group_ID/data/shadow delete mode 100644 tests/usertools/44_usermod-l_existing_username/data/group delete mode 100644 tests/usertools/44_usermod-l_existing_username/data/gshadow delete mode 100644 tests/usertools/44_usermod-l_existing_username/data/home_ls-a delete mode 100644 tests/usertools/44_usermod-l_existing_username/data/passwd delete mode 100644 tests/usertools/44_usermod-l_existing_username/data/shadow delete mode 100644 tests/usertools/45_usermod-l_existing_username_passwd/data/group delete mode 100644 tests/usertools/45_usermod-l_existing_username_passwd/data/gshadow delete mode 100644 tests/usertools/45_usermod-l_existing_username_passwd/data/home_ls-a delete mode 100644 tests/usertools/45_usermod-l_existing_username_passwd/data/passwd delete mode 100644 tests/usertools/45_usermod-l_existing_username_passwd/data/shadow delete mode 100644 tests/usertools/46_usermod-l_existing_username_shadow/data/group delete mode 100644 tests/usertools/46_usermod-l_existing_username_shadow/data/gshadow delete mode 100644 tests/usertools/46_usermod-l_existing_username_shadow/data/home_ls-a delete mode 100644 tests/usertools/46_usermod-l_existing_username_shadow/data/passwd delete mode 100644 tests/usertools/46_usermod-l_existing_username_shadow/data/shadow delete mode 100644 tests/usertools/47_usermod-l_no_shadow_file/data/home_ls-a delete mode 100644 tests/usertools/48_userdel_keep_group_if_primary_other_user/data/gshadow delete mode 100644 tests/usertools/50_userdel_delete_users_group_no_gshadow_group/data/gshadow delete mode 100644 tests/usertools/52_userdel_delete_user_no_shadow_entry/data/shadow delete mode 100644 tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/data/chpasswd.err delete mode 100644 tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/data/passwd delete mode 100644 tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/data/passwd delete mode 100644 tests/usertools/usermod/06_usermod_lock_already_locked_password3/data/passwd delete mode 100644 tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/data/gshadow delete mode 100644 tests/usertools/usermod/41_usermod-u_faillog_not_created/data/group delete mode 100644 tests/usertools/usermod/41_usermod-u_faillog_not_created/data/gshadow delete mode 100644 tests/usertools/usermod/41_usermod-u_faillog_not_created/data/shadow delete mode 100644 tests/usertools/usermod/42_usermod-u_copy_faillog_entry/data/group delete mode 100644 tests/usertools/usermod/42_usermod-u_copy_faillog_entry/data/gshadow delete mode 100644 tests/usertools/usermod/42_usermod-u_copy_faillog_entry/data/shadow delete mode 100644 tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/data/gshadow diff --git a/tests/cktools/02_pwck_sort/data/group b/tests/cktools/02_pwck_sort/data/group deleted file mode 100644 index 50518255..00000000 --- a/tests/cktools/02_pwck_sort/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/cktools/02_pwck_sort/pwck.test b/tests/cktools/02_pwck_sort/pwck.test index 1366907a..9d6afb1b 100755 --- a/tests/cktools/02_pwck_sort/pwck.test +++ b/tests/cktools/02_pwck_sort/pwck.test @@ -24,13 +24,13 @@ echo -n "Check the passwd file..." ../../common/compare_file.pl data/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/cktools/03_grpck_sort/data/passwd b/tests/cktools/03_grpck_sort/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/cktools/03_grpck_sort/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/cktools/03_grpck_sort/data/shadow b/tests/cktools/03_grpck_sort/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/cktools/03_grpck_sort/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/cktools/03_grpck_sort/grpck.test b/tests/cktools/03_grpck_sort/grpck.test index eb1d0339..75e62cf6 100755 --- a/tests/cktools/03_grpck_sort/grpck.test +++ b/tests/cktools/03_grpck_sort/grpck.test @@ -21,13 +21,13 @@ grpck -s echo "OK" echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../common/compare_file.pl data/shadow /etc/shadow +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/cktools/04_pwck_sort_missing_shadow_user/data/group b/tests/cktools/04_pwck_sort_missing_shadow_user/data/group deleted file mode 100644 index 50518255..00000000 --- a/tests/cktools/04_pwck_sort_missing_shadow_user/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/cktools/04_pwck_sort_missing_shadow_user/data/gshadow b/tests/cktools/04_pwck_sort_missing_shadow_user/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/cktools/04_pwck_sort_missing_shadow_user/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/cktools/04_pwck_sort_missing_shadow_user/pwck.test b/tests/cktools/04_pwck_sort_missing_shadow_user/pwck.test index 1366907a..9d6afb1b 100755 --- a/tests/cktools/04_pwck_sort_missing_shadow_user/pwck.test +++ b/tests/cktools/04_pwck_sort_missing_shadow_user/pwck.test @@ -24,13 +24,13 @@ echo -n "Check the passwd file..." ../../common/compare_file.pl data/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/cktools/05_grpck_sort_missing_shadow_group/data/passwd b/tests/cktools/05_grpck_sort_missing_shadow_group/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/cktools/05_grpck_sort_missing_shadow_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/cktools/05_grpck_sort_missing_shadow_group/data/shadow b/tests/cktools/05_grpck_sort_missing_shadow_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/cktools/05_grpck_sort_missing_shadow_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/cktools/05_grpck_sort_missing_shadow_group/grpck.test b/tests/cktools/05_grpck_sort_missing_shadow_group/grpck.test index eb1d0339..75e62cf6 100755 --- a/tests/cktools/05_grpck_sort_missing_shadow_group/grpck.test +++ b/tests/cktools/05_grpck_sort_missing_shadow_group/grpck.test @@ -21,13 +21,13 @@ grpck -s echo "OK" echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../common/compare_file.pl data/shadow /etc/shadow +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/cktools/06_pwck_sort_NIS_server/data/group b/tests/cktools/06_pwck_sort_NIS_server/data/group deleted file mode 100644 index 18eb6c27..00000000 --- a/tests/cktools/06_pwck_sort_NIS_server/data/group +++ /dev/null @@ -1,43 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: -+::: diff --git a/tests/cktools/06_pwck_sort_NIS_server/data/gshadow b/tests/cktools/06_pwck_sort_NIS_server/data/gshadow deleted file mode 100644 index 7a7ef3a4..00000000 --- a/tests/cktools/06_pwck_sort_NIS_server/data/gshadow +++ /dev/null @@ -1,43 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: -+::: diff --git a/tests/cktools/06_pwck_sort_NIS_server/pwck.test b/tests/cktools/06_pwck_sort_NIS_server/pwck.test index 1366907a..9d6afb1b 100755 --- a/tests/cktools/06_pwck_sort_NIS_server/pwck.test +++ b/tests/cktools/06_pwck_sort_NIS_server/pwck.test @@ -24,13 +24,13 @@ echo -n "Check the passwd file..." ../../common/compare_file.pl data/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/cktools/07_pwck_sort_NIS_client/data/group b/tests/cktools/07_pwck_sort_NIS_client/data/group deleted file mode 100644 index f914b38e..00000000 --- a/tests/cktools/07_pwck_sort_NIS_client/data/group +++ /dev/null @@ -1,45 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: -+::: -+miquels::: -+foo::: diff --git a/tests/cktools/07_pwck_sort_NIS_client/data/gshadow b/tests/cktools/07_pwck_sort_NIS_client/data/gshadow deleted file mode 100644 index 7a7ef3a4..00000000 --- a/tests/cktools/07_pwck_sort_NIS_client/data/gshadow +++ /dev/null @@ -1,43 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: -+::: diff --git a/tests/cktools/07_pwck_sort_NIS_client/pwck.test b/tests/cktools/07_pwck_sort_NIS_client/pwck.test index 1366907a..9d6afb1b 100755 --- a/tests/cktools/07_pwck_sort_NIS_client/pwck.test +++ b/tests/cktools/07_pwck_sort_NIS_client/pwck.test @@ -24,13 +24,13 @@ echo -n "Check the passwd file..." ../../common/compare_file.pl data/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/cktools/grpck/04_grpck_missing_field_group_delete/data/passwd b/tests/cktools/grpck/04_grpck_missing_field_group_delete/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/cktools/grpck/04_grpck_missing_field_group_delete/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/cktools/grpck/04_grpck_missing_field_group_delete/data/shadow b/tests/cktools/grpck/04_grpck_missing_field_group_delete/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/cktools/grpck/04_grpck_missing_field_group_delete/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/cktools/grpck/04_grpck_missing_field_group_delete/grpck.test b/tests/cktools/grpck/04_grpck_missing_field_group_delete/grpck.test index 4c0a83d3..906d6294 100755 --- a/tests/cktools/grpck/04_grpck_missing_field_group_delete/grpck.test +++ b/tests/cktools/grpck/04_grpck_missing_field_group_delete/grpck.test @@ -19,13 +19,13 @@ change_config ./grpck.exp echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/cktools/grpck/05_grpck_missing_field_group_keep/data/group b/tests/cktools/grpck/05_grpck_missing_field_group_keep/data/group deleted file mode 100644 index d1e687c3..00000000 --- a/tests/cktools/grpck/05_grpck_missing_field_group_keep/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x diff --git a/tests/cktools/grpck/05_grpck_missing_field_group_keep/data/passwd b/tests/cktools/grpck/05_grpck_missing_field_group_keep/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/cktools/grpck/05_grpck_missing_field_group_keep/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/cktools/grpck/05_grpck_missing_field_group_keep/data/shadow b/tests/cktools/grpck/05_grpck_missing_field_group_keep/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/cktools/grpck/05_grpck_missing_field_group_keep/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/cktools/grpck/05_grpck_missing_field_group_keep/grpck.test b/tests/cktools/grpck/05_grpck_missing_field_group_keep/grpck.test index 4c0a83d3..dcfa2498 100755 --- a/tests/cktools/grpck/05_grpck_missing_field_group_keep/grpck.test +++ b/tests/cktools/grpck/05_grpck_missing_field_group_keep/grpck.test @@ -19,13 +19,13 @@ change_config ./grpck.exp echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/group b/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/group deleted file mode 100644 index d1e687c3..00000000 --- a/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x diff --git a/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/gshadow b/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/passwd b/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/shadow b/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/grpck.test b/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/grpck.test index 4c0a83d3..81bf12ca 100755 --- a/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/grpck.test +++ b/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/grpck.test @@ -19,16 +19,16 @@ change_config ./grpck.exp echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/data/passwd b/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/data/shadow b/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/grpck.test b/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/grpck.test index 4c0a83d3..dcfa2498 100755 --- a/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/grpck.test +++ b/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/grpck.test @@ -19,13 +19,13 @@ change_config ./grpck.exp echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/data/group b/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/data/passwd b/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/data/shadow b/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/grpck.test b/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/grpck.test index 4c0a83d3..dcfa2498 100755 --- a/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/grpck.test +++ b/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/grpck.test @@ -19,13 +19,13 @@ change_config ./grpck.exp echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/group b/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/gshadow b/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/gshadow deleted file mode 100644 index b8fb2347..00000000 --- a/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*: diff --git a/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/passwd b/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/shadow b/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/grpck.test b/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/grpck.test index 4c0a83d3..81bf12ca 100755 --- a/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/grpck.test +++ b/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/grpck.test @@ -19,16 +19,16 @@ change_config ./grpck.exp echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/data/passwd b/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/cktools/grpck/12_grpck_unknown_user_group/data/gshadow b/tests/cktools/grpck/12_grpck_unknown_user_group/data/gshadow deleted file mode 100644 index 3e97ea42..00000000 --- a/tests/cktools/grpck/12_grpck_unknown_user_group/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*::daemon,bin diff --git a/tests/cktools/grpck/12_grpck_unknown_user_group/data/passwd b/tests/cktools/grpck/12_grpck_unknown_user_group/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/cktools/grpck/12_grpck_unknown_user_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/cktools/grpck/12_grpck_unknown_user_group/data/shadow b/tests/cktools/grpck/12_grpck_unknown_user_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/cktools/grpck/12_grpck_unknown_user_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/cktools/grpck/12_grpck_unknown_user_group/grpck.test b/tests/cktools/grpck/12_grpck_unknown_user_group/grpck.test index 4c0a83d3..741bfe18 100755 --- a/tests/cktools/grpck/12_grpck_unknown_user_group/grpck.test +++ b/tests/cktools/grpck/12_grpck_unknown_user_group/grpck.test @@ -19,16 +19,16 @@ change_config ./grpck.exp echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/cktools/grpck/13_grpck_unknown_user_gshadow/data/group b/tests/cktools/grpck/13_grpck_unknown_user_gshadow/data/group deleted file mode 100644 index cf18eb5b..00000000 --- a/tests/cktools/grpck/13_grpck_unknown_user_gshadow/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000:daemon,bin diff --git a/tests/cktools/grpck/13_grpck_unknown_user_gshadow/data/passwd b/tests/cktools/grpck/13_grpck_unknown_user_gshadow/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/cktools/grpck/13_grpck_unknown_user_gshadow/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/cktools/grpck/13_grpck_unknown_user_gshadow/data/shadow b/tests/cktools/grpck/13_grpck_unknown_user_gshadow/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/cktools/grpck/13_grpck_unknown_user_gshadow/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/cktools/grpck/13_grpck_unknown_user_gshadow/grpck.test b/tests/cktools/grpck/13_grpck_unknown_user_gshadow/grpck.test index 4c0a83d3..dcfa2498 100755 --- a/tests/cktools/grpck/13_grpck_unknown_user_gshadow/grpck.test +++ b/tests/cktools/grpck/13_grpck_unknown_user_gshadow/grpck.test @@ -19,13 +19,13 @@ change_config ./grpck.exp echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/data/group b/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/data/group deleted file mode 100644 index cf18eb5b..00000000 --- a/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000:daemon,bin diff --git a/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/data/passwd b/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/data/shadow b/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/grpck.test b/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/grpck.test index 4c0a83d3..dcfa2498 100755 --- a/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/grpck.test +++ b/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/grpck.test @@ -19,13 +19,13 @@ change_config ./grpck.exp echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/data/gshadow b/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/data/gshadow deleted file mode 100644 index 3e97ea42..00000000 --- a/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*::daemon,bin diff --git a/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/data/passwd b/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/data/shadow b/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/grpck.test b/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/grpck.test index 4c0a83d3..741bfe18 100755 --- a/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/grpck.test +++ b/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/grpck.test @@ -19,16 +19,16 @@ change_config ./grpck.exp echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/cktools/grpck/16_grpck_duplicate_entry_group/data/gshadow b/tests/cktools/grpck/16_grpck_duplicate_entry_group/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/cktools/grpck/16_grpck_duplicate_entry_group/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/cktools/grpck/16_grpck_duplicate_entry_group/data/passwd b/tests/cktools/grpck/16_grpck_duplicate_entry_group/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/cktools/grpck/16_grpck_duplicate_entry_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/cktools/grpck/16_grpck_duplicate_entry_group/data/shadow b/tests/cktools/grpck/16_grpck_duplicate_entry_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/cktools/grpck/16_grpck_duplicate_entry_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/cktools/grpck/16_grpck_duplicate_entry_group/grpck.test b/tests/cktools/grpck/16_grpck_duplicate_entry_group/grpck.test index 4c0a83d3..741bfe18 100755 --- a/tests/cktools/grpck/16_grpck_duplicate_entry_group/grpck.test +++ b/tests/cktools/grpck/16_grpck_duplicate_entry_group/grpck.test @@ -19,16 +19,16 @@ change_config ./grpck.exp echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/data/group b/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/data/group deleted file mode 100644 index fda0a6df..00000000 --- a/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000:daemon diff --git a/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/data/passwd b/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/data/shadow b/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/grpck.test b/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/grpck.test index 4c0a83d3..dcfa2498 100755 --- a/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/grpck.test +++ b/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/grpck.test @@ -19,13 +19,13 @@ change_config ./grpck.exp echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/group b/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/group deleted file mode 100644 index 73518006..00000000 --- a/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/group +++ /dev/null @@ -1,43 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000:daemon -foo:x:1000:bin diff --git a/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/gshadow b/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/passwd b/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/shadow b/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/grpck.test b/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/grpck.test index 4c0a83d3..81bf12ca 100755 --- a/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/grpck.test +++ b/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/grpck.test @@ -19,16 +19,16 @@ change_config ./grpck.exp echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/group b/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/group deleted file mode 100644 index fda0a6df..00000000 --- a/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000:daemon diff --git a/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/gshadow b/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/gshadow deleted file mode 100644 index 124c8051..00000000 --- a/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/gshadow +++ /dev/null @@ -1,43 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -foo:*::daemon -crontab:x:: -Debian-exim:x:: -foo:*::bin diff --git a/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/passwd b/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/shadow b/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/grpck.test b/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/grpck.test index 4c0a83d3..81bf12ca 100755 --- a/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/grpck.test +++ b/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/grpck.test @@ -19,16 +19,16 @@ change_config ./grpck.exp echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data/group b/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data/group deleted file mode 100644 index fda0a6df..00000000 --- a/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000:daemon diff --git a/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data/passwd b/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data/shadow b/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/grpck.test b/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/grpck.test index 4c0a83d3..dcfa2498 100755 --- a/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/grpck.test +++ b/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/grpck.test @@ -19,13 +19,13 @@ change_config ./grpck.exp echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/cktools/grpck/21_grpck_invalid_group_name/data/group b/tests/cktools/grpck/21_grpck_invalid_group_name/data/group deleted file mode 100644 index 220f3757..00000000 --- a/tests/cktools/grpck/21_grpck_invalid_group_name/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -f o o:x:1000: diff --git a/tests/cktools/grpck/21_grpck_invalid_group_name/data/gshadow b/tests/cktools/grpck/21_grpck_invalid_group_name/data/gshadow deleted file mode 100644 index 8337b653..00000000 --- a/tests/cktools/grpck/21_grpck_invalid_group_name/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -f o o:*:: diff --git a/tests/cktools/grpck/21_grpck_invalid_group_name/data/passwd b/tests/cktools/grpck/21_grpck_invalid_group_name/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/cktools/grpck/21_grpck_invalid_group_name/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/cktools/grpck/21_grpck_invalid_group_name/data/shadow b/tests/cktools/grpck/21_grpck_invalid_group_name/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/cktools/grpck/21_grpck_invalid_group_name/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/cktools/grpck/21_grpck_invalid_group_name/grpck.test b/tests/cktools/grpck/21_grpck_invalid_group_name/grpck.test index 4c0a83d3..81bf12ca 100755 --- a/tests/cktools/grpck/21_grpck_invalid_group_name/grpck.test +++ b/tests/cktools/grpck/21_grpck_invalid_group_name/grpck.test @@ -19,16 +19,16 @@ change_config ./grpck.exp echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/data/passwd b/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/data/shadow b/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/grpck.test b/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/grpck.test index 4c0a83d3..906d6294 100755 --- a/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/grpck.test +++ b/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/grpck.test @@ -19,13 +19,13 @@ change_config ./grpck.exp echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/group b/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/group deleted file mode 100644 index c6a2e190..00000000 --- a/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:4294967295: diff --git a/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/gshadow b/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/passwd b/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/shadow b/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/grpck.test b/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/grpck.test index 4c0a83d3..81bf12ca 100755 --- a/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/grpck.test +++ b/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/grpck.test @@ -19,16 +19,16 @@ change_config ./grpck.exp echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/data/passwd b/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/data/shadow b/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/grpck.test b/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/grpck.test index 4c0a83d3..906d6294 100755 --- a/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/grpck.test +++ b/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/grpck.test @@ -19,13 +19,13 @@ change_config ./grpck.exp echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/cktools/grpck/26_grpck_no_gshadow_file/data/group b/tests/cktools/grpck/26_grpck_no_gshadow_file/data/group deleted file mode 100644 index 9303fe27..00000000 --- a/tests/cktools/grpck/26_grpck_no_gshadow_file/data/group +++ /dev/null @@ -1,42 +0,0 @@ -daemon:x:1: -bin:x:2: -kmem:x:15: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -root:x:0: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -shadow:x:42: -gnats:x:41: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000:bar diff --git a/tests/cktools/grpck/26_grpck_no_gshadow_file/data/passwd b/tests/cktools/grpck/26_grpck_no_gshadow_file/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/cktools/grpck/26_grpck_no_gshadow_file/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/cktools/grpck/26_grpck_no_gshadow_file/data/shadow b/tests/cktools/grpck/26_grpck_no_gshadow_file/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/cktools/grpck/26_grpck_no_gshadow_file/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/cktools/grpck/26_grpck_no_gshadow_file/grpck.test b/tests/cktools/grpck/26_grpck_no_gshadow_file/grpck.test index cd3efe24..62ed6e3d 100755 --- a/tests/cktools/grpck/26_grpck_no_gshadow_file/grpck.test +++ b/tests/cktools/grpck/26_grpck_no_gshadow_file/grpck.test @@ -40,13 +40,13 @@ echo "error message OK." rm -f tmp/grpck.out echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." test ! -f /etc/gshadow diff --git a/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/data/passwd b/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/data/shadow b/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/grpck.test b/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/grpck.test index 8d200129..31a6e9ee 100755 --- a/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/grpck.test +++ b/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/grpck.test @@ -25,13 +25,13 @@ grpck -s echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." test ! -f /etc/gshadow diff --git a/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/data/gshadow b/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/data/passwd b/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/data/shadow b/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/grpck.test b/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/grpck.test index 4c0a83d3..741bfe18 100755 --- a/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/grpck.test +++ b/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/grpck.test @@ -19,16 +19,16 @@ change_config ./grpck.exp echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/data/passwd b/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/data/passwd deleted file mode 100644 index 4ee448d9..00000000 --- a/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/data/passwd +++ /dev/null @@ -1,11 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -foo:x:1000:1000:: diff --git a/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/pwck.test b/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/pwck.test index 4fa5d8d3..688759dd 100755 --- a/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/pwck.test +++ b/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/pwck.test @@ -19,7 +19,7 @@ change_config ./pwck.exp echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../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 diff --git a/tests/cktools/pwck/07_pwck_missing_field_shadow_add/data/passwd b/tests/cktools/pwck/07_pwck_missing_field_shadow_add/data/passwd deleted file mode 100644 index 6377a5d3..00000000 --- a/tests/cktools/pwck/07_pwck_missing_field_shadow_add/data/passwd +++ /dev/null @@ -1,11 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -foo:x:1000:1000::/home:/bin/sh diff --git a/tests/cktools/pwck/07_pwck_missing_field_shadow_add/pwck.test b/tests/cktools/pwck/07_pwck_missing_field_shadow_add/pwck.test index 4fa5d8d3..688759dd 100755 --- a/tests/cktools/pwck/07_pwck_missing_field_shadow_add/pwck.test +++ b/tests/cktools/pwck/07_pwck_missing_field_shadow_add/pwck.test @@ -19,7 +19,7 @@ change_config ./pwck.exp echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../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 diff --git a/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/data/passwd b/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/data/passwd deleted file mode 100644 index 6377a5d3..00000000 --- a/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/data/passwd +++ /dev/null @@ -1,11 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -foo:x:1000:1000::/home:/bin/sh diff --git a/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/pwck.test b/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/pwck.test index 4fa5d8d3..688759dd 100755 --- a/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/pwck.test +++ b/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/pwck.test @@ -19,7 +19,7 @@ change_config ./pwck.exp echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../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 diff --git a/tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/config.txt b/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config.txt similarity index 100% rename from tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/config.txt rename to tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config.txt diff --git a/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/data/group b/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config/etc/group similarity index 100% rename from tests/cktools/grpck/07_grpck_missing_field_gshadow_add/data/group rename to tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config/etc/group diff --git a/tests/cktools/02_pwck_sort/data/gshadow b/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config/etc/gshadow similarity index 100% rename from tests/cktools/02_pwck_sort/data/gshadow rename to tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config/etc/gshadow diff --git a/tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/config/etc/passwd b/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config/etc/passwd similarity index 100% rename from tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/config/etc/passwd rename to tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config/etc/passwd diff --git a/tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/config/etc/shadow b/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config/etc/shadow similarity index 100% rename from tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/config/etc/shadow rename to tests/cktools/pwck/13_pwck_duplicate_entry_passwd/config/etc/shadow diff --git a/tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/data/passwd b/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/data/passwd similarity index 100% rename from tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/data/passwd rename to tests/cktools/pwck/13_pwck_duplicate_entry_passwd/data/passwd diff --git a/tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/pwck.exp b/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/pwck.exp similarity index 100% rename from tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/pwck.exp rename to tests/cktools/pwck/13_pwck_duplicate_entry_passwd/pwck.exp diff --git a/tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/pwck.test b/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/pwck.test similarity index 91% rename from tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/pwck.test rename to tests/cktools/pwck/13_pwck_duplicate_entry_passwd/pwck.test index be69cb22..4d4b9576 100755 --- a/tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/pwck.test +++ b/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/pwck.test @@ -25,7 +25,7 @@ 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 +../../../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 diff --git a/tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/config/etc/group b/tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/config/etc/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/config/etc/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/config/etc/gshadow b/tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/config/etc/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/config/etc/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/data/shadow b/tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/data/shadow deleted file mode 100644 index d3c0775b..00000000 --- a/tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/data/shadow +++ /dev/null @@ -1,11 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/data/passwd b/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/data/passwd deleted file mode 100644 index 6377a5d3..00000000 --- a/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/data/passwd +++ /dev/null @@ -1,11 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -foo:x:1000:1000::/home:/bin/sh diff --git a/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/pwck.test b/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/pwck.test index 740e875b..4430d1a2 100755 --- a/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/pwck.test +++ b/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/pwck.test @@ -19,7 +19,7 @@ change_config ./pwck.exp echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../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 diff --git a/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/data/shadow b/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/data/shadow deleted file mode 100644 index d3c0775b..00000000 --- a/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/data/shadow +++ /dev/null @@ -1,11 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/pwck.test b/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/pwck.test index 47887df3..d61a9463 100755 --- a/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/pwck.test +++ b/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/pwck.test @@ -25,7 +25,7 @@ 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 +../../../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 diff --git a/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/data/passwd b/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/data/passwd deleted file mode 100644 index 2b911d1d..00000000 --- a/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/data/passwd +++ /dev/null @@ -1,10 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh diff --git a/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/data/shadow b/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/data/shadow deleted file mode 100644 index 0a2fddb7..00000000 --- a/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/data/shadow +++ /dev/null @@ -1,10 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: diff --git a/tests/convtools/02_grpconv_remove_gshadow_only_entries/data/group b/tests/convtools/02_grpconv_remove_gshadow_only_entries/data/group deleted file mode 100644 index 50518255..00000000 --- a/tests/convtools/02_grpconv_remove_gshadow_only_entries/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/convtools/02_grpconv_remove_gshadow_only_entries/data/passwd b/tests/convtools/02_grpconv_remove_gshadow_only_entries/data/passwd deleted file mode 100644 index bf52df00..00000000 --- a/tests/convtools/02_grpconv_remove_gshadow_only_entries/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000::/home/foo:/bin/false diff --git a/tests/convtools/02_grpconv_remove_gshadow_only_entries/data/shadow b/tests/convtools/02_grpconv_remove_gshadow_only_entries/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/convtools/02_grpconv_remove_gshadow_only_entries/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/convtools/02_grpconv_remove_gshadow_only_entries/grpconv.test b/tests/convtools/02_grpconv_remove_gshadow_only_entries/grpconv.test index 201e8da2..8092d3a2 100755 --- a/tests/convtools/02_grpconv_remove_gshadow_only_entries/grpconv.test +++ b/tests/convtools/02_grpconv_remove_gshadow_only_entries/grpconv.test @@ -21,13 +21,13 @@ grpconv echo "OK" echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/convtools/03_grpconv_copy_passwd/data/passwd b/tests/convtools/03_grpconv_copy_passwd/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/convtools/03_grpconv_copy_passwd/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/convtools/03_grpconv_copy_passwd/data/shadow b/tests/convtools/03_grpconv_copy_passwd/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/convtools/03_grpconv_copy_passwd/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/convtools/03_grpconv_copy_passwd/grpconv.test b/tests/convtools/03_grpconv_copy_passwd/grpconv.test index 1bb4a2f0..2cf49896 100755 --- a/tests/convtools/03_grpconv_copy_passwd/grpconv.test +++ b/tests/convtools/03_grpconv_copy_passwd/grpconv.test @@ -21,13 +21,13 @@ grpconv echo "OK" echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../common/compare_file.pl data/shadow /etc/shadow +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/convtools/04_grpconv_no_password/data/passwd b/tests/convtools/04_grpconv_no_password/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/convtools/04_grpconv_no_password/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/convtools/04_grpconv_no_password/data/shadow b/tests/convtools/04_grpconv_no_password/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/convtools/04_grpconv_no_password/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/convtools/04_grpconv_no_password/grpconv.test b/tests/convtools/04_grpconv_no_password/grpconv.test index b85fa726..da0fb074 100755 --- a/tests/convtools/04_grpconv_no_password/grpconv.test +++ b/tests/convtools/04_grpconv_no_password/grpconv.test @@ -21,13 +21,13 @@ grpconv echo "OK" echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../common/compare_file.pl data/shadow /etc/shadow +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/data/passwd b/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/data/shadow b/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/grpconv.test b/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/grpconv.test index 406e81fe..2d9f9f3d 100755 --- a/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/grpconv.test +++ b/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/grpconv.test @@ -21,13 +21,13 @@ grpconv echo "OK" echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../common/compare_file.pl data/shadow /etc/shadow +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/convtools/06_grpconv_error_group_locked/data/group b/tests/convtools/06_grpconv_error_group_locked/data/group deleted file mode 100644 index 8339bd31..00000000 --- a/tests/convtools/06_grpconv_error_group_locked/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:$1$foogroupPassword:1000: diff --git a/tests/convtools/06_grpconv_error_group_locked/data/gshadow b/tests/convtools/06_grpconv_error_group_locked/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/convtools/06_grpconv_error_group_locked/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/convtools/06_grpconv_error_group_locked/data/passwd b/tests/convtools/06_grpconv_error_group_locked/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/convtools/06_grpconv_error_group_locked/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/convtools/06_grpconv_error_group_locked/data/shadow b/tests/convtools/06_grpconv_error_group_locked/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/convtools/06_grpconv_error_group_locked/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/convtools/06_grpconv_error_group_locked/grpconv.test b/tests/convtools/06_grpconv_error_group_locked/grpconv.test index 878d80d2..0ed4ead2 100755 --- a/tests/convtools/06_grpconv_error_group_locked/grpconv.test +++ b/tests/convtools/06_grpconv_error_group_locked/grpconv.test @@ -45,16 +45,16 @@ echo "error message OK." rm -f tmp/grpconv.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/convtools/07_grpconv_error_gshadow_locked/data/group b/tests/convtools/07_grpconv_error_gshadow_locked/data/group deleted file mode 100644 index 8339bd31..00000000 --- a/tests/convtools/07_grpconv_error_gshadow_locked/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:$1$foogroupPassword:1000: diff --git a/tests/convtools/07_grpconv_error_gshadow_locked/data/gshadow b/tests/convtools/07_grpconv_error_gshadow_locked/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/convtools/07_grpconv_error_gshadow_locked/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/convtools/07_grpconv_error_gshadow_locked/data/passwd b/tests/convtools/07_grpconv_error_gshadow_locked/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/convtools/07_grpconv_error_gshadow_locked/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/convtools/07_grpconv_error_gshadow_locked/data/shadow b/tests/convtools/07_grpconv_error_gshadow_locked/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/convtools/07_grpconv_error_gshadow_locked/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/convtools/07_grpconv_error_gshadow_locked/grpconv.test b/tests/convtools/07_grpconv_error_gshadow_locked/grpconv.test index f8fc2bab..52e03c96 100755 --- a/tests/convtools/07_grpconv_error_gshadow_locked/grpconv.test +++ b/tests/convtools/07_grpconv_error_gshadow_locked/grpconv.test @@ -44,16 +44,16 @@ echo "error message OK." rm -f tmp/grpconv.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/convtools/08_grpunconv_no_gshadow_file/data/group b/tests/convtools/08_grpunconv_no_gshadow_file/data/group deleted file mode 100644 index 50518255..00000000 --- a/tests/convtools/08_grpunconv_no_gshadow_file/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/convtools/08_grpunconv_no_gshadow_file/data/passwd b/tests/convtools/08_grpunconv_no_gshadow_file/data/passwd deleted file mode 100644 index bf52df00..00000000 --- a/tests/convtools/08_grpunconv_no_gshadow_file/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000::/home/foo:/bin/false diff --git a/tests/convtools/08_grpunconv_no_gshadow_file/data/shadow b/tests/convtools/08_grpunconv_no_gshadow_file/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/convtools/08_grpunconv_no_gshadow_file/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/convtools/08_grpunconv_no_gshadow_file/grpunconv.test b/tests/convtools/08_grpunconv_no_gshadow_file/grpunconv.test index 42e798b4..0be3ce8f 100755 --- a/tests/convtools/08_grpunconv_no_gshadow_file/grpunconv.test +++ b/tests/convtools/08_grpunconv_no_gshadow_file/grpunconv.test @@ -25,13 +25,13 @@ grpunconv echo "OK" echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." test ! -f /etc/gshadow diff --git a/tests/convtools/09_grpunconv_error_group_locked/data/group b/tests/convtools/09_grpunconv_error_group_locked/data/group deleted file mode 100644 index 8339bd31..00000000 --- a/tests/convtools/09_grpunconv_error_group_locked/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:$1$foogroupPassword:1000: diff --git a/tests/convtools/09_grpunconv_error_group_locked/data/gshadow b/tests/convtools/09_grpunconv_error_group_locked/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/convtools/09_grpunconv_error_group_locked/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/convtools/09_grpunconv_error_group_locked/data/passwd b/tests/convtools/09_grpunconv_error_group_locked/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/convtools/09_grpunconv_error_group_locked/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/convtools/09_grpunconv_error_group_locked/data/shadow b/tests/convtools/09_grpunconv_error_group_locked/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/convtools/09_grpunconv_error_group_locked/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/convtools/09_grpunconv_error_group_locked/grpunconv.test b/tests/convtools/09_grpunconv_error_group_locked/grpunconv.test index 40001de0..7503fe83 100755 --- a/tests/convtools/09_grpunconv_error_group_locked/grpunconv.test +++ b/tests/convtools/09_grpunconv_error_group_locked/grpunconv.test @@ -44,16 +44,16 @@ echo "error message OK." rm -f tmp/grpunconv.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/convtools/10_grpunconv_error_gshadow_locked/data/group b/tests/convtools/10_grpunconv_error_gshadow_locked/data/group deleted file mode 100644 index 8339bd31..00000000 --- a/tests/convtools/10_grpunconv_error_gshadow_locked/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:$1$foogroupPassword:1000: diff --git a/tests/convtools/10_grpunconv_error_gshadow_locked/data/gshadow b/tests/convtools/10_grpunconv_error_gshadow_locked/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/convtools/10_grpunconv_error_gshadow_locked/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/convtools/10_grpunconv_error_gshadow_locked/data/passwd b/tests/convtools/10_grpunconv_error_gshadow_locked/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/convtools/10_grpunconv_error_gshadow_locked/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/convtools/10_grpunconv_error_gshadow_locked/data/shadow b/tests/convtools/10_grpunconv_error_gshadow_locked/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/convtools/10_grpunconv_error_gshadow_locked/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/convtools/10_grpunconv_error_gshadow_locked/grpunconv.test b/tests/convtools/10_grpunconv_error_gshadow_locked/grpunconv.test index 4d58a869..7b7490c4 100755 --- a/tests/convtools/10_grpunconv_error_gshadow_locked/grpunconv.test +++ b/tests/convtools/10_grpunconv_error_gshadow_locked/grpunconv.test @@ -44,16 +44,16 @@ echo "error message OK." rm -f tmp/grpunconv.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/convtools/11_pwconv_error_passwd_locked/data/group b/tests/convtools/11_pwconv_error_passwd_locked/data/group deleted file mode 100644 index 8339bd31..00000000 --- a/tests/convtools/11_pwconv_error_passwd_locked/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:$1$foogroupPassword:1000: diff --git a/tests/convtools/11_pwconv_error_passwd_locked/data/gshadow b/tests/convtools/11_pwconv_error_passwd_locked/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/convtools/11_pwconv_error_passwd_locked/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/convtools/11_pwconv_error_passwd_locked/data/passwd b/tests/convtools/11_pwconv_error_passwd_locked/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/convtools/11_pwconv_error_passwd_locked/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/convtools/11_pwconv_error_passwd_locked/data/shadow b/tests/convtools/11_pwconv_error_passwd_locked/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/convtools/11_pwconv_error_passwd_locked/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/convtools/11_pwconv_error_passwd_locked/pwconv.test b/tests/convtools/11_pwconv_error_passwd_locked/pwconv.test index db0ca536..4d292cbf 100755 --- a/tests/convtools/11_pwconv_error_passwd_locked/pwconv.test +++ b/tests/convtools/11_pwconv_error_passwd_locked/pwconv.test @@ -44,16 +44,16 @@ echo "error message OK." rm -f tmp/pwconv.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/convtools/12_pwconv_error_shadow_locked/data/group b/tests/convtools/12_pwconv_error_shadow_locked/data/group deleted file mode 100644 index 8339bd31..00000000 --- a/tests/convtools/12_pwconv_error_shadow_locked/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:$1$foogroupPassword:1000: diff --git a/tests/convtools/12_pwconv_error_shadow_locked/data/gshadow b/tests/convtools/12_pwconv_error_shadow_locked/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/convtools/12_pwconv_error_shadow_locked/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/convtools/12_pwconv_error_shadow_locked/data/passwd b/tests/convtools/12_pwconv_error_shadow_locked/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/convtools/12_pwconv_error_shadow_locked/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/convtools/12_pwconv_error_shadow_locked/data/shadow b/tests/convtools/12_pwconv_error_shadow_locked/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/convtools/12_pwconv_error_shadow_locked/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/convtools/12_pwconv_error_shadow_locked/pwconv.test b/tests/convtools/12_pwconv_error_shadow_locked/pwconv.test index 5f3fecf5..03bcf6b8 100755 --- a/tests/convtools/12_pwconv_error_shadow_locked/pwconv.test +++ b/tests/convtools/12_pwconv_error_shadow_locked/pwconv.test @@ -44,16 +44,16 @@ echo "error message OK." rm -f tmp/pwconv.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/convtools/13_pwunconv_error_passwd_locked/data/group b/tests/convtools/13_pwunconv_error_passwd_locked/data/group deleted file mode 100644 index 8339bd31..00000000 --- a/tests/convtools/13_pwunconv_error_passwd_locked/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:$1$foogroupPassword:1000: diff --git a/tests/convtools/13_pwunconv_error_passwd_locked/data/gshadow b/tests/convtools/13_pwunconv_error_passwd_locked/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/convtools/13_pwunconv_error_passwd_locked/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/convtools/13_pwunconv_error_passwd_locked/data/passwd b/tests/convtools/13_pwunconv_error_passwd_locked/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/convtools/13_pwunconv_error_passwd_locked/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/convtools/13_pwunconv_error_passwd_locked/data/shadow b/tests/convtools/13_pwunconv_error_passwd_locked/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/convtools/13_pwunconv_error_passwd_locked/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/convtools/13_pwunconv_error_passwd_locked/pwunconv.test b/tests/convtools/13_pwunconv_error_passwd_locked/pwunconv.test index f66245e8..bfd7ed31 100755 --- a/tests/convtools/13_pwunconv_error_passwd_locked/pwunconv.test +++ b/tests/convtools/13_pwunconv_error_passwd_locked/pwunconv.test @@ -44,16 +44,16 @@ echo "error message OK." rm -f tmp/pwunconv.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/convtools/14_pwunconv_error_shadow_locked/data/group b/tests/convtools/14_pwunconv_error_shadow_locked/data/group deleted file mode 100644 index 8339bd31..00000000 --- a/tests/convtools/14_pwunconv_error_shadow_locked/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:$1$foogroupPassword:1000: diff --git a/tests/convtools/14_pwunconv_error_shadow_locked/data/gshadow b/tests/convtools/14_pwunconv_error_shadow_locked/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/convtools/14_pwunconv_error_shadow_locked/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/convtools/14_pwunconv_error_shadow_locked/data/passwd b/tests/convtools/14_pwunconv_error_shadow_locked/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/convtools/14_pwunconv_error_shadow_locked/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/convtools/14_pwunconv_error_shadow_locked/data/shadow b/tests/convtools/14_pwunconv_error_shadow_locked/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/convtools/14_pwunconv_error_shadow_locked/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/convtools/14_pwunconv_error_shadow_locked/pwunconv.test b/tests/convtools/14_pwunconv_error_shadow_locked/pwunconv.test index be91a500..79e6c4ed 100755 --- a/tests/convtools/14_pwunconv_error_shadow_locked/pwunconv.test +++ b/tests/convtools/14_pwunconv_error_shadow_locked/pwunconv.test @@ -44,16 +44,16 @@ echo "error message OK." rm -f tmp/pwunconv.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/convtools/15_pwconv_remove_shadow_only_entries/data/group b/tests/convtools/15_pwconv_remove_shadow_only_entries/data/group deleted file mode 100644 index 50518255..00000000 --- a/tests/convtools/15_pwconv_remove_shadow_only_entries/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/convtools/15_pwconv_remove_shadow_only_entries/data/gshadow b/tests/convtools/15_pwconv_remove_shadow_only_entries/data/gshadow deleted file mode 100644 index d8aa8adc..00000000 --- a/tests/convtools/15_pwconv_remove_shadow_only_entries/data/gshadow +++ /dev/null @@ -1,43 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: -bar:*:: diff --git a/tests/convtools/15_pwconv_remove_shadow_only_entries/data/passwd b/tests/convtools/15_pwconv_remove_shadow_only_entries/data/passwd deleted file mode 100644 index bf52df00..00000000 --- a/tests/convtools/15_pwconv_remove_shadow_only_entries/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000::/home/foo:/bin/false diff --git a/tests/convtools/15_pwconv_remove_shadow_only_entries/pwconv.test b/tests/convtools/15_pwconv_remove_shadow_only_entries/pwconv.test index 946a2134..11abe4be 100755 --- a/tests/convtools/15_pwconv_remove_shadow_only_entries/pwconv.test +++ b/tests/convtools/15_pwconv_remove_shadow_only_entries/pwconv.test @@ -21,16 +21,16 @@ pwconv echo "OK" echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/convtools/16_pwconv_copy_passwd/data/group b/tests/convtools/16_pwconv_copy_passwd/data/group deleted file mode 100644 index 8339bd31..00000000 --- a/tests/convtools/16_pwconv_copy_passwd/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:$1$foogroupPassword:1000: diff --git a/tests/convtools/16_pwconv_copy_passwd/data/gshadow b/tests/convtools/16_pwconv_copy_passwd/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/convtools/16_pwconv_copy_passwd/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/convtools/16_pwconv_copy_passwd/pwconv.test b/tests/convtools/16_pwconv_copy_passwd/pwconv.test index 946a2134..d25ceb21 100755 --- a/tests/convtools/16_pwconv_copy_passwd/pwconv.test +++ b/tests/convtools/16_pwconv_copy_passwd/pwconv.test @@ -24,13 +24,13 @@ echo -n "Check the passwd file..." ../../common/compare_file.pl data/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/convtools/17_pwunconv_no_shadow_file/data/group b/tests/convtools/17_pwunconv_no_shadow_file/data/group deleted file mode 100644 index 50518255..00000000 --- a/tests/convtools/17_pwunconv_no_shadow_file/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/convtools/17_pwunconv_no_shadow_file/data/gshadow b/tests/convtools/17_pwunconv_no_shadow_file/data/gshadow deleted file mode 100644 index d8aa8adc..00000000 --- a/tests/convtools/17_pwunconv_no_shadow_file/data/gshadow +++ /dev/null @@ -1,43 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: -bar:*:: diff --git a/tests/convtools/17_pwunconv_no_shadow_file/data/passwd b/tests/convtools/17_pwunconv_no_shadow_file/data/passwd deleted file mode 100644 index bf52df00..00000000 --- a/tests/convtools/17_pwunconv_no_shadow_file/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000::/home/foo:/bin/false diff --git a/tests/convtools/17_pwunconv_no_shadow_file/pwunconv.test b/tests/convtools/17_pwunconv_no_shadow_file/pwunconv.test index 154555b9..afcd2d76 100755 --- a/tests/convtools/17_pwunconv_no_shadow_file/pwunconv.test +++ b/tests/convtools/17_pwunconv_no_shadow_file/pwunconv.test @@ -25,16 +25,16 @@ pwunconv echo "OK" echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../common/compare_file.pl config/etc/group /etc/group echo "OK" echo -n "Check the shadow file..." test ! -f /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/convtools/18_pwunconv_user_not_in_shadow/data/group b/tests/convtools/18_pwunconv_user_not_in_shadow/data/group deleted file mode 100644 index 8339bd31..00000000 --- a/tests/convtools/18_pwunconv_user_not_in_shadow/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:$1$foogroupPassword:1000: diff --git a/tests/convtools/18_pwunconv_user_not_in_shadow/data/gshadow b/tests/convtools/18_pwunconv_user_not_in_shadow/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/convtools/18_pwunconv_user_not_in_shadow/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/convtools/18_pwunconv_user_not_in_shadow/pwunconv.test b/tests/convtools/18_pwunconv_user_not_in_shadow/pwunconv.test index 820455b4..44c5e5d7 100755 --- a/tests/convtools/18_pwunconv_user_not_in_shadow/pwunconv.test +++ b/tests/convtools/18_pwunconv_user_not_in_shadow/pwunconv.test @@ -24,13 +24,13 @@ echo -n "Check the passwd file..." ../../common/compare_file.pl data/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../common/compare_file.pl config/etc/group /etc/group echo "OK" echo -n "Check the shadow file..." test ! -f /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/data/shadow b/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/data/shadow deleted file mode 100644 index 08fa354c..00000000 --- a/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:test2:@TODAY@:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/gshadow b/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/passwd b/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/shadow b/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/groupadd.test b/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/groupadd.test index 794fc1c0..91147822 100755 --- a/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/groupadd.test +++ b/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/groupadd.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupadd.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/failures/groupadd/02_groupadd_group_rename_failure/data/group b/tests/failures/groupadd/02_groupadd_group_rename_failure/data/group deleted file mode 100644 index 10123908..00000000 --- a/tests/failures/groupadd/02_groupadd_group_rename_failure/data/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/failures/groupadd/02_groupadd_group_rename_failure/data/gshadow b/tests/failures/groupadd/02_groupadd_group_rename_failure/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/failures/groupadd/02_groupadd_group_rename_failure/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/failures/groupadd/02_groupadd_group_rename_failure/data/passwd b/tests/failures/groupadd/02_groupadd_group_rename_failure/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/failures/groupadd/02_groupadd_group_rename_failure/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/failures/groupadd/02_groupadd_group_rename_failure/data/shadow b/tests/failures/groupadd/02_groupadd_group_rename_failure/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/failures/groupadd/02_groupadd_group_rename_failure/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/failures/groupadd/02_groupadd_group_rename_failure/groupadd.test b/tests/failures/groupadd/02_groupadd_group_rename_failure/groupadd.test index f7389291..6cfac741 100755 --- a/tests/failures/groupadd/02_groupadd_group_rename_failure/groupadd.test +++ b/tests/failures/groupadd/02_groupadd_group_rename_failure/groupadd.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupadd.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/group b/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/group deleted file mode 100644 index 10123908..00000000 --- a/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/gshadow b/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/passwd b/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/shadow b/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/failures/groupadd/03_groupadd_gshadow_open_failure/groupadd.test b/tests/failures/groupadd/03_groupadd_gshadow_open_failure/groupadd.test index 1d7ad300..c00a1e35 100755 --- a/tests/failures/groupadd/03_groupadd_gshadow_open_failure/groupadd.test +++ b/tests/failures/groupadd/03_groupadd_gshadow_open_failure/groupadd.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupadd.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/failures/groupadd/04_groupadd_group_open_failure/data/group b/tests/failures/groupadd/04_groupadd_group_open_failure/data/group deleted file mode 100644 index 10123908..00000000 --- a/tests/failures/groupadd/04_groupadd_group_open_failure/data/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/failures/groupadd/04_groupadd_group_open_failure/data/gshadow b/tests/failures/groupadd/04_groupadd_group_open_failure/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/failures/groupadd/04_groupadd_group_open_failure/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/failures/groupadd/04_groupadd_group_open_failure/data/passwd b/tests/failures/groupadd/04_groupadd_group_open_failure/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/failures/groupadd/04_groupadd_group_open_failure/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/failures/groupadd/04_groupadd_group_open_failure/data/shadow b/tests/failures/groupadd/04_groupadd_group_open_failure/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/failures/groupadd/04_groupadd_group_open_failure/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/failures/groupadd/04_groupadd_group_open_failure/groupadd.test b/tests/failures/groupadd/04_groupadd_group_open_failure/groupadd.test index a9b09a01..a07a86af 100755 --- a/tests/failures/groupadd/04_groupadd_group_open_failure/groupadd.test +++ b/tests/failures/groupadd/04_groupadd_group_open_failure/groupadd.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupadd.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/gshadow b/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/gshadow deleted file mode 100644 index be1575eb..00000000 --- a/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:x:: diff --git a/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/passwd b/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/shadow b/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/groupdel.test b/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/groupdel.test index 5008493b..5e4d8ad3 100755 --- a/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/groupdel.test +++ b/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/groupdel.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupdel.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/failures/groupdel/02_groupdel_group_rename_failure/data/group b/tests/failures/groupdel/02_groupdel_group_rename_failure/data/group deleted file mode 100644 index c8c759e1..00000000 --- a/tests/failures/groupdel/02_groupdel_group_rename_failure/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1002: diff --git a/tests/failures/groupdel/02_groupdel_group_rename_failure/data/gshadow b/tests/failures/groupdel/02_groupdel_group_rename_failure/data/gshadow deleted file mode 100644 index be1575eb..00000000 --- a/tests/failures/groupdel/02_groupdel_group_rename_failure/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:x:: diff --git a/tests/failures/groupdel/02_groupdel_group_rename_failure/data/passwd b/tests/failures/groupdel/02_groupdel_group_rename_failure/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/failures/groupdel/02_groupdel_group_rename_failure/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/failures/groupdel/02_groupdel_group_rename_failure/data/shadow b/tests/failures/groupdel/02_groupdel_group_rename_failure/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/failures/groupdel/02_groupdel_group_rename_failure/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/failures/groupdel/02_groupdel_group_rename_failure/groupdel.test b/tests/failures/groupdel/02_groupdel_group_rename_failure/groupdel.test index 5ceaaeb8..0be68ebd 100755 --- a/tests/failures/groupdel/02_groupdel_group_rename_failure/groupdel.test +++ b/tests/failures/groupdel/02_groupdel_group_rename_failure/groupdel.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupdel.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/group b/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/group deleted file mode 100644 index c8c759e1..00000000 --- a/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1002: diff --git a/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/gshadow b/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/gshadow deleted file mode 100644 index be1575eb..00000000 --- a/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:x:: diff --git a/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/passwd b/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/shadow b/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/failures/groupdel/03_groupdel_gshadow_open_failure/groupdel.test b/tests/failures/groupdel/03_groupdel_gshadow_open_failure/groupdel.test index f97cd4af..664ce9f2 100755 --- a/tests/failures/groupdel/03_groupdel_gshadow_open_failure/groupdel.test +++ b/tests/failures/groupdel/03_groupdel_gshadow_open_failure/groupdel.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupdel.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/failures/groupdel/04_groupdel_group_open_failure/data/group b/tests/failures/groupdel/04_groupdel_group_open_failure/data/group deleted file mode 100644 index c8c759e1..00000000 --- a/tests/failures/groupdel/04_groupdel_group_open_failure/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1002: diff --git a/tests/failures/groupdel/04_groupdel_group_open_failure/data/gshadow b/tests/failures/groupdel/04_groupdel_group_open_failure/data/gshadow deleted file mode 100644 index be1575eb..00000000 --- a/tests/failures/groupdel/04_groupdel_group_open_failure/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:x:: diff --git a/tests/failures/groupdel/04_groupdel_group_open_failure/data/passwd b/tests/failures/groupdel/04_groupdel_group_open_failure/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/failures/groupdel/04_groupdel_group_open_failure/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/failures/groupdel/04_groupdel_group_open_failure/data/shadow b/tests/failures/groupdel/04_groupdel_group_open_failure/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/failures/groupdel/04_groupdel_group_open_failure/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/failures/groupdel/04_groupdel_group_open_failure/groupdel.test b/tests/failures/groupdel/04_groupdel_group_open_failure/groupdel.test index e3f5abdf..8a05da7f 100755 --- a/tests/failures/groupdel/04_groupdel_group_open_failure/groupdel.test +++ b/tests/failures/groupdel/04_groupdel_group_open_failure/groupdel.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupdel.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/gshadow b/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/passwd b/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/shadow b/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/groupmod.test b/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/groupmod.test index 579801e7..4b19ee80 100755 --- a/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/groupmod.test +++ b/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/groupmod.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupmod.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/gshadow b/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/passwd b/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/shadow b/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/groupmod.test b/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/groupmod.test index 7ee402ed..7b38a603 100755 --- a/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/groupmod.test +++ b/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/groupmod.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupmod.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/group b/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/gshadow b/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/passwd b/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/shadow b/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/groupmod.test b/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/groupmod.test index 828dbafe..966ec7cf 100755 --- a/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/groupmod.test +++ b/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/groupmod.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupmod.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/failures/groupmod/04_groupmod_group_open_failure/data/group b/tests/failures/groupmod/04_groupmod_group_open_failure/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/failures/groupmod/04_groupmod_group_open_failure/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/failures/groupmod/04_groupmod_group_open_failure/data/gshadow b/tests/failures/groupmod/04_groupmod_group_open_failure/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/failures/groupmod/04_groupmod_group_open_failure/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/failures/groupmod/04_groupmod_group_open_failure/data/passwd b/tests/failures/groupmod/04_groupmod_group_open_failure/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/failures/groupmod/04_groupmod_group_open_failure/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/failures/groupmod/04_groupmod_group_open_failure/data/shadow b/tests/failures/groupmod/04_groupmod_group_open_failure/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/failures/groupmod/04_groupmod_group_open_failure/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/failures/groupmod/04_groupmod_group_open_failure/groupmod.test b/tests/failures/groupmod/04_groupmod_group_open_failure/groupmod.test index c4a721f8..ec94d5eb 100755 --- a/tests/failures/groupmod/04_groupmod_group_open_failure/groupmod.test +++ b/tests/failures/groupmod/04_groupmod_group_open_failure/groupmod.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupmod.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/group b/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/gshadow b/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/passwd b/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/shadow b/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/failures/groupmod/05_groupmod_gshadow_open_failure/groupmod.test b/tests/failures/groupmod/05_groupmod_gshadow_open_failure/groupmod.test index f78166aa..acf3248d 100755 --- a/tests/failures/groupmod/05_groupmod_gshadow_open_failure/groupmod.test +++ b/tests/failures/groupmod/05_groupmod_gshadow_open_failure/groupmod.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupmod.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/groupmod.err b/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/groupmod.err deleted file mode 100644 index 099c9d53..00000000 --- a/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/groupmod.err +++ /dev/null @@ -1,2 +0,0 @@ -open FAILURE /etc/group 8902 ... -groupmod: cannot open /etc/group diff --git a/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/gshadow b/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/passwd b/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/shadow b/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/groupmod.test b/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/groupmod.test index cce0758e..c4d41de0 100755 --- a/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/groupmod.test +++ b/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/groupmod.test @@ -21,16 +21,16 @@ LD_PRELOAD=../../../common/open_RDWR_failure.so FAILURE_PATH=/etc/gshadow groupm echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/group b/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/gshadow b/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/passwd b/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/passwd deleted file mode 100644 index e396cfde..00000000 --- a/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -baz:x:1000:1000::/nonexistent:/bin/sh diff --git a/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/shadow b/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/shadow deleted file mode 100644 index 8f6ebbd7..00000000 --- a/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -baz:!:12977:0:99999:7::: diff --git a/tests/failures/groupmod/07_groupmod_passwd_open_failure/groupmod.test b/tests/failures/groupmod/07_groupmod_passwd_open_failure/groupmod.test index ef2732ca..2bcc782c 100755 --- a/tests/failures/groupmod/07_groupmod_passwd_open_failure/groupmod.test +++ b/tests/failures/groupmod/07_groupmod_passwd_open_failure/groupmod.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupmod.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/group b/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/groupmod.err b/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/groupmod.err deleted file mode 100644 index a07f2997..00000000 --- a/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/groupmod.err +++ /dev/null @@ -1,2 +0,0 @@ -open FAILURE /etc/passwd 8902 ... -groupmod: cannot open /etc/passwd diff --git a/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/gshadow b/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/passwd b/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/passwd deleted file mode 100644 index e396cfde..00000000 --- a/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -baz:x:1000:1000::/nonexistent:/bin/sh diff --git a/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/shadow b/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/shadow deleted file mode 100644 index 8f6ebbd7..00000000 --- a/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -baz:!:12977:0:99999:7::: diff --git a/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/groupmod.test b/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/groupmod.test index 122e688c..b8019857 100755 --- a/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/groupmod.test +++ b/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/groupmod.test @@ -21,16 +21,16 @@ LD_PRELOAD=../../../common/open_RDWR_failure.so FAILURE_PATH=/etc/passwd groupmo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/groupmod.err b/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/groupmod.err deleted file mode 100644 index a07f2997..00000000 --- a/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/groupmod.err +++ /dev/null @@ -1,2 +0,0 @@ -open FAILURE /etc/passwd 8902 ... -groupmod: cannot open /etc/passwd diff --git a/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/passwd b/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/passwd deleted file mode 100644 index e396cfde..00000000 --- a/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -baz:x:1000:1000::/nonexistent:/bin/sh diff --git a/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/shadow b/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/shadow deleted file mode 100644 index 8f6ebbd7..00000000 --- a/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -baz:!:12977:0:99999:7::: diff --git a/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/groupmod.test b/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/groupmod.test index 05c5199a..7480cf25 100755 --- a/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/groupmod.test +++ b/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/groupmod.test @@ -21,13 +21,13 @@ LD_PRELOAD=../../../common/open_RDWR_failure.so FAILURE_PATH=/etc/passwd groupmo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/failures/grpck/02_grpck_group_open_failure/data/group b/tests/failures/grpck/02_grpck_group_open_failure/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/failures/grpck/02_grpck_group_open_failure/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/failures/userdel/04_userdel_passwd_rename_failure/data/group b/tests/failures/userdel/04_userdel_passwd_rename_failure/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/failures/userdel/04_userdel_passwd_rename_failure/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/failures/userdel/04_userdel_passwd_rename_failure/data/passwd b/tests/failures/userdel/04_userdel_passwd_rename_failure/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/failures/userdel/04_userdel_passwd_rename_failure/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/failures/userdel/04_userdel_passwd_rename_failure/data/shadow b/tests/failures/userdel/04_userdel_passwd_rename_failure/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/failures/userdel/04_userdel_passwd_rename_failure/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/gshadow b/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/gshadow deleted file mode 100644 index ed34100c..00000000 --- a/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*::foo diff --git a/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/usermod.test b/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/usermod.test index 85a56fb5..e7d1c2d8 100755 --- a/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/usermod.test +++ b/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/usermod.test @@ -45,7 +45,7 @@ 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 data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/group b/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/gshadow b/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/passwd b/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/shadow b/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/usermod.test b/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/usermod.test index 7e9a5029..119d76a8 100755 --- a/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/usermod.test +++ b/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/usermod.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/usermod.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/data/group b/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/data/group deleted file mode 100644 index 2a5b8a4a..00000000 --- a/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000:foo diff --git a/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/data/gshadow b/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/data/gshadow deleted file mode 100644 index ed34100c..00000000 --- a/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*::foo diff --git a/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/usermod.test b/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/usermod.test index ff9767d4..c5d69bbd 100755 --- a/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/usermod.test +++ b/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/usermod.test @@ -39,13 +39,13 @@ echo -n "Check the passwd file..." ../../../common/compare_file.pl data/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/group b/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/gshadow b/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/usermod.err b/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/usermod.err deleted file mode 100644 index 449003ad..00000000 --- a/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/usermod.err +++ /dev/null @@ -1,2 +0,0 @@ -rename FAILURE /etc/gshadow+ /etc/gshadow -usermod: failure while writing changes to /etc/gshadow diff --git a/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/usermod.test b/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/usermod.test index 63ca595d..2e64fd3d 100755 --- a/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/usermod.test +++ b/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/usermod.test @@ -24,13 +24,13 @@ echo -n "Check the passwd file..." ../../../common/compare_file.pl data/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/group b/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/group deleted file mode 100644 index 2a5b8a4a..00000000 --- a/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000:foo diff --git a/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/gshadow b/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/gshadow deleted file mode 100644 index ed34100c..00000000 --- a/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*::foo diff --git a/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/shadow b/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/usermod.test b/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/usermod.test index 4db63d29..df94b432 100755 --- a/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/usermod.test +++ b/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/usermod.test @@ -39,13 +39,13 @@ echo -n "Check the passwd file..." ../../../common/compare_file.pl data/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/group b/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/gshadow b/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/passwd b/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/shadow b/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/passwd b/tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/shadow b/tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/01_gpasswd_change_member_list/gpasswd.test b/tests/grouptools/gpasswd/01_gpasswd_change_member_list/gpasswd.test index 6524f65b..3084f76d 100755 --- a/tests/grouptools/gpasswd/01_gpasswd_change_member_list/gpasswd.test +++ b/tests/grouptools/gpasswd/01_gpasswd_change_member_list/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -M "" users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/passwd b/tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/shadow b/tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/02_gpasswd_change_member_list/gpasswd.test b/tests/grouptools/gpasswd/02_gpasswd_change_member_list/gpasswd.test index 593919a8..75a8abe3 100755 --- a/tests/grouptools/gpasswd/02_gpasswd_change_member_list/gpasswd.test +++ b/tests/grouptools/gpasswd/02_gpasswd_change_member_list/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -M "" users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/03_gpasswd_change_member_list/data/passwd b/tests/grouptools/gpasswd/03_gpasswd_change_member_list/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/03_gpasswd_change_member_list/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/03_gpasswd_change_member_list/data/shadow b/tests/grouptools/gpasswd/03_gpasswd_change_member_list/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/03_gpasswd_change_member_list/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/03_gpasswd_change_member_list/gpasswd.test b/tests/grouptools/gpasswd/03_gpasswd_change_member_list/gpasswd.test index 76bbf629..08ee9962 100755 --- a/tests/grouptools/gpasswd/03_gpasswd_change_member_list/gpasswd.test +++ b/tests/grouptools/gpasswd/03_gpasswd_change_member_list/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -M foo users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/04_gpasswd_change_member_list/data/passwd b/tests/grouptools/gpasswd/04_gpasswd_change_member_list/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/04_gpasswd_change_member_list/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/04_gpasswd_change_member_list/data/shadow b/tests/grouptools/gpasswd/04_gpasswd_change_member_list/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/04_gpasswd_change_member_list/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/04_gpasswd_change_member_list/gpasswd.test b/tests/grouptools/gpasswd/04_gpasswd_change_member_list/gpasswd.test index 15087f5e..f9879d93 100755 --- a/tests/grouptools/gpasswd/04_gpasswd_change_member_list/gpasswd.test +++ b/tests/grouptools/gpasswd/04_gpasswd_change_member_list/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -M foo users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/05_gpasswd_change_member_list/data/passwd b/tests/grouptools/gpasswd/05_gpasswd_change_member_list/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/05_gpasswd_change_member_list/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/05_gpasswd_change_member_list/data/shadow b/tests/grouptools/gpasswd/05_gpasswd_change_member_list/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/05_gpasswd_change_member_list/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/05_gpasswd_change_member_list/gpasswd.test b/tests/grouptools/gpasswd/05_gpasswd_change_member_list/gpasswd.test index b46f2f89..965a4d67 100755 --- a/tests/grouptools/gpasswd/05_gpasswd_change_member_list/gpasswd.test +++ b/tests/grouptools/gpasswd/05_gpasswd_change_member_list/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -M foo users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/06_gpasswd_change_member_list/data/passwd b/tests/grouptools/gpasswd/06_gpasswd_change_member_list/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/06_gpasswd_change_member_list/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/06_gpasswd_change_member_list/data/shadow b/tests/grouptools/gpasswd/06_gpasswd_change_member_list/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/06_gpasswd_change_member_list/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/06_gpasswd_change_member_list/gpasswd.test b/tests/grouptools/gpasswd/06_gpasswd_change_member_list/gpasswd.test index 1b9c1814..dfbd793c 100755 --- a/tests/grouptools/gpasswd/06_gpasswd_change_member_list/gpasswd.test +++ b/tests/grouptools/gpasswd/06_gpasswd_change_member_list/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -M root,daemon users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/data/passwd b/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/data/shadow b/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/gpasswd.test b/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/gpasswd.test index 6524f65b..3084f76d 100755 --- a/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/gpasswd.test +++ b/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -M "" users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/data/passwd b/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/data/shadow b/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/gpasswd.test b/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/gpasswd.test index 593919a8..75a8abe3 100755 --- a/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/gpasswd.test +++ b/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -M "" users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/data/passwd b/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/data/shadow b/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/gpasswd.test b/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/gpasswd.test index 76bbf629..08ee9962 100755 --- a/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/gpasswd.test +++ b/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -M foo users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/data/passwd b/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/data/shadow b/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/gpasswd.test b/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/gpasswd.test index 15087f5e..f9879d93 100755 --- a/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/gpasswd.test +++ b/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -M foo users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/data/passwd b/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/data/shadow b/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/gpasswd.test b/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/gpasswd.test index b46f2f89..965a4d67 100755 --- a/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/gpasswd.test +++ b/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -M foo users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/data/passwd b/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/data/shadow b/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/gpasswd.test b/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/gpasswd.test index 1b9c1814..dfbd793c 100755 --- a/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/gpasswd.test +++ b/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -M root,daemon users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/gshadow b/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/passwd b/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/shadow b/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/gpasswd.test index 049c0e1b..b1450c90 100755 --- a/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/gpasswd.test +++ b/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/gpasswd.test @@ -24,13 +24,13 @@ gpasswd -M "" users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." test ! -f /etc/gshadow diff --git a/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data/gshadow b/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data/passwd b/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data/shadow b/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/gpasswd.test index fd9e7a0f..bd95302e 100755 --- a/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/gpasswd.test +++ b/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/gpasswd.test @@ -24,13 +24,13 @@ gpasswd -M "" users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." test ! -f /etc/gshadow diff --git a/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data/gshadow b/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data/gshadow deleted file mode 100644 index ad90310c..00000000 --- a/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*::foo -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data/passwd b/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data/shadow b/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/gpasswd.test index 2f00a2b2..e6e6ab06 100755 --- a/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/gpasswd.test +++ b/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/gpasswd.test @@ -24,13 +24,13 @@ gpasswd -M foo users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." test ! -f /etc/gshadow diff --git a/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data/gshadow b/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data/gshadow deleted file mode 100644 index ad90310c..00000000 --- a/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*::foo -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data/passwd b/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data/shadow b/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/gpasswd.test index 0cdb982c..e5b40b49 100755 --- a/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/gpasswd.test +++ b/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/gpasswd.test @@ -24,13 +24,13 @@ gpasswd -M foo users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." test ! -f /etc/gshadow diff --git a/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data/gshadow b/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data/gshadow deleted file mode 100644 index ad90310c..00000000 --- a/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*::foo -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data/passwd b/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data/shadow b/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/gpasswd.test index f7d6b0af..8b928887 100755 --- a/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/gpasswd.test +++ b/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/gpasswd.test @@ -25,13 +25,13 @@ gpasswd -M foo users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." test ! -f /etc/gshadow diff --git a/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data/gshadow b/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data/gshadow deleted file mode 100644 index 1e2ca454..00000000 --- a/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*::root,daemon -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data/passwd b/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data/shadow b/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/gpasswd.test index 078e6d5b..2b2b2ace 100755 --- a/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/gpasswd.test +++ b/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/gpasswd.test @@ -24,13 +24,13 @@ gpasswd -M root,daemon users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." test ! -f /etc/gshadow diff --git a/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/data/group b/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/data/passwd b/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/data/shadow b/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/gpasswd.test b/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/gpasswd.test index c869e229..5d316e2d 100755 --- a/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/gpasswd.test +++ b/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/gpasswd.test @@ -24,13 +24,13 @@ change_config ./gpasswd.exp root users usersPAS '# ' echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data/group b/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data/group deleted file mode 100644 index 50518255..00000000 --- a/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data/passwd b/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data/shadow b/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/gpasswd.test b/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/gpasswd.test index c869e229..5d316e2d 100755 --- a/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/gpasswd.test +++ b/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/gpasswd.test @@ -24,13 +24,13 @@ change_config ./gpasswd.exp root users usersPAS '# ' echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/data/passwd b/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/data/shadow b/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/gpasswd.test index 98c5a96f..9f90aafd 100755 --- a/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/gpasswd.test +++ b/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/gpasswd.test @@ -27,13 +27,13 @@ rm -f /etc/gshadow ./gpasswd.exp root users usersPAS '# ' echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." test ! -f /etc/gshadow diff --git a/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data/group b/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data/passwd b/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data/passwd deleted file mode 100644 index 86d78551..00000000 --- a/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false -myuser:x:1001:1000:::/bin/bash diff --git a/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data/shadow b/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data/shadow deleted file mode 100644 index f2f5bb2d..00000000 --- a/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: -myuser::12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/gpasswd.test b/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/gpasswd.test index 2ca653c5..9ae0cd83 100755 --- a/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/gpasswd.test +++ b/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/gpasswd.test @@ -24,13 +24,13 @@ change_config ./gpasswd.exp myuser users usersPAS '$ ' echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/group b/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/gshadow b/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/passwd b/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/passwd deleted file mode 100644 index 86d78551..00000000 --- a/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false -myuser:x:1001:1000:::/bin/bash diff --git a/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/shadow b/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/shadow deleted file mode 100644 index f2f5bb2d..00000000 --- a/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: -myuser::12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/gpasswd.test b/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/gpasswd.test index 2ca653c5..d75576e9 100755 --- a/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/gpasswd.test +++ b/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/gpasswd.test @@ -24,16 +24,16 @@ change_config ./gpasswd.exp myuser users usersPAS '$ ' echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/data/group b/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/data/passwd b/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/data/passwd deleted file mode 100644 index 86d78551..00000000 --- a/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false -myuser:x:1001:1000:::/bin/bash diff --git a/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/data/shadow b/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/data/shadow deleted file mode 100644 index f2f5bb2d..00000000 --- a/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: -myuser::12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/gpasswd.test index 75969ab0..c61fa9bc 100755 --- a/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/gpasswd.test +++ b/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/gpasswd.test @@ -27,13 +27,13 @@ rm -f /etc/gshadow ./gpasswd.exp myuser users usersPAS '$ ' echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." test ! -f /etc/gshadow diff --git a/tests/grouptools/gpasswd/25_gpasswd_remove_password/data/passwd b/tests/grouptools/gpasswd/25_gpasswd_remove_password/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/25_gpasswd_remove_password/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/25_gpasswd_remove_password/data/shadow b/tests/grouptools/gpasswd/25_gpasswd_remove_password/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/25_gpasswd_remove_password/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/25_gpasswd_remove_password/gpasswd.test b/tests/grouptools/gpasswd/25_gpasswd_remove_password/gpasswd.test index 67cc1751..f9426901 100755 --- a/tests/grouptools/gpasswd/25_gpasswd_remove_password/gpasswd.test +++ b/tests/grouptools/gpasswd/25_gpasswd_remove_password/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -r users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/data/passwd b/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/data/shadow b/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/gpasswd.test b/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/gpasswd.test index 67cc1751..f9426901 100755 --- a/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/gpasswd.test +++ b/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -r users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/data/passwd b/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/data/shadow b/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/gpasswd.test index 93d3ef1c..7658654f 100755 --- a/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/gpasswd.test +++ b/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/gpasswd.test @@ -24,13 +24,13 @@ gpasswd -r users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." test ! -f /etc/gshadow diff --git a/tests/grouptools/gpasswd/28_gpasswd_lock_password/data/passwd b/tests/grouptools/gpasswd/28_gpasswd_lock_password/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/28_gpasswd_lock_password/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/28_gpasswd_lock_password/data/shadow b/tests/grouptools/gpasswd/28_gpasswd_lock_password/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/28_gpasswd_lock_password/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/28_gpasswd_lock_password/gpasswd.test b/tests/grouptools/gpasswd/28_gpasswd_lock_password/gpasswd.test index e0862728..20e41f7b 100755 --- a/tests/grouptools/gpasswd/28_gpasswd_lock_password/gpasswd.test +++ b/tests/grouptools/gpasswd/28_gpasswd_lock_password/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -R users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/data/passwd b/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/data/shadow b/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/gpasswd.test b/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/gpasswd.test index e0862728..20e41f7b 100755 --- a/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/gpasswd.test +++ b/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -R users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/data/passwd b/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/data/shadow b/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/gpasswd.test index ce9e7ad9..7d9b49ae 100755 --- a/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/gpasswd.test +++ b/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/gpasswd.test @@ -24,13 +24,13 @@ gpasswd -R users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." test ! -f /etc/gshadow diff --git a/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/data/passwd b/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/data/shadow b/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/gpasswd.test b/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/gpasswd.test index 6c2c74a4..81b50c9f 100755 --- a/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/gpasswd.test +++ b/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -a foo bin echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/data/passwd b/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/data/shadow b/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/gpasswd.test b/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/gpasswd.test index 6c2c74a4..81b50c9f 100755 --- a/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/gpasswd.test +++ b/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -a foo bin echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data/gshadow b/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data/gshadow deleted file mode 100644 index f590939e..00000000 --- a/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*::foo -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*::foo -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data/passwd b/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data/shadow b/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/gpasswd.test index b83fc163..b257fe82 100755 --- a/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/gpasswd.test +++ b/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/gpasswd.test @@ -24,13 +24,13 @@ gpasswd -a foo bin echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." test ! -f /etc/gshadow diff --git a/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/passwd b/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/shadow b/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/gpasswd.test b/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/gpasswd.test index fe8df52e..fef6ba04 100755 --- a/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/gpasswd.test +++ b/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -d foo users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/data/passwd b/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/data/shadow b/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/gpasswd.test b/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/gpasswd.test index 7c5e1487..0a34349d 100755 --- a/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/gpasswd.test +++ b/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -d foo users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/data/passwd b/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/data/shadow b/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/gpasswd.test b/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/gpasswd.test index 3d517be9..e2792354 100755 --- a/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/gpasswd.test +++ b/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/gpasswd.test @@ -22,13 +22,13 @@ gpasswd -d foo users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/data/passwd b/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/data/shadow b/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test b/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test index fe8df52e..fef6ba04 100755 --- a/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test +++ b/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -d foo users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/data/passwd b/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/data/shadow b/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test b/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test index fe8df52e..fef6ba04 100755 --- a/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test +++ b/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -d foo users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/data/passwd b/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/data/shadow b/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test b/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test index 7c5e1487..0a34349d 100755 --- a/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test +++ b/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -d foo users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/data/passwd b/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/data/shadow b/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test index c715db5f..20985d56 100755 --- a/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test +++ b/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test @@ -24,13 +24,13 @@ gpasswd -d foo users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." test ! -f /etc/gshadow diff --git a/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/data/passwd b/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/data/shadow b/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test index c715db5f..20985d56 100755 --- a/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test +++ b/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test @@ -24,13 +24,13 @@ gpasswd -d foo users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." test ! -f /etc/gshadow diff --git a/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/data/passwd b/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/data/shadow b/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test index 07f0b8a5..6ec2ebc9 100755 --- a/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test +++ b/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test @@ -24,13 +24,13 @@ gpasswd -d foo users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." test ! -f /etc/gshadow diff --git a/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/group b/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/group deleted file mode 100644 index b6fae894..00000000 --- a/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3:root -adm:x:4:root,foo -tty:x:5: -disk:x:6: -lp:x:7:foo,root -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21:foo -voice:x:22: -cdrom:x:24: -floppy:x:25:foo -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/gshadow b/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/gshadow deleted file mode 100644 index 1f2ba8da..00000000 --- a/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*::root -adm:*::root,foo -tty:*::foo -disk:*:foo: -lp:*::foo,root -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:foo:foo -voice:*:: -cdrom:*:foo:foo -floppy:*::foo -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/passwd b/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/passwd deleted file mode 100644 index bf52df00..00000000 --- a/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000::/home/foo:/bin/false diff --git a/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/shadow b/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/gpasswd.test b/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/gpasswd.test index 7ac8292c..55cd038d 100755 --- a/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/gpasswd.test +++ b/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/gpasswd.test @@ -42,16 +42,16 @@ echo "error message OK." rm -f tmp/gpasswd.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/group b/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/group deleted file mode 100644 index b6fae894..00000000 --- a/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3:root -adm:x:4:root,foo -tty:x:5: -disk:x:6: -lp:x:7:foo,root -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21:foo -voice:x:22: -cdrom:x:24: -floppy:x:25:foo -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/gshadow b/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/gshadow deleted file mode 100644 index 1f2ba8da..00000000 --- a/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*::root -adm:*::root,foo -tty:*::foo -disk:*:foo: -lp:*::foo,root -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:foo:foo -voice:*:: -cdrom:*:foo:foo -floppy:*::foo -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/passwd b/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/passwd deleted file mode 100644 index bf52df00..00000000 --- a/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000::/home/foo:/bin/false diff --git a/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/shadow b/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/gpasswd.test b/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/gpasswd.test index 2d9ba77f..0c7a649e 100755 --- a/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/gpasswd.test +++ b/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/gpasswd.test @@ -42,16 +42,16 @@ echo "error message OK." rm -f tmp/gpasswd.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/group b/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/group deleted file mode 100644 index b6fae894..00000000 --- a/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3:root -adm:x:4:root,foo -tty:x:5: -disk:x:6: -lp:x:7:foo,root -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21:foo -voice:x:22: -cdrom:x:24: -floppy:x:25:foo -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/gshadow b/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/gshadow deleted file mode 100644 index 1f2ba8da..00000000 --- a/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*::root -adm:*::root,foo -tty:*::foo -disk:*:foo: -lp:*::foo,root -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:foo:foo -voice:*:: -cdrom:*:foo:foo -floppy:*::foo -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/passwd b/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/passwd deleted file mode 100644 index bf52df00..00000000 --- a/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000::/home/foo:/bin/false diff --git a/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/shadow b/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/gpasswd.test b/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/gpasswd.test index 4ecc7d47..b9ec0589 100755 --- a/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/gpasswd.test +++ b/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/gpasswd.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/gpasswd.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/group b/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/group deleted file mode 100644 index b6fae894..00000000 --- a/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3:root -adm:x:4:root,foo -tty:x:5: -disk:x:6: -lp:x:7:foo,root -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21:foo -voice:x:22: -cdrom:x:24: -floppy:x:25:foo -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/gshadow b/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/gshadow deleted file mode 100644 index 1f2ba8da..00000000 --- a/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*::root -adm:*::root,foo -tty:*::foo -disk:*:foo: -lp:*::foo,root -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:foo:foo -voice:*:: -cdrom:*:foo:foo -floppy:*::foo -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/passwd b/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/passwd deleted file mode 100644 index bf52df00..00000000 --- a/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000::/home/foo:/bin/false diff --git a/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/shadow b/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/gpasswd.test b/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/gpasswd.test index b0e80304..0c7175bf 100755 --- a/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/gpasswd.test +++ b/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/gpasswd.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/gpasswd.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/group b/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/group deleted file mode 100644 index b6fae894..00000000 --- a/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3:root -adm:x:4:root,foo -tty:x:5: -disk:x:6: -lp:x:7:foo,root -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21:foo -voice:x:22: -cdrom:x:24: -floppy:x:25:foo -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/gshadow b/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/gshadow deleted file mode 100644 index 1f2ba8da..00000000 --- a/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*::root -adm:*::root,foo -tty:*::foo -disk:*:foo: -lp:*::foo,root -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:foo:foo -voice:*:: -cdrom:*:foo:foo -floppy:*::foo -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/passwd b/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/passwd deleted file mode 100644 index bf52df00..00000000 --- a/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000::/home/foo:/bin/false diff --git a/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/shadow b/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/gpasswd.test b/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/gpasswd.test index 02e1fa62..bb3ab618 100755 --- a/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/gpasswd.test +++ b/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/gpasswd.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/gpasswd.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/data/group b/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/data/group deleted file mode 100644 index 50518255..00000000 --- a/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/data/passwd b/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/data/shadow b/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/gpasswd.test b/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/gpasswd.test index 5eb18cf8..4cc31007 100755 --- a/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/gpasswd.test +++ b/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -A "" users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/group b/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/group deleted file mode 100644 index 50518255..00000000 --- a/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/passwd b/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/shadow b/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/gpasswd.test b/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/gpasswd.test index 1298f7b2..6ed3642f 100755 --- a/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/gpasswd.test +++ b/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -A "" users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/data/group b/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/data/group deleted file mode 100644 index 50518255..00000000 --- a/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/data/passwd b/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/data/shadow b/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/gpasswd.test b/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/gpasswd.test index eea88bf5..ca37b356 100755 --- a/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/gpasswd.test +++ b/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -A foo users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/data/group b/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/data/group deleted file mode 100644 index 38c2da70..00000000 --- a/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:root -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/data/passwd b/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/data/shadow b/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/gpasswd.test b/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/gpasswd.test index 83ac837e..2d64aaa8 100755 --- a/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/gpasswd.test +++ b/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -A foo users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/data/group b/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/data/group deleted file mode 100644 index 38c2da70..00000000 --- a/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:root -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/data/passwd b/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/data/shadow b/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/gpasswd.test b/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/gpasswd.test index e9cd30f4..2701d17d 100755 --- a/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/gpasswd.test +++ b/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -A foo users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/data/group b/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/data/group deleted file mode 100644 index 38c2da70..00000000 --- a/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:root -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/data/passwd b/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/data/shadow b/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/gpasswd.test b/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/gpasswd.test index 67a798ed..5964aa93 100755 --- a/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/gpasswd.test +++ b/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -A daemon,foo users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data/group b/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data/group deleted file mode 100644 index e3aaaf81..00000000 --- a/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3:root -adm:x:4:root,foo -tty:x:5: -disk:x:6: -lp:x:7:foo,root -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21:foo -voice:x:22: -cdrom:x:24: -floppy:x:25:foo -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data/passwd b/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data/passwd deleted file mode 100644 index bf52df00..00000000 --- a/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000::/home/foo:/bin/false diff --git a/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data/shadow b/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/gpasswd.test b/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/gpasswd.test index 3bcf2920..bbd88af2 100755 --- a/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/gpasswd.test +++ b/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -A foo users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/group b/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/group deleted file mode 100644 index b6fae894..00000000 --- a/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3:root -adm:x:4:root,foo -tty:x:5: -disk:x:6: -lp:x:7:foo,root -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21:foo -voice:x:22: -cdrom:x:24: -floppy:x:25:foo -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/gshadow b/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/gshadow deleted file mode 100644 index 1f2ba8da..00000000 --- a/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*::root -adm:*::root,foo -tty:*::foo -disk:*:foo: -lp:*::foo,root -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:foo:foo -voice:*:: -cdrom:*:foo:foo -floppy:*::foo -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/passwd b/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/passwd deleted file mode 100644 index bf52df00..00000000 --- a/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000::/home/foo:/bin/false diff --git a/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/shadow b/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/gpasswd.test b/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/gpasswd.test index 2c6d6dd3..6074c464 100755 --- a/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/gpasswd.test +++ b/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/gpasswd.test @@ -39,13 +39,13 @@ echo "error message OK." rm -f tmp/gpasswd.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." test ! -f /etc/gshadow diff --git a/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/group b/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/group deleted file mode 100644 index 1b4936af..00000000 --- a/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2:foo -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/gshadow b/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/gshadow deleted file mode 100644 index f590939e..00000000 --- a/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*::foo -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*::foo -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/passwd b/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/shadow b/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/gpasswd.test b/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/gpasswd.test index 9f7ab968..488c921b 100755 --- a/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/gpasswd.test +++ b/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/gpasswd.test @@ -21,16 +21,16 @@ gpasswd -a foo bin echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/group b/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/gshadow b/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/gshadow deleted file mode 100644 index ea4d4ab2..00000000 --- a/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:foo: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/passwd b/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/shadow b/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/gpasswd.test b/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/gpasswd.test index e633dddf..80b24c70 100755 --- a/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/gpasswd.test +++ b/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/gpasswd.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/gpasswd.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data/gshadow b/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data/gshadow deleted file mode 100644 index ea4d4ab2..00000000 --- a/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:foo: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data/passwd b/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data/shadow b/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/gpasswd.test b/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/gpasswd.test index b29c33b9..3bc2038a 100755 --- a/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/gpasswd.test +++ b/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/gpasswd.test @@ -21,16 +21,16 @@ gpasswd -d foo users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data/group b/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data/passwd b/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data/passwd deleted file mode 100644 index dc7bf840..00000000 --- a/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data/shadow b/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/gpasswd.test b/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/gpasswd.test index b29c33b9..5d495206 100755 --- a/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/gpasswd.test +++ b/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -d foo users echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/passwd b/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/passwd deleted file mode 100644 index aff85eb2..00000000 --- a/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -useruseruseruseruseruseruseruser:x:1000:1000:::/bin/false diff --git a/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/shadow b/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/shadow deleted file mode 100644 index ae1c0448..00000000 --- a/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -useruseruseruseruseruseruseruser:!:12977:0:99999:7::: diff --git a/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/gpasswd.test b/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/gpasswd.test index 265f0b65..594b8c3a 100755 --- a/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/gpasswd.test +++ b/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/gpasswd.test @@ -21,13 +21,13 @@ gpasswd -a useruseruseruseruseruseruseruser bin echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupadd/01_groupadd_add_group/data/passwd b/tests/grouptools/groupadd/01_groupadd_add_group/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupadd/01_groupadd_add_group/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupadd/01_groupadd_add_group/data/shadow b/tests/grouptools/groupadd/01_groupadd_add_group/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupadd/01_groupadd_add_group/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupadd/01_groupadd_add_group/groupadd.test b/tests/grouptools/groupadd/01_groupadd_add_group/groupadd.test index 47943664..c48da8e8 100755 --- a/tests/grouptools/groupadd/01_groupadd_add_group/groupadd.test +++ b/tests/grouptools/groupadd/01_groupadd_add_group/groupadd.test @@ -21,13 +21,13 @@ groupadd foo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/data/passwd b/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/data/shadow b/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/groupadd.test b/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/groupadd.test index c687f56d..05c10387 100755 --- a/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/groupadd.test +++ b/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/groupadd.test @@ -21,13 +21,13 @@ groupadd foo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/data/passwd b/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/data/shadow b/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/groupadd.test b/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/groupadd.test index bf37250a..bad185a9 100755 --- a/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/groupadd.test +++ b/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/groupadd.test @@ -21,13 +21,13 @@ groupadd -K GID_MIN=2000 foo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupadd/04_groupadd_set_password/data/passwd b/tests/grouptools/groupadd/04_groupadd_set_password/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupadd/04_groupadd_set_password/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupadd/04_groupadd_set_password/data/shadow b/tests/grouptools/groupadd/04_groupadd_set_password/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupadd/04_groupadd_set_password/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupadd/04_groupadd_set_password/groupadd.test b/tests/grouptools/groupadd/04_groupadd_set_password/groupadd.test index 4ad23caa..01ce95ee 100755 --- a/tests/grouptools/groupadd/04_groupadd_set_password/groupadd.test +++ b/tests/grouptools/groupadd/04_groupadd_set_password/groupadd.test @@ -21,13 +21,13 @@ groupadd -p password foo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupadd/05_groupadd_set_GID/data/passwd b/tests/grouptools/groupadd/05_groupadd_set_GID/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupadd/05_groupadd_set_GID/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupadd/05_groupadd_set_GID/data/shadow b/tests/grouptools/groupadd/05_groupadd_set_GID/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupadd/05_groupadd_set_GID/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupadd/05_groupadd_set_GID/groupadd.test b/tests/grouptools/groupadd/05_groupadd_set_GID/groupadd.test index 7f630efd..306767b2 100755 --- a/tests/grouptools/groupadd/05_groupadd_set_GID/groupadd.test +++ b/tests/grouptools/groupadd/05_groupadd_set_GID/groupadd.test @@ -21,13 +21,13 @@ groupadd -g 1500 foo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/group b/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/group deleted file mode 100644 index 6307e259..00000000 --- a/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:103: diff --git a/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/gshadow b/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/passwd b/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/shadow b/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/groupadd.test b/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/groupadd.test index 1de15205..25546ebf 100755 --- a/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/groupadd.test +++ b/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/groupadd.test @@ -21,16 +21,16 @@ groupadd -f foo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/data/passwd b/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/data/shadow b/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/groupadd.test b/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/groupadd.test index b251328b..3f3f32fe 100755 --- a/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/groupadd.test +++ b/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/groupadd.test @@ -21,13 +21,13 @@ groupadd -g 1003 -f bar echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupadd/08_groupadd_locked_group/data/group b/tests/grouptools/groupadd/08_groupadd_locked_group/data/group deleted file mode 100644 index 10123908..00000000 --- a/tests/grouptools/groupadd/08_groupadd_locked_group/data/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/grouptools/groupadd/08_groupadd_locked_group/data/gshadow b/tests/grouptools/groupadd/08_groupadd_locked_group/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/grouptools/groupadd/08_groupadd_locked_group/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/grouptools/groupadd/08_groupadd_locked_group/data/passwd b/tests/grouptools/groupadd/08_groupadd_locked_group/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupadd/08_groupadd_locked_group/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupadd/08_groupadd_locked_group/data/shadow b/tests/grouptools/groupadd/08_groupadd_locked_group/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupadd/08_groupadd_locked_group/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupadd/08_groupadd_locked_group/groupadd.test b/tests/grouptools/groupadd/08_groupadd_locked_group/groupadd.test index 78636aff..aa3250ee 100755 --- a/tests/grouptools/groupadd/08_groupadd_locked_group/groupadd.test +++ b/tests/grouptools/groupadd/08_groupadd_locked_group/groupadd.test @@ -42,16 +42,16 @@ echo "error message OK." rm -f tmp/groupadd.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/group b/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/group deleted file mode 100644 index 10123908..00000000 --- a/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/gshadow b/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/passwd b/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/shadow b/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupadd/09_groupadd_locked_gshadow/groupadd.test b/tests/grouptools/groupadd/09_groupadd_locked_gshadow/groupadd.test index d4c8d72d..ac6645c6 100755 --- a/tests/grouptools/groupadd/09_groupadd_locked_gshadow/groupadd.test +++ b/tests/grouptools/groupadd/09_groupadd_locked_gshadow/groupadd.test @@ -42,16 +42,16 @@ echo "error message OK." rm -f tmp/groupadd.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/data/passwd b/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/data/shadow b/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/groupadd.test b/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/groupadd.test index d89bc121..3597a315 100755 --- a/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/groupadd.test +++ b/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/groupadd.test @@ -21,13 +21,13 @@ groupadd -g 1003 -o bar echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/group b/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/group deleted file mode 100644 index 10123908..00000000 --- a/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/gshadow b/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/passwd b/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/shadow b/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupadd/11_groupadd_invalid_GID/groupadd.test b/tests/grouptools/groupadd/11_groupadd_invalid_GID/groupadd.test index 97c44156..9a1d542d 100755 --- a/tests/grouptools/groupadd/11_groupadd_invalid_GID/groupadd.test +++ b/tests/grouptools/groupadd/11_groupadd_invalid_GID/groupadd.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupadd.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupadd/12_groupadd_negativ_GID/data/group b/tests/grouptools/groupadd/12_groupadd_negativ_GID/data/group deleted file mode 100644 index 10123908..00000000 --- a/tests/grouptools/groupadd/12_groupadd_negativ_GID/data/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/grouptools/groupadd/12_groupadd_negativ_GID/data/gshadow b/tests/grouptools/groupadd/12_groupadd_negativ_GID/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/grouptools/groupadd/12_groupadd_negativ_GID/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/grouptools/groupadd/12_groupadd_negativ_GID/data/passwd b/tests/grouptools/groupadd/12_groupadd_negativ_GID/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupadd/12_groupadd_negativ_GID/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupadd/12_groupadd_negativ_GID/data/shadow b/tests/grouptools/groupadd/12_groupadd_negativ_GID/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupadd/12_groupadd_negativ_GID/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupadd/12_groupadd_negativ_GID/groupadd.test b/tests/grouptools/groupadd/12_groupadd_negativ_GID/groupadd.test index fe3e8d97..b46434c1 100755 --- a/tests/grouptools/groupadd/12_groupadd_negativ_GID/groupadd.test +++ b/tests/grouptools/groupadd/12_groupadd_negativ_GID/groupadd.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupadd.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupadd/13_groupadd_invalid_name/data/group b/tests/grouptools/groupadd/13_groupadd_invalid_name/data/group deleted file mode 100644 index 10123908..00000000 --- a/tests/grouptools/groupadd/13_groupadd_invalid_name/data/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/grouptools/groupadd/13_groupadd_invalid_name/data/gshadow b/tests/grouptools/groupadd/13_groupadd_invalid_name/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/grouptools/groupadd/13_groupadd_invalid_name/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/grouptools/groupadd/13_groupadd_invalid_name/data/passwd b/tests/grouptools/groupadd/13_groupadd_invalid_name/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupadd/13_groupadd_invalid_name/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupadd/13_groupadd_invalid_name/data/shadow b/tests/grouptools/groupadd/13_groupadd_invalid_name/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupadd/13_groupadd_invalid_name/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupadd/13_groupadd_invalid_name/groupadd.test b/tests/grouptools/groupadd/13_groupadd_invalid_name/groupadd.test index 71c7e09e..fab30117 100755 --- a/tests/grouptools/groupadd/13_groupadd_invalid_name/groupadd.test +++ b/tests/grouptools/groupadd/13_groupadd_invalid_name/groupadd.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupadd.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/group b/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/group deleted file mode 100644 index 10123908..00000000 --- a/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/gshadow b/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/passwd b/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/shadow b/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/groupadd.test b/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/groupadd.test index e437e065..7e28a7f0 100755 --- a/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/groupadd.test +++ b/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/groupadd.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupadd.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/group b/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/group deleted file mode 100644 index 10123908..00000000 --- a/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/gshadow b/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/passwd b/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/shadow b/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/groupadd.test b/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/groupadd.test index dc411904..affd6818 100755 --- a/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/groupadd.test +++ b/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/groupadd.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupadd.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupadd/16_groupadd_existing_group/data/group b/tests/grouptools/groupadd/16_groupadd_existing_group/data/group deleted file mode 100644 index 6307e259..00000000 --- a/tests/grouptools/groupadd/16_groupadd_existing_group/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:103: diff --git a/tests/grouptools/groupadd/16_groupadd_existing_group/data/gshadow b/tests/grouptools/groupadd/16_groupadd_existing_group/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/grouptools/groupadd/16_groupadd_existing_group/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/groupadd/16_groupadd_existing_group/data/passwd b/tests/grouptools/groupadd/16_groupadd_existing_group/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupadd/16_groupadd_existing_group/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupadd/16_groupadd_existing_group/data/shadow b/tests/grouptools/groupadd/16_groupadd_existing_group/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupadd/16_groupadd_existing_group/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupadd/16_groupadd_existing_group/groupadd.test b/tests/grouptools/groupadd/16_groupadd_existing_group/groupadd.test index bd0d1a0f..7136dfa9 100755 --- a/tests/grouptools/groupadd/16_groupadd_existing_group/groupadd.test +++ b/tests/grouptools/groupadd/16_groupadd_existing_group/groupadd.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupadd.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupadd/17_groupadd_add_systemgroup/data/passwd b/tests/grouptools/groupadd/17_groupadd_add_systemgroup/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupadd/17_groupadd_add_systemgroup/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupadd/17_groupadd_add_systemgroup/data/shadow b/tests/grouptools/groupadd/17_groupadd_add_systemgroup/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupadd/17_groupadd_add_systemgroup/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupadd/17_groupadd_add_systemgroup/groupadd.test b/tests/grouptools/groupadd/17_groupadd_add_systemgroup/groupadd.test index d08ae72c..1d5c9a85 100755 --- a/tests/grouptools/groupadd/17_groupadd_add_systemgroup/groupadd.test +++ b/tests/grouptools/groupadd/17_groupadd_add_systemgroup/groupadd.test @@ -21,13 +21,13 @@ groupadd --system foo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/group b/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/group deleted file mode 100644 index 15f4c27f..00000000 --- a/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/group +++ /dev/null @@ -1,43 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo1:x:1000: -foo2:x:1001: diff --git a/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/gshadow b/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/passwd b/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/shadow b/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupadd/18_groupadd_no_more_GID/groupadd.test b/tests/grouptools/groupadd/18_groupadd_no_more_GID/groupadd.test index f7b43170..d4aeec4d 100755 --- a/tests/grouptools/groupadd/18_groupadd_no_more_GID/groupadd.test +++ b/tests/grouptools/groupadd/18_groupadd_no_more_GID/groupadd.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupadd.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/group b/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/group deleted file mode 100644 index db0f4833..00000000 --- a/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/group +++ /dev/null @@ -1,43 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo1:x:300: -foo2:x:301: diff --git a/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/gshadow b/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/passwd b/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/shadow b/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/groupadd.test b/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/groupadd.test index 49bfd48e..728cdbce 100755 --- a/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/groupadd.test +++ b/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/groupadd.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupadd.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/group b/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/gshadow b/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/passwd b/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/shadow b/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupadd/20_groupadd_add_existing_GID/groupadd.test b/tests/grouptools/groupadd/20_groupadd_add_existing_GID/groupadd.test index 09f97988..c65be1b1 100755 --- a/tests/grouptools/groupadd/20_groupadd_add_existing_GID/groupadd.test +++ b/tests/grouptools/groupadd/20_groupadd_add_existing_GID/groupadd.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupadd.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupadd/25_groupadd_no_gshadow/data/passwd b/tests/grouptools/groupadd/25_groupadd_no_gshadow/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupadd/25_groupadd_no_gshadow/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupadd/25_groupadd_no_gshadow/data/shadow b/tests/grouptools/groupadd/25_groupadd_no_gshadow/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupadd/25_groupadd_no_gshadow/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupadd/25_groupadd_no_gshadow/groupadd.test b/tests/grouptools/groupadd/25_groupadd_no_gshadow/groupadd.test index 4b29112a..87f80fb0 100755 --- a/tests/grouptools/groupadd/25_groupadd_no_gshadow/groupadd.test +++ b/tests/grouptools/groupadd/25_groupadd_no_gshadow/groupadd.test @@ -25,13 +25,13 @@ groupadd foo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." test ! -f /etc/gshadow diff --git a/tests/grouptools/groupdel/01_groupdel_delete_group/data/passwd b/tests/grouptools/groupdel/01_groupdel_delete_group/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupdel/01_groupdel_delete_group/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupdel/01_groupdel_delete_group/data/shadow b/tests/grouptools/groupdel/01_groupdel_delete_group/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupdel/01_groupdel_delete_group/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupdel/01_groupdel_delete_group/groupdel.test b/tests/grouptools/groupdel/01_groupdel_delete_group/groupdel.test index 888d8460..b590f9df 100755 --- a/tests/grouptools/groupdel/01_groupdel_delete_group/groupdel.test +++ b/tests/grouptools/groupdel/01_groupdel_delete_group/groupdel.test @@ -21,13 +21,13 @@ groupdel foo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data/gshadow b/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data/passwd b/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data/shadow b/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/groupdel.test b/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/groupdel.test index 888d8460..0ab4f197 100755 --- a/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/groupdel.test +++ b/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/groupdel.test @@ -21,16 +21,16 @@ groupdel foo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/gshadow b/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/passwd b/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/shadow b/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/groupdel.test b/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/groupdel.test index 8661bad5..b0c0793b 100755 --- a/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/groupdel.test +++ b/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/groupdel.test @@ -24,13 +24,13 @@ groupdel foo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." test ! -f /etc/gshadow diff --git a/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/group b/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/gshadow b/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/passwd b/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/passwd deleted file mode 100644 index 69768f83..00000000 --- a/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -bar:x:1000:1000::/nonexistent:/bin/sh diff --git a/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/shadow b/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/shadow deleted file mode 100644 index 518993cf..00000000 --- a/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -bar:*:12977:0:99999:7::: diff --git a/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/groupdel.test b/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/groupdel.test index df197594..cab95ca5 100755 --- a/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/groupdel.test +++ b/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/groupdel.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupdel.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/group b/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/group deleted file mode 100644 index 31966921..00000000 --- a/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo1:x:1000: diff --git a/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/gshadow b/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/gshadow deleted file mode 100644 index 3a02ae83..00000000 --- a/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo1:*:: diff --git a/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/passwd b/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/passwd deleted file mode 100644 index 69768f83..00000000 --- a/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -bar:x:1000:1000::/nonexistent:/bin/sh diff --git a/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/shadow b/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/shadow deleted file mode 100644 index 518993cf..00000000 --- a/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -bar:*:12977:0:99999:7::: diff --git a/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/groupdel.test b/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/groupdel.test index 63568e93..76b6bfad 100755 --- a/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/groupdel.test +++ b/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/groupdel.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupdel.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/group b/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/gshadow b/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/passwd b/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/shadow b/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/groupdel.test b/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/groupdel.test index 51bd74c6..d2f54c96 100755 --- a/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/groupdel.test +++ b/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/groupdel.test @@ -42,16 +42,16 @@ echo "error message OK." rm -f tmp/groupdel.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/group b/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/gshadow b/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/passwd b/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/shadow b/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/groupdel.test b/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/groupdel.test index b0e9cc41..ea7a4cc7 100755 --- a/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/groupdel.test +++ b/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/groupdel.test @@ -42,16 +42,16 @@ echo "error message OK." rm -f tmp/groupdel.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/group b/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/group deleted file mode 100644 index 31966921..00000000 --- a/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo1:x:1000: diff --git a/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/gshadow b/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/gshadow deleted file mode 100644 index 3a02ae83..00000000 --- a/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo1:*:: diff --git a/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/passwd b/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/passwd deleted file mode 100644 index 69768f83..00000000 --- a/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -bar:x:1000:1000::/nonexistent:/bin/sh diff --git a/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/shadow b/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/shadow deleted file mode 100644 index 518993cf..00000000 --- a/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -bar:*:12977:0:99999:7::: diff --git a/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/groupdel.test b/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/groupdel.test index 75911b2d..2cdc0d57 100755 --- a/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/groupdel.test +++ b/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/groupdel.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupdel.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/group b/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/group deleted file mode 100644 index 31966921..00000000 --- a/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo1:x:1000: diff --git a/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/gshadow b/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/gshadow deleted file mode 100644 index 3a02ae83..00000000 --- a/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo1:*:: diff --git a/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/passwd b/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/passwd deleted file mode 100644 index 69768f83..00000000 --- a/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -bar:x:1000:1000::/nonexistent:/bin/sh diff --git a/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/shadow b/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/shadow deleted file mode 100644 index 518993cf..00000000 --- a/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -bar:*:12977:0:99999:7::: diff --git a/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/groupdel.test b/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/groupdel.test index a0710d1f..d833deb9 100755 --- a/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/groupdel.test +++ b/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/groupdel.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupdel.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmems/01_groupmems_root_add_user/data/passwd b/tests/grouptools/groupmems/01_groupmems_root_add_user/data/passwd deleted file mode 100644 index a07e4989..00000000 --- a/tests/grouptools/groupmems/01_groupmems_root_add_user/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh diff --git a/tests/grouptools/groupmems/01_groupmems_root_add_user/data/shadow b/tests/grouptools/groupmems/01_groupmems_root_add_user/data/shadow deleted file mode 100644 index 976b4f94..00000000 --- a/tests/grouptools/groupmems/01_groupmems_root_add_user/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmems/01_groupmems_root_add_user/groupmems.test b/tests/grouptools/groupmems/01_groupmems_root_add_user/groupmems.test index 50f94db1..74c74205 100755 --- a/tests/grouptools/groupmems/01_groupmems_root_add_user/groupmems.test +++ b/tests/grouptools/groupmems/01_groupmems_root_add_user/groupmems.test @@ -21,13 +21,13 @@ groupmems -a utest1 -g gtest1 echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmems/02_groupmems_root_del_user/data/passwd b/tests/grouptools/groupmems/02_groupmems_root_del_user/data/passwd deleted file mode 100644 index a07e4989..00000000 --- a/tests/grouptools/groupmems/02_groupmems_root_del_user/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh diff --git a/tests/grouptools/groupmems/02_groupmems_root_del_user/data/shadow b/tests/grouptools/groupmems/02_groupmems_root_del_user/data/shadow deleted file mode 100644 index 976b4f94..00000000 --- a/tests/grouptools/groupmems/02_groupmems_root_del_user/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmems/02_groupmems_root_del_user/groupmems.test b/tests/grouptools/groupmems/02_groupmems_root_del_user/groupmems.test index c9067728..fca4fdb4 100755 --- a/tests/grouptools/groupmems/02_groupmems_root_del_user/groupmems.test +++ b/tests/grouptools/groupmems/02_groupmems_root_del_user/groupmems.test @@ -21,13 +21,13 @@ groupmems -d utest1 -g gtest1 echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/data/passwd b/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/data/passwd deleted file mode 100644 index a07e4989..00000000 --- a/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh diff --git a/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/data/shadow b/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/data/shadow deleted file mode 100644 index 976b4f94..00000000 --- a/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/groupmems.test b/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/groupmems.test index 53f86b12..6e5de89a 100755 --- a/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/groupmems.test +++ b/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/groupmems.test @@ -21,13 +21,13 @@ groupmems -d utest1 -g gtest1 echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/data/passwd b/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/data/passwd deleted file mode 100644 index a07e4989..00000000 --- a/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh diff --git a/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/data/shadow b/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/data/shadow deleted file mode 100644 index 976b4f94..00000000 --- a/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/groupmems.test b/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/groupmems.test index 40a597a8..e4d9d07e 100755 --- a/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/groupmems.test +++ b/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/groupmems.test @@ -21,13 +21,13 @@ groupmems -d utest1 -g gtest1 echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/data/passwd b/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/data/passwd deleted file mode 100644 index a07e4989..00000000 --- a/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh diff --git a/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/data/shadow b/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/data/shadow deleted file mode 100644 index 976b4f94..00000000 --- a/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/groupmems.test b/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/groupmems.test index dd82dc86..3fbfac22 100755 --- a/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/groupmems.test +++ b/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/groupmems.test @@ -21,13 +21,13 @@ groupmems -a utest1 -g gtest1 echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/data/passwd b/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/data/passwd deleted file mode 100644 index a07e4989..00000000 --- a/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh diff --git a/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/data/shadow b/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/data/shadow deleted file mode 100644 index 976b4f94..00000000 --- a/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/groupmems.test b/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/groupmems.test index 50f94db1..74c74205 100755 --- a/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/groupmems.test +++ b/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/groupmems.test @@ -21,13 +21,13 @@ groupmems -a utest1 -g gtest1 echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/data/passwd b/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/data/passwd deleted file mode 100644 index a07e4989..00000000 --- a/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh diff --git a/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/data/shadow b/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/data/shadow deleted file mode 100644 index 976b4f94..00000000 --- a/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/groupmems.test b/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/groupmems.test index 3e678af6..8c1576b6 100755 --- a/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/groupmems.test +++ b/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/groupmems.test @@ -21,13 +21,13 @@ groupmems -d utest1 -g gtest1 echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/data/passwd b/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/data/passwd deleted file mode 100644 index a07e4989..00000000 --- a/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh diff --git a/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/data/shadow b/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/data/shadow deleted file mode 100644 index 976b4f94..00000000 --- a/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/groupmems.test b/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/groupmems.test index a625368d..d340e3d9 100755 --- a/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/groupmems.test +++ b/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/groupmems.test @@ -21,13 +21,13 @@ groupmems -d utest1 -g gtest1 echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmems/09_groupmems_root_purge_user/data/passwd b/tests/grouptools/groupmems/09_groupmems_root_purge_user/data/passwd deleted file mode 100644 index a07e4989..00000000 --- a/tests/grouptools/groupmems/09_groupmems_root_purge_user/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh diff --git a/tests/grouptools/groupmems/09_groupmems_root_purge_user/data/shadow b/tests/grouptools/groupmems/09_groupmems_root_purge_user/data/shadow deleted file mode 100644 index 976b4f94..00000000 --- a/tests/grouptools/groupmems/09_groupmems_root_purge_user/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmems/09_groupmems_root_purge_user/groupmems.test b/tests/grouptools/groupmems/09_groupmems_root_purge_user/groupmems.test index 103a7b6e..c8cf32d1 100755 --- a/tests/grouptools/groupmems/09_groupmems_root_purge_user/groupmems.test +++ b/tests/grouptools/groupmems/09_groupmems_root_purge_user/groupmems.test @@ -21,13 +21,13 @@ groupmems -p -g gtest1 echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/data/passwd b/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/data/passwd deleted file mode 100644 index a07e4989..00000000 --- a/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh diff --git a/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/data/shadow b/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/data/shadow deleted file mode 100644 index 976b4f94..00000000 --- a/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/groupmems.test b/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/groupmems.test index efd4fe66..be32ef86 100755 --- a/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/groupmems.test +++ b/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/groupmems.test @@ -21,13 +21,13 @@ groupmems -p -g gtest1 echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/data/passwd b/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/data/passwd deleted file mode 100644 index a07e4989..00000000 --- a/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh diff --git a/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/data/shadow b/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/data/shadow deleted file mode 100644 index 976b4f94..00000000 --- a/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/groupmems.test b/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/groupmems.test index c63a3df0..623fd203 100755 --- a/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/groupmems.test +++ b/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/groupmems.test @@ -21,13 +21,13 @@ groupmems -p -g gtest1 echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmems/12_groupmems_user_add_user/data/passwd b/tests/grouptools/groupmems/12_groupmems_user_add_user/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/12_groupmems_user_add_user/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/12_groupmems_user_add_user/data/shadow b/tests/grouptools/groupmems/12_groupmems_user_add_user/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/12_groupmems_user_add_user/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/12_groupmems_user_add_user/groupmems.test b/tests/grouptools/groupmems/12_groupmems_user_add_user/groupmems.test index b65a5e6c..fc9360bb 100755 --- a/tests/grouptools/groupmems/12_groupmems_user_add_user/groupmems.test +++ b/tests/grouptools/groupmems/12_groupmems_user_add_user/groupmems.test @@ -21,13 +21,13 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmems/13_groupmems_user_del_user/data/passwd b/tests/grouptools/groupmems/13_groupmems_user_del_user/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/13_groupmems_user_del_user/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/13_groupmems_user_del_user/data/shadow b/tests/grouptools/groupmems/13_groupmems_user_del_user/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/13_groupmems_user_del_user/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/13_groupmems_user_del_user/groupmems.test b/tests/grouptools/groupmems/13_groupmems_user_del_user/groupmems.test index 596690a8..6edd2792 100755 --- a/tests/grouptools/groupmems/13_groupmems_user_del_user/groupmems.test +++ b/tests/grouptools/groupmems/13_groupmems_user_del_user/groupmems.test @@ -21,13 +21,13 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/data/passwd b/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/data/shadow b/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/groupmems.test b/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/groupmems.test index 75e6ba82..38d0dcd4 100755 --- a/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/groupmems.test +++ b/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/groupmems.test @@ -21,13 +21,13 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/data/passwd b/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/data/shadow b/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/groupmems.test b/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/groupmems.test index b9f94a9d..9377a021 100755 --- a/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/groupmems.test +++ b/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/groupmems.test @@ -21,13 +21,13 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/data/passwd b/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/data/shadow b/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/groupmems.test b/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/groupmems.test index 98eb458e..39acbdbd 100755 --- a/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/groupmems.test +++ b/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/groupmems.test @@ -21,13 +21,13 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/data/passwd b/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/data/shadow b/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/groupmems.test b/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/groupmems.test index 528bd265..c4073de1 100755 --- a/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/groupmems.test +++ b/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/groupmems.test @@ -21,13 +21,13 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/data/passwd b/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/data/shadow b/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/groupmems.test b/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/groupmems.test index fc4a3358..9bd46b61 100755 --- a/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/groupmems.test +++ b/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/groupmems.test @@ -21,13 +21,13 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/data/passwd b/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/data/shadow b/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/groupmems.test b/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/groupmems.test index 368deb5f..68ebb2f7 100755 --- a/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/groupmems.test +++ b/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/groupmems.test @@ -21,13 +21,13 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmems/20_groupmems_user_purge_user/data/passwd b/tests/grouptools/groupmems/20_groupmems_user_purge_user/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/20_groupmems_user_purge_user/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/20_groupmems_user_purge_user/data/shadow b/tests/grouptools/groupmems/20_groupmems_user_purge_user/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/20_groupmems_user_purge_user/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/20_groupmems_user_purge_user/groupmems.test b/tests/grouptools/groupmems/20_groupmems_user_purge_user/groupmems.test index ecde16e6..23988412 100755 --- a/tests/grouptools/groupmems/20_groupmems_user_purge_user/groupmems.test +++ b/tests/grouptools/groupmems/20_groupmems_user_purge_user/groupmems.test @@ -21,13 +21,13 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/data/passwd b/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/data/shadow b/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/groupmems.test b/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/groupmems.test index f429e3f9..e63fc92a 100755 --- a/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/groupmems.test +++ b/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/groupmems.test @@ -21,13 +21,13 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/data/passwd b/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/data/shadow b/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/groupmems.test b/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/groupmems.test index 9cf11bf3..bbcd7d67 100755 --- a/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/groupmems.test +++ b/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/groupmems.test @@ -21,13 +21,13 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/group b/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/group deleted file mode 100644 index 0b80d30e..00000000 --- a/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/group +++ /dev/null @@ -1,44 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -groupmems:x:99: -utest1:x:1000: -myuser:x:424242: diff --git a/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/gshadow b/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/gshadow deleted file mode 100644 index 750eceab..00000000 --- a/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/gshadow +++ /dev/null @@ -1,44 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -groupmems:*:: -utest1:*:: -myuser:x:: diff --git a/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/passwd b/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/shadow b/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/groupmems.test b/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/groupmems.test index 45f28bee..f287ade8 100755 --- a/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/groupmems.test +++ b/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/groupmems.test @@ -21,16 +21,16 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/group b/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/group deleted file mode 100644 index 230ff8ee..00000000 --- a/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/group +++ /dev/null @@ -1,45 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -groupmems:x:99:myuser -utest1:x:1000: -myuser:x:424242: -gmyuser:x:424243: diff --git a/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/gshadow b/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/gshadow deleted file mode 100644 index cd86429e..00000000 --- a/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/gshadow +++ /dev/null @@ -1,45 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -groupmems:*::myuser -utest1:*:: -myuser:x:: -gmyuser:x:: diff --git a/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/passwd b/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/shadow b/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/groupmems.test b/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/groupmems.test index 7fe12631..3a78effa 100755 --- a/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/groupmems.test +++ b/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/groupmems.test @@ -21,16 +21,16 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/group b/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/group deleted file mode 100644 index 230ff8ee..00000000 --- a/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/group +++ /dev/null @@ -1,45 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -groupmems:x:99:myuser -utest1:x:1000: -myuser:x:424242: -gmyuser:x:424243: diff --git a/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/gshadow b/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/gshadow deleted file mode 100644 index cd86429e..00000000 --- a/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/gshadow +++ /dev/null @@ -1,45 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -groupmems:*::myuser -utest1:*:: -myuser:x:: -gmyuser:x:: diff --git a/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/passwd b/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/passwd deleted file mode 100644 index 9e07aa1f..00000000 --- a/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424243::/home:/bin/bash diff --git a/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/shadow b/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/groupmems.test b/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/groupmems.test index 3252b0b0..2a65f7be 100755 --- a/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/groupmems.test +++ b/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/groupmems.test @@ -21,16 +21,16 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/group b/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/group deleted file mode 100644 index 7a0e2955..00000000 --- a/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/group +++ /dev/null @@ -1,44 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -groupmems:x:99:myuser -utest1:x:1000: -myuser:x:424242:utest1 diff --git a/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/gshadow b/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/gshadow deleted file mode 100644 index c908c394..00000000 --- a/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/gshadow +++ /dev/null @@ -1,44 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -groupmems:*::myuser -utest1:*:: -myuser:x::utest1 diff --git a/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/passwd b/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/shadow b/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/groupmems.test b/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/groupmems.test index 0df4ba99..d2b3383c 100755 --- a/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/groupmems.test +++ b/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/groupmems.test @@ -21,16 +21,16 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/group b/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/group deleted file mode 100644 index 7a0e2955..00000000 --- a/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/group +++ /dev/null @@ -1,44 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -groupmems:x:99:myuser -utest1:x:1000: -myuser:x:424242:utest1 diff --git a/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/gshadow b/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/gshadow deleted file mode 100644 index 9945adca..00000000 --- a/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/gshadow +++ /dev/null @@ -1,44 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -groupmems:*::myuser -utest1:*:: -myuser:x:: diff --git a/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/passwd b/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/shadow b/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/groupmems.test b/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/groupmems.test index 54e37d27..1a5666a3 100755 --- a/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/groupmems.test +++ b/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/groupmems.test @@ -21,16 +21,16 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data/gshadow b/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data/gshadow deleted file mode 100644 index c908c394..00000000 --- a/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data/gshadow +++ /dev/null @@ -1,44 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -groupmems:*::myuser -utest1:*:: -myuser:x::utest1 diff --git a/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data/passwd b/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data/shadow b/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/groupmems.test b/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/groupmems.test index 78f217cb..23b224a6 100755 --- a/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/groupmems.test +++ b/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/groupmems.test @@ -21,16 +21,16 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/group b/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/group deleted file mode 100644 index 7a0e2955..00000000 --- a/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/group +++ /dev/null @@ -1,44 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -groupmems:x:99:myuser -utest1:x:1000: -myuser:x:424242:utest1 diff --git a/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/gshadow b/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/gshadow deleted file mode 100644 index c908c394..00000000 --- a/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/gshadow +++ /dev/null @@ -1,44 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -groupmems:*::myuser -utest1:*:: -myuser:x::utest1 diff --git a/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/passwd b/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/shadow b/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/groupmems.test b/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/groupmems.test index 7f845ec0..201bb9af 100755 --- a/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/groupmems.test +++ b/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/groupmems.test @@ -21,16 +21,16 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/data/passwd b/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/data/shadow b/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/groupmems.test b/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/groupmems.test index e66d89a2..783876ac 100755 --- a/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/groupmems.test +++ b/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/groupmems.test @@ -21,13 +21,13 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/data/passwd b/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/data/shadow b/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/groupmems.test b/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/groupmems.test index 9e044f06..31983b65 100755 --- a/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/groupmems.test +++ b/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/groupmems.test @@ -24,13 +24,13 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." test ! -f /etc/gshadow diff --git a/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/group b/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/group deleted file mode 100644 index 248e7b7a..00000000 --- a/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/group +++ /dev/null @@ -1,44 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -groupmems:x:99:myuser -utest1:x:1000: -myuser:x:424242:bin,daemon diff --git a/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/gshadow b/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/gshadow deleted file mode 100644 index d2f4c7b3..00000000 --- a/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/gshadow +++ /dev/null @@ -1,44 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -groupmems:*::myuser -utest1:*:: -myuser:x:bin,daemon: diff --git a/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/passwd b/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/shadow b/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/groupmems.test b/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/groupmems.test index ebf109ba..243d830a 100755 --- a/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/groupmems.test +++ b/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/groupmems.test @@ -21,16 +21,16 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data/gshadow b/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data/gshadow deleted file mode 100644 index eefaca89..00000000 --- a/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data/gshadow +++ /dev/null @@ -1,44 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -groupmems:*::myuser -utest1:*:: -myuser:x:daemon:bin diff --git a/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data/passwd b/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data/shadow b/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/groupmems.test b/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/groupmems.test index c8eb3330..b42c8f7e 100755 --- a/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/groupmems.test +++ b/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/groupmems.test @@ -21,16 +21,16 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/data/passwd b/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/data/shadow b/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/groupmems.test b/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/groupmems.test index f9909ffb..da1ebc59 100755 --- a/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/groupmems.test +++ b/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/groupmems.test @@ -21,13 +21,13 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/data/passwd b/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/data/shadow b/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/groupmems.test b/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/groupmems.test index db171063..43f2e5db 100755 --- a/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/groupmems.test +++ b/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/groupmems.test @@ -21,13 +21,13 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data/gshadow b/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data/gshadow deleted file mode 100644 index 9945adca..00000000 --- a/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data/gshadow +++ /dev/null @@ -1,44 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -groupmems:*::myuser -utest1:*:: -myuser:x:: diff --git a/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data/passwd b/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data/shadow b/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/groupmems.test b/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/groupmems.test index a0aa3e26..22a83e57 100755 --- a/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/groupmems.test +++ b/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/groupmems.test @@ -24,13 +24,13 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." test ! -f /etc/gshadow diff --git a/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data/group b/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data/group deleted file mode 100644 index 7505b93b..00000000 --- a/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data/group +++ /dev/null @@ -1,44 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -groupmems:x:99:myuser -utest1:x:1000: -myuser:x:424242: diff --git a/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data/passwd b/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data/shadow b/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/groupmems.test b/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/groupmems.test index 203af228..d97b9047 100755 --- a/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/groupmems.test +++ b/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/groupmems.test @@ -21,13 +21,13 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/data/passwd b/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/data/shadow b/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/groupmems.test b/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/groupmems.test index 08b0c0ca..f9d58f6b 100755 --- a/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/groupmems.test +++ b/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/groupmems.test @@ -21,13 +21,13 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data/gshadow b/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data/gshadow deleted file mode 100644 index 9945adca..00000000 --- a/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data/gshadow +++ /dev/null @@ -1,44 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -groupmems:*::myuser -utest1:*:: -myuser:x:: diff --git a/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data/passwd b/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data/shadow b/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/groupmems.test b/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/groupmems.test index d5ac82e5..e6e8e9c7 100755 --- a/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/groupmems.test +++ b/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/groupmems.test @@ -24,13 +24,13 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." test ! -f /etc/gshadow diff --git a/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/group b/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/group deleted file mode 100644 index 230ff8ee..00000000 --- a/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/group +++ /dev/null @@ -1,45 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -groupmems:x:99:myuser -utest1:x:1000: -myuser:x:424242: -gmyuser:x:424243: diff --git a/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/gshadow b/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/gshadow deleted file mode 100644 index cd86429e..00000000 --- a/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/gshadow +++ /dev/null @@ -1,45 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -groupmems:*::myuser -utest1:*:: -myuser:x:: -gmyuser:x:: diff --git a/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/passwd b/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/shadow b/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/groupmems.test b/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/groupmems.test index 47b923f4..a2976d19 100755 --- a/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/groupmems.test +++ b/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/groupmems.test @@ -21,16 +21,16 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/group b/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/group deleted file mode 100644 index 230ff8ee..00000000 --- a/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/group +++ /dev/null @@ -1,45 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -groupmems:x:99:myuser -utest1:x:1000: -myuser:x:424242: -gmyuser:x:424243: diff --git a/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/gshadow b/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/gshadow deleted file mode 100644 index cd86429e..00000000 --- a/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/gshadow +++ /dev/null @@ -1,45 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -groupmems:*::myuser -utest1:*:: -myuser:x:: -gmyuser:x:: diff --git a/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/passwd b/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/shadow b/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/groupmems.test b/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/groupmems.test index da8a7a3c..f70f12a6 100755 --- a/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/groupmems.test +++ b/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/groupmems.test @@ -21,16 +21,16 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmems/42_groupmems_user_list_users/data/group b/tests/grouptools/groupmems/42_groupmems_user_list_users/data/group deleted file mode 100644 index bd6da4e7..00000000 --- a/tests/grouptools/groupmems/42_groupmems_user_list_users/data/group +++ /dev/null @@ -1,44 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -groupmems:x:99:myuser -utest1:x:1000: -myuser:x:424242:utest1,bin,daemon diff --git a/tests/grouptools/groupmems/42_groupmems_user_list_users/data/gshadow b/tests/grouptools/groupmems/42_groupmems_user_list_users/data/gshadow deleted file mode 100644 index 02b9401d..00000000 --- a/tests/grouptools/groupmems/42_groupmems_user_list_users/data/gshadow +++ /dev/null @@ -1,44 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -groupmems:*::myuser -utest1:*:: -myuser:x::utest1,bin,daemon diff --git a/tests/grouptools/groupmems/42_groupmems_user_list_users/data/passwd b/tests/grouptools/groupmems/42_groupmems_user_list_users/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/42_groupmems_user_list_users/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/42_groupmems_user_list_users/data/shadow b/tests/grouptools/groupmems/42_groupmems_user_list_users/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/42_groupmems_user_list_users/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/42_groupmems_user_list_users/groupmems.test b/tests/grouptools/groupmems/42_groupmems_user_list_users/groupmems.test index a003332f..cb6bff40 100755 --- a/tests/grouptools/groupmems/42_groupmems_user_list_users/groupmems.test +++ b/tests/grouptools/groupmems/42_groupmems_user_list_users/groupmems.test @@ -21,16 +21,16 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/group b/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/group deleted file mode 100644 index bd6da4e7..00000000 --- a/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/group +++ /dev/null @@ -1,44 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -groupmems:x:99:myuser -utest1:x:1000: -myuser:x:424242:utest1,bin,daemon diff --git a/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/gshadow b/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/gshadow deleted file mode 100644 index 74f0e82f..00000000 --- a/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/gshadow +++ /dev/null @@ -1,44 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -groupmems:*::myuser -utest1:*:: -myuser:x:nouser,root: diff --git a/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/passwd b/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/shadow b/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/groupmems.test b/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/groupmems.test index 346528e4..9d2388b3 100755 --- a/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/groupmems.test +++ b/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/groupmems.test @@ -21,16 +21,16 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/group b/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/group deleted file mode 100644 index 287981ed..00000000 --- a/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/group +++ /dev/null @@ -1,45 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -groupmems:x:99:myuser -utest1:x:1000: -myuser:x:424242:utest1,bin,daemon -gtest1:x:424242:utest1,bin,utmp diff --git a/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/gshadow b/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/gshadow deleted file mode 100644 index f9ba86af..00000000 --- a/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/gshadow +++ /dev/null @@ -1,45 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -groupmems:*::myuser -utest1:*:: -myuser:x::utest1,bin,daemon -gtest1:*:: diff --git a/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/passwd b/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/shadow b/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/groupmems.test b/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/groupmems.test index 03c432b1..33e4fc43 100755 --- a/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/groupmems.test +++ b/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/groupmems.test @@ -21,16 +21,16 @@ echo -n "myuser will call groupmems..." echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/group b/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/group deleted file mode 100644 index bd6da4e7..00000000 --- a/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/group +++ /dev/null @@ -1,44 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -groupmems:x:99:myuser -utest1:x:1000: -myuser:x:424242:utest1,bin,daemon diff --git a/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/gshadow b/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/gshadow deleted file mode 100644 index 02b9401d..00000000 --- a/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/gshadow +++ /dev/null @@ -1,44 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -groupmems:*::myuser -utest1:*:: -myuser:x::utest1,bin,daemon diff --git a/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/passwd b/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/shadow b/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/groupmems.test b/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/groupmems.test index d4e9af15..58f09cd7 100755 --- a/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/groupmems.test +++ b/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/groupmems.test @@ -27,16 +27,16 @@ echo "OK" rm -f /etc/group.lock echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/group b/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/group deleted file mode 100644 index bd6da4e7..00000000 --- a/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/group +++ /dev/null @@ -1,44 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -groupmems:x:99:myuser -utest1:x:1000: -myuser:x:424242:utest1,bin,daemon diff --git a/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/gshadow b/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/gshadow deleted file mode 100644 index 02b9401d..00000000 --- a/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/gshadow +++ /dev/null @@ -1,44 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -groupmems:*::myuser -utest1:*:: -myuser:x::utest1,bin,daemon diff --git a/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/passwd b/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/shadow b/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/groupmems.test b/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/groupmems.test index e908ff60..a01a10e8 100755 --- a/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/groupmems.test +++ b/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/groupmems.test @@ -27,16 +27,16 @@ echo "OK" rm -f /etc/gshadow.lock echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/group b/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/group deleted file mode 100644 index 7505b93b..00000000 --- a/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/group +++ /dev/null @@ -1,44 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -groupmems:x:99:myuser -utest1:x:1000: -myuser:x:424242: diff --git a/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/gshadow b/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/gshadow deleted file mode 100644 index 9945adca..00000000 --- a/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/gshadow +++ /dev/null @@ -1,44 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -groupmems:*::myuser -utest1:*:: -myuser:x:: diff --git a/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/passwd b/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/shadow b/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/groupmems.test b/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/groupmems.test index d6840844..302b6897 100755 --- a/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/groupmems.test +++ b/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/groupmems.test @@ -27,16 +27,16 @@ echo "OK" rm -f /etc/group.lock echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/group b/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/group deleted file mode 100644 index 7505b93b..00000000 --- a/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/group +++ /dev/null @@ -1,44 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -groupmems:x:99:myuser -utest1:x:1000: -myuser:x:424242: diff --git a/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/gshadow b/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/gshadow deleted file mode 100644 index 9945adca..00000000 --- a/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/gshadow +++ /dev/null @@ -1,44 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -groupmems:*::myuser -utest1:*:: -myuser:x:: diff --git a/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/passwd b/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/shadow b/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/groupmems.test b/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/groupmems.test index 97133e80..38ac7a2f 100755 --- a/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/groupmems.test +++ b/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/groupmems.test @@ -27,16 +27,16 @@ echo "OK" rm -f /etc/gshadow.lock echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/group b/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/group deleted file mode 100644 index 7a0e2955..00000000 --- a/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/group +++ /dev/null @@ -1,44 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -groupmems:x:99:myuser -utest1:x:1000: -myuser:x:424242:utest1 diff --git a/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/gshadow b/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/gshadow deleted file mode 100644 index c908c394..00000000 --- a/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/gshadow +++ /dev/null @@ -1,44 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -groupmems:*::myuser -utest1:*:: -myuser:x::utest1 diff --git a/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/passwd b/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/shadow b/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/groupmems.test b/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/groupmems.test index 50265735..cfb86996 100755 --- a/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/groupmems.test +++ b/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/groupmems.test @@ -27,16 +27,16 @@ echo "OK" rm -f /etc/group.lock echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/group b/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/group deleted file mode 100644 index 7a0e2955..00000000 --- a/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/group +++ /dev/null @@ -1,44 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -groupmems:x:99:myuser -utest1:x:1000: -myuser:x:424242:utest1 diff --git a/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/gshadow b/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/gshadow deleted file mode 100644 index c908c394..00000000 --- a/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/gshadow +++ /dev/null @@ -1,44 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -groupmems:*::myuser -utest1:*:: -myuser:x::utest1 diff --git a/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/passwd b/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/shadow b/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/groupmems.test b/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/groupmems.test index 538bb43b..c2b5626e 100755 --- a/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/groupmems.test +++ b/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/groupmems.test @@ -27,16 +27,16 @@ echo "OK" rm -f /etc/gshadow.lock echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/group b/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/group deleted file mode 100644 index 7a0e2955..00000000 --- a/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/group +++ /dev/null @@ -1,44 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -groupmems:x:99:myuser -utest1:x:1000: -myuser:x:424242:utest1 diff --git a/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/gshadow b/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/gshadow deleted file mode 100644 index c908c394..00000000 --- a/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/gshadow +++ /dev/null @@ -1,44 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -groupmems:*::myuser -utest1:*:: -myuser:x::utest1 diff --git a/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/passwd b/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/shadow b/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/groupmems.test b/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/groupmems.test index f0d66df1..75272b3a 100755 --- a/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/groupmems.test +++ b/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/groupmems.test @@ -27,16 +27,16 @@ echo "OK" rm -f /etc/group.lock echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/group b/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/group deleted file mode 100644 index 7a0e2955..00000000 --- a/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/group +++ /dev/null @@ -1,44 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -groupmems:x:99:myuser -utest1:x:1000: -myuser:x:424242:utest1 diff --git a/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/gshadow b/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/gshadow deleted file mode 100644 index c908c394..00000000 --- a/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/gshadow +++ /dev/null @@ -1,44 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -groupmems:*::myuser -utest1:*:: -myuser:x::utest1 diff --git a/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/passwd b/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/passwd deleted file mode 100644 index df9b7a07..00000000 --- a/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -utest1:x:1000:1000::/tmp:/bin/sh -myuser:x:424242:424242::/home:/bin/bash diff --git a/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/shadow b/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/shadow deleted file mode 100644 index 65079bb1..00000000 --- a/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -utest1:!:12977:0:99999:7::: -myuser:$1$yQnIAZWV$gDAMB2IkqaONgrQiRdo4y.:12991:0:99999:7::: diff --git a/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/groupmems.test b/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/groupmems.test index 7eba2885..ecff63f3 100755 --- a/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/groupmems.test +++ b/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/groupmems.test @@ -27,16 +27,16 @@ echo "OK" rm -f /etc/gshadow.lock echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmod/01_groupmod_change_gid/data/gshadow b/tests/grouptools/groupmod/01_groupmod_change_gid/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/grouptools/groupmod/01_groupmod_change_gid/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/groupmod/01_groupmod_change_gid/data/passwd b/tests/grouptools/groupmod/01_groupmod_change_gid/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupmod/01_groupmod_change_gid/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupmod/01_groupmod_change_gid/data/shadow b/tests/grouptools/groupmod/01_groupmod_change_gid/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/01_groupmod_change_gid/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/01_groupmod_change_gid/groupmod.test b/tests/grouptools/groupmod/01_groupmod_change_gid/groupmod.test index 6668e5eb..5c32e0bb 100755 --- a/tests/grouptools/groupmod/01_groupmod_change_gid/groupmod.test +++ b/tests/grouptools/groupmod/01_groupmod_change_gid/groupmod.test @@ -21,16 +21,16 @@ groupmod -g 1001 foo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/data/gshadow b/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/data/shadow b/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/groupmod.test b/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/groupmod.test index 3bb49ad7..f92fc522 100755 --- a/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/groupmod.test +++ b/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/groupmod.test @@ -27,10 +27,10 @@ echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data/gshadow b/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data/passwd b/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data/shadow b/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/groupmod.test b/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/groupmod.test index 3a9f3c1d..4b327c52 100755 --- a/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/groupmod.test +++ b/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/groupmod.test @@ -21,16 +21,16 @@ groupmod -g 1001 foo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/data/passwd b/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/data/shadow b/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/groupmod.test b/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/groupmod.test index a328f81e..6ba1e5ef 100755 --- a/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/groupmod.test +++ b/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/groupmod.test @@ -24,13 +24,13 @@ groupmod -g 1001 foo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." test ! -f /etc/gshadow diff --git a/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data/gshadow b/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data/gshadow deleted file mode 100644 index d8aa8adc..00000000 --- a/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data/gshadow +++ /dev/null @@ -1,43 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: -bar:*:: diff --git a/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data/passwd b/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data/shadow b/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/groupmod.test b/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/groupmod.test index 5f0a819d..51f92a7b 100755 --- a/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/groupmod.test +++ b/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/groupmod.test @@ -21,16 +21,16 @@ groupmod -g 1001 -o foo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmod/06_groupmod_change_group_name/data/passwd b/tests/grouptools/groupmod/06_groupmod_change_group_name/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupmod/06_groupmod_change_group_name/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupmod/06_groupmod_change_group_name/data/shadow b/tests/grouptools/groupmod/06_groupmod_change_group_name/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/06_groupmod_change_group_name/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/06_groupmod_change_group_name/groupmod.test b/tests/grouptools/groupmod/06_groupmod_change_group_name/groupmod.test index d4d1fc5f..cb567a87 100755 --- a/tests/grouptools/groupmod/06_groupmod_change_group_name/groupmod.test +++ b/tests/grouptools/groupmod/06_groupmod_change_group_name/groupmod.test @@ -21,13 +21,13 @@ groupmod -n bar foo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data/gshadow b/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data/passwd b/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data/shadow b/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/groupmod.test b/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/groupmod.test index b2f5f207..65391ba7 100755 --- a/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/groupmod.test +++ b/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/groupmod.test @@ -21,16 +21,16 @@ groupmod -n bar foo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/data/passwd b/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/data/shadow b/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/groupmod.test b/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/groupmod.test index 8cc1e1bb..dee0d5b5 100755 --- a/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/groupmod.test +++ b/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/groupmod.test @@ -24,13 +24,13 @@ groupmod -n bar foo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." test ! -f /etc/gshadow diff --git a/tests/grouptools/groupmod/09_groupmod_set_password/data/group b/tests/grouptools/groupmod/09_groupmod_set_password/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/grouptools/groupmod/09_groupmod_set_password/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/groupmod/09_groupmod_set_password/data/passwd b/tests/grouptools/groupmod/09_groupmod_set_password/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupmod/09_groupmod_set_password/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupmod/09_groupmod_set_password/data/shadow b/tests/grouptools/groupmod/09_groupmod_set_password/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/09_groupmod_set_password/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/09_groupmod_set_password/groupmod.test b/tests/grouptools/groupmod/09_groupmod_set_password/groupmod.test index 164c4c97..dd2b4006 100755 --- a/tests/grouptools/groupmod/09_groupmod_set_password/groupmod.test +++ b/tests/grouptools/groupmod/09_groupmod_set_password/groupmod.test @@ -21,13 +21,13 @@ groupmod -p foopassw foo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data/group b/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data/passwd b/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data/shadow b/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/groupmod.test b/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/groupmod.test index 7d692111..01a7d460 100755 --- a/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/groupmod.test +++ b/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/groupmod.test @@ -21,13 +21,13 @@ groupmod -p foopassw foo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/data/passwd b/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/data/shadow b/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/groupmod.test b/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/groupmod.test index e63a5f74..44597ad6 100755 --- a/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/groupmod.test +++ b/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/groupmod.test @@ -24,13 +24,13 @@ groupmod -p foopassw foo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." test ! -f /etc/gshadow diff --git a/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/group b/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/gshadow b/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/passwd b/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/shadow b/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/groupmod.test b/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/groupmod.test index e5179a4b..4c7f4771 100755 --- a/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/groupmod.test +++ b/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/groupmod.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupmod.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/group b/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/group deleted file mode 100644 index e65d5b03..00000000 --- a/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/group +++ /dev/null @@ -1,43 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: -bar:x:1001: diff --git a/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/gshadow b/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/gshadow deleted file mode 100644 index d8aa8adc..00000000 --- a/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/gshadow +++ /dev/null @@ -1,43 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: -bar:*:: diff --git a/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/passwd b/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/shadow b/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/groupmod.test b/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/groupmod.test index 41f955aa..9ce5bfeb 100755 --- a/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/groupmod.test +++ b/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/groupmod.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupmod.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/group b/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/group deleted file mode 100644 index e65d5b03..00000000 --- a/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/group +++ /dev/null @@ -1,43 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: -bar:x:1001: diff --git a/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/gshadow b/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/gshadow deleted file mode 100644 index d8aa8adc..00000000 --- a/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/gshadow +++ /dev/null @@ -1,43 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: -bar:*:: diff --git a/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/passwd b/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/shadow b/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/groupmod.test b/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/groupmod.test index 1112062a..1245a9d8 100755 --- a/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/groupmod.test +++ b/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/groupmod.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupmod.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/group b/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/group deleted file mode 100644 index e65d5b03..00000000 --- a/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/group +++ /dev/null @@ -1,43 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: -bar:x:1001: diff --git a/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/gshadow b/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/gshadow deleted file mode 100644 index d8aa8adc..00000000 --- a/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/gshadow +++ /dev/null @@ -1,43 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: -bar:*:: diff --git a/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/passwd b/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/shadow b/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/groupmod.test b/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/groupmod.test index 9008be49..f326d1d5 100755 --- a/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/groupmod.test +++ b/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/groupmod.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupmod.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/group b/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/gshadow b/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/passwd b/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/shadow b/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/groupmod.test b/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/groupmod.test index 0fa4bd01..f9a35197 100755 --- a/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/groupmod.test +++ b/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/groupmod.test @@ -21,16 +21,16 @@ groupmod -n foo foo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/group b/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/gshadow b/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/passwd b/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/shadow b/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/groupmod.test b/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/groupmod.test index ddce06fd..21a0a1bc 100755 --- a/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/groupmod.test +++ b/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/groupmod.test @@ -42,16 +42,16 @@ echo "error message OK." rm -f tmp/groupmod.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/gshadow b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/passwd b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/shadow b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/groupmod.test b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/groupmod.test index c4463a38..60b4c4f2 100755 --- a/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/groupmod.test +++ b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/groupmod.test @@ -29,16 +29,16 @@ rm -f /etc/gshadow.lock echo "done" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/group b/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/gshadow b/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/passwd b/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/shadow b/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/groupmod.test b/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/groupmod.test index 3dad6d24..d3ae0a17 100755 --- a/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/groupmod.test +++ b/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/groupmod.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupmod.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/group b/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/gshadow b/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/passwd b/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/shadow b/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/groupmod.test b/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/groupmod.test index 966fe79b..cc583b9f 100755 --- a/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/groupmod.test +++ b/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/groupmod.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupmod.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/group b/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/gshadow b/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/passwd b/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/shadow b/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/groupmod.test b/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/groupmod.test index 9b0f8add..bcfbb64c 100755 --- a/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/groupmod.test +++ b/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/groupmod.test @@ -42,16 +42,16 @@ echo "error message OK." rm -f tmp/groupmod.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/data/passwd b/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/data/shadow b/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/groupmod.test b/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/groupmod.test index 8687bbc0..612ac24e 100755 --- a/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/groupmod.test +++ b/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/groupmod.test @@ -21,13 +21,13 @@ groupmod -g 1001 -n foo2 foo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/data/shadow b/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/groupmod.test b/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/groupmod.test index 03f59759..5f1c0f82 100755 --- a/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/groupmod.test +++ b/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/groupmod.test @@ -27,7 +27,7 @@ echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/group b/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/gshadow b/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/passwd b/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/shadow b/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/groupmod.test b/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/groupmod.test index c93b7f2a..a07c6a16 100755 --- a/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/groupmod.test +++ b/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/groupmod.test @@ -42,16 +42,16 @@ echo "error message OK." rm -f tmp/groupmod.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/group b/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/gshadow b/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/passwd b/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/shadow b/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/groupmod.test b/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/groupmod.test index 486ee08c..b56d14c1 100755 --- a/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/groupmod.test +++ b/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/groupmod.test @@ -42,16 +42,16 @@ echo "error message OK." rm -f tmp/groupmod.err echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/data/passwd b/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/data/shadow b/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/groupmod.test b/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/groupmod.test index b3b8315d..d0831fd3 100755 --- a/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/groupmod.test +++ b/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/groupmod.test @@ -29,13 +29,13 @@ rm -f /etc/passwd.lock echo "done" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/data/passwd b/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/data/shadow b/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/groupmod.test b/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/groupmod.test index c929118a..f8994209 100755 --- a/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/groupmod.test +++ b/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/groupmod.test @@ -21,13 +21,13 @@ groupmod -n bar -g 1000 foo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/group b/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/gshadow b/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/passwd b/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/shadow b/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/groupmod.test b/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/groupmod.test index eccc7d8d..976476cd 100755 --- a/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/groupmod.test +++ b/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/groupmod.test @@ -21,16 +21,16 @@ groupmod -n foo -g 1000 foo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/group b/tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/group deleted file mode 100644 index fecba0c4..00000000 --- a/tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/gshadow b/tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/passwd b/tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/shadow b/tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/31_groupmod_-g_same_gid/groupmod.test b/tests/grouptools/groupmod/31_groupmod_-g_same_gid/groupmod.test index 62398df0..95262ef6 100755 --- a/tests/grouptools/groupmod/31_groupmod_-g_same_gid/groupmod.test +++ b/tests/grouptools/groupmod/31_groupmod_-g_same_gid/groupmod.test @@ -21,16 +21,16 @@ groupmod -g 1000 foo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../../common/compare_file.pl data/group /etc/group +../../../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 +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../../common/compare_file.pl data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/data/passwd b/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/data/shadow b/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/data/shadow deleted file mode 100644 index 5f50d187..00000000 --- a/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/groupmod.test b/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/groupmod.test index e63a5f74..44597ad6 100755 --- a/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/groupmod.test +++ b/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/groupmod.test @@ -24,13 +24,13 @@ groupmod -p foopassw foo echo "OK" echo -n "Check the passwd file..." -../../../common/compare_file.pl data/passwd /etc/passwd +../../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../../common/compare_file.pl data/shadow /etc/shadow +../../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." test ! -f /etc/gshadow diff --git a/tests/newusers/02_update_password/data/group b/tests/newusers/02_update_password/data/group deleted file mode 100644 index 555c889c..00000000 --- a/tests/newusers/02_update_password/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:65535:foo diff --git a/tests/newusers/02_update_password/data/gshadow b/tests/newusers/02_update_password/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/newusers/02_update_password/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/newusers/02_update_password/data/passwd b/tests/newusers/02_update_password/data/passwd deleted file mode 100644 index 9de3b249..00000000 --- a/tests/newusers/02_update_password/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:65535:65535:User Foo - Gecos Field::/bin/sh diff --git a/tests/newusers/02_update_password/newusers.test b/tests/newusers/02_update_password/newusers.test index e7661d15..17d08e2c 100755 --- a/tests/newusers/02_update_password/newusers.test +++ b/tests/newusers/02_update_password/newusers.test @@ -19,16 +19,16 @@ change_config newusers data/newusers.list echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/newusers/03_no_update_pid/data/group b/tests/newusers/03_no_update_pid/data/group deleted file mode 100644 index 555c889c..00000000 --- a/tests/newusers/03_no_update_pid/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:65535:foo diff --git a/tests/newusers/03_no_update_pid/data/gshadow b/tests/newusers/03_no_update_pid/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/newusers/03_no_update_pid/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/newusers/03_no_update_pid/data/passwd b/tests/newusers/03_no_update_pid/data/passwd deleted file mode 100644 index 9de3b249..00000000 --- a/tests/newusers/03_no_update_pid/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:65535:65535:User Foo - Gecos Field::/bin/sh diff --git a/tests/newusers/03_no_update_pid/newusers.test b/tests/newusers/03_no_update_pid/newusers.test index 8fedd5ff..5e599246 100755 --- a/tests/newusers/03_no_update_pid/newusers.test +++ b/tests/newusers/03_no_update_pid/newusers.test @@ -19,16 +19,16 @@ change_config newusers data/newusers.list echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/newusers/04_no_update_gid/data/group b/tests/newusers/04_no_update_gid/data/group deleted file mode 100644 index 555c889c..00000000 --- a/tests/newusers/04_no_update_gid/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:65535:foo diff --git a/tests/newusers/04_no_update_gid/data/gshadow b/tests/newusers/04_no_update_gid/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/newusers/04_no_update_gid/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/newusers/04_no_update_gid/data/passwd b/tests/newusers/04_no_update_gid/data/passwd deleted file mode 100644 index 9de3b249..00000000 --- a/tests/newusers/04_no_update_gid/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:65535:65535:User Foo - Gecos Field::/bin/sh diff --git a/tests/newusers/04_no_update_gid/newusers.test b/tests/newusers/04_no_update_gid/newusers.test index cdd88223..c1dabfa9 100755 --- a/tests/newusers/04_no_update_gid/newusers.test +++ b/tests/newusers/04_no_update_gid/newusers.test @@ -19,16 +19,16 @@ change_config newusers data/newusers.list echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/newusers/10_create_user_gid-as-group-bar/data/group b/tests/newusers/10_create_user_gid-as-group-bar/data/group deleted file mode 100644 index 4e6b697b..00000000 --- a/tests/newusers/10_create_user_gid-as-group-bar/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -bar:x:1043: diff --git a/tests/newusers/10_create_user_gid-as-group-bar/data/gshadow b/tests/newusers/10_create_user_gid-as-group-bar/data/gshadow deleted file mode 100644 index 0586f95b..00000000 --- a/tests/newusers/10_create_user_gid-as-group-bar/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -bar:x:: diff --git a/tests/newusers/10_create_user_gid-as-group-bar/newusers.test b/tests/newusers/10_create_user_gid-as-group-bar/newusers.test index d441a033..ba852a4f 100755 --- a/tests/newusers/10_create_user_gid-as-group-bar/newusers.test +++ b/tests/newusers/10_create_user_gid-as-group-bar/newusers.test @@ -22,13 +22,13 @@ echo -n "Check the passwd file..." ../../common/compare_file.pl data/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/newusers/11_update_gecos/data/group b/tests/newusers/11_update_gecos/data/group deleted file mode 100644 index 555c889c..00000000 --- a/tests/newusers/11_update_gecos/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:65535:foo diff --git a/tests/newusers/11_update_gecos/data/gshadow b/tests/newusers/11_update_gecos/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/newusers/11_update_gecos/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/newusers/11_update_gecos/newusers.test b/tests/newusers/11_update_gecos/newusers.test index 0f459770..fb57724f 100755 --- a/tests/newusers/11_update_gecos/newusers.test +++ b/tests/newusers/11_update_gecos/newusers.test @@ -22,13 +22,13 @@ echo -n "Check the passwd file..." ../../common/compare_file.pl data/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/newusers/12_update_shell/data/group b/tests/newusers/12_update_shell/data/group deleted file mode 100644 index 555c889c..00000000 --- a/tests/newusers/12_update_shell/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:65535:foo diff --git a/tests/newusers/12_update_shell/data/gshadow b/tests/newusers/12_update_shell/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/newusers/12_update_shell/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/newusers/12_update_shell/newusers.test b/tests/newusers/12_update_shell/newusers.test index 77664140..aca25916 100755 --- a/tests/newusers/12_update_shell/newusers.test +++ b/tests/newusers/12_update_shell/newusers.test @@ -22,13 +22,13 @@ echo -n "Check the passwd file..." ../../common/compare_file.pl data/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/newusers/15_update_new-home/data/group b/tests/newusers/15_update_new-home/data/group deleted file mode 100644 index 555c889c..00000000 --- a/tests/newusers/15_update_new-home/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:65535:foo diff --git a/tests/newusers/15_update_new-home/data/gshadow b/tests/newusers/15_update_new-home/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/newusers/15_update_new-home/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/newusers/15_update_new-home/newusers.test b/tests/newusers/15_update_new-home/newusers.test index 26487fca..bc20ecf3 100755 --- a/tests/newusers/15_update_new-home/newusers.test +++ b/tests/newusers/15_update_new-home/newusers.test @@ -29,13 +29,13 @@ echo -n "Check the passwd file..." ../../common/compare_file.pl data/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" echo -n "Home directory was created..." diff --git a/tests/newusers/16_update_existing-home/data/group b/tests/newusers/16_update_existing-home/data/group deleted file mode 100644 index 555c889c..00000000 --- a/tests/newusers/16_update_existing-home/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:65535:foo diff --git a/tests/newusers/16_update_existing-home/data/gshadow b/tests/newusers/16_update_existing-home/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/newusers/16_update_existing-home/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/newusers/16_update_existing-home/newusers.test b/tests/newusers/16_update_existing-home/newusers.test index 0849e793..1d901fa1 100755 --- a/tests/newusers/16_update_existing-home/newusers.test +++ b/tests/newusers/16_update_existing-home/newusers.test @@ -29,13 +29,13 @@ echo -n "Check the passwd file..." ../../common/compare_file.pl data/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" echo -n "Home directory was created..." diff --git a/tests/newusers/18_create_user_gid-already-used/data/group b/tests/newusers/18_create_user_gid-already-used/data/group deleted file mode 100644 index 4e6b697b..00000000 --- a/tests/newusers/18_create_user_gid-already-used/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -bar:x:1043: diff --git a/tests/newusers/18_create_user_gid-already-used/data/gshadow b/tests/newusers/18_create_user_gid-already-used/data/gshadow deleted file mode 100644 index 0586f95b..00000000 --- a/tests/newusers/18_create_user_gid-already-used/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -bar:x:: diff --git a/tests/newusers/18_create_user_gid-already-used/newusers.test b/tests/newusers/18_create_user_gid-already-used/newusers.test index 4e60aa48..7b15be85 100755 --- a/tests/newusers/18_create_user_gid-already-used/newusers.test +++ b/tests/newusers/18_create_user_gid-already-used/newusers.test @@ -22,13 +22,13 @@ echo -n "Check the passwd file..." ../../common/compare_file.pl data/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/newusers/19_update_keep-old-home/data/group b/tests/newusers/19_update_keep-old-home/data/group deleted file mode 100644 index 555c889c..00000000 --- a/tests/newusers/19_update_keep-old-home/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:65535:foo diff --git a/tests/newusers/19_update_keep-old-home/data/gshadow b/tests/newusers/19_update_keep-old-home/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/newusers/19_update_keep-old-home/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/newusers/19_update_keep-old-home/newusers.test b/tests/newusers/19_update_keep-old-home/newusers.test index 3328f7eb..74eea457 100755 --- a/tests/newusers/19_update_keep-old-home/newusers.test +++ b/tests/newusers/19_update_keep-old-home/newusers.test @@ -31,13 +31,13 @@ echo -n "Check the passwd file..." ../../common/compare_file.pl data/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" echo -n "Home directory was created..." diff --git a/tests/newusers/23_create_user_error_negativ_UID/data/group b/tests/newusers/23_create_user_error_negativ_UID/data/group deleted file mode 100644 index 10123908..00000000 --- a/tests/newusers/23_create_user_error_negativ_UID/data/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/newusers/23_create_user_error_negativ_UID/data/gshadow b/tests/newusers/23_create_user_error_negativ_UID/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/newusers/23_create_user_error_negativ_UID/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/newusers/23_create_user_error_negativ_UID/data/passwd b/tests/newusers/23_create_user_error_negativ_UID/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/newusers/23_create_user_error_negativ_UID/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/newusers/23_create_user_error_negativ_UID/data/shadow b/tests/newusers/23_create_user_error_negativ_UID/data/shadow deleted file mode 100644 index 031ce889..00000000 --- a/tests/newusers/23_create_user_error_negativ_UID/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root::12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/newusers/23_create_user_error_negativ_UID/newusers.test b/tests/newusers/23_create_user_error_negativ_UID/newusers.test index 719e00ef..69704225 100755 --- a/tests/newusers/23_create_user_error_negativ_UID/newusers.test +++ b/tests/newusers/23_create_user_error_negativ_UID/newusers.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/newusers.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/newusers/24_create_user_error_invalid_UID/data/group b/tests/newusers/24_create_user_error_invalid_UID/data/group deleted file mode 100644 index 10123908..00000000 --- a/tests/newusers/24_create_user_error_invalid_UID/data/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/newusers/24_create_user_error_invalid_UID/data/gshadow b/tests/newusers/24_create_user_error_invalid_UID/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/newusers/24_create_user_error_invalid_UID/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/newusers/24_create_user_error_invalid_UID/data/passwd b/tests/newusers/24_create_user_error_invalid_UID/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/newusers/24_create_user_error_invalid_UID/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/newusers/24_create_user_error_invalid_UID/data/shadow b/tests/newusers/24_create_user_error_invalid_UID/data/shadow deleted file mode 100644 index 031ce889..00000000 --- a/tests/newusers/24_create_user_error_invalid_UID/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root::12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/newusers/24_create_user_error_invalid_UID/newusers.test b/tests/newusers/24_create_user_error_invalid_UID/newusers.test index 90a4ff09..33d4c8b2 100755 --- a/tests/newusers/24_create_user_error_invalid_UID/newusers.test +++ b/tests/newusers/24_create_user_error_invalid_UID/newusers.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/newusers.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/newusers/25_create_user_error_no_remaining_UID/data/group b/tests/newusers/25_create_user_error_no_remaining_UID/data/group deleted file mode 100644 index 10123908..00000000 --- a/tests/newusers/25_create_user_error_no_remaining_UID/data/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/newusers/25_create_user_error_no_remaining_UID/data/gshadow b/tests/newusers/25_create_user_error_no_remaining_UID/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/newusers/25_create_user_error_no_remaining_UID/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/newusers/25_create_user_error_no_remaining_UID/data/passwd b/tests/newusers/25_create_user_error_no_remaining_UID/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/newusers/25_create_user_error_no_remaining_UID/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/newusers/25_create_user_error_no_remaining_UID/data/shadow b/tests/newusers/25_create_user_error_no_remaining_UID/data/shadow deleted file mode 100644 index 031ce889..00000000 --- a/tests/newusers/25_create_user_error_no_remaining_UID/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root::12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/newusers/25_create_user_error_no_remaining_UID/newusers.test b/tests/newusers/25_create_user_error_no_remaining_UID/newusers.test index 75a39a82..64123888 100755 --- a/tests/newusers/25_create_user_error_no_remaining_UID/newusers.test +++ b/tests/newusers/25_create_user_error_no_remaining_UID/newusers.test @@ -37,16 +37,16 @@ echo "error message OK." rm -f tmp/newusers.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/newusers/26_create_user_error_no_remaining_GID/data/group b/tests/newusers/26_create_user_error_no_remaining_GID/data/group deleted file mode 100644 index 10123908..00000000 --- a/tests/newusers/26_create_user_error_no_remaining_GID/data/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/newusers/26_create_user_error_no_remaining_GID/data/gshadow b/tests/newusers/26_create_user_error_no_remaining_GID/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/newusers/26_create_user_error_no_remaining_GID/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/newusers/26_create_user_error_no_remaining_GID/data/passwd b/tests/newusers/26_create_user_error_no_remaining_GID/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/newusers/26_create_user_error_no_remaining_GID/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/newusers/26_create_user_error_no_remaining_GID/data/shadow b/tests/newusers/26_create_user_error_no_remaining_GID/data/shadow deleted file mode 100644 index 031ce889..00000000 --- a/tests/newusers/26_create_user_error_no_remaining_GID/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root::12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/newusers/26_create_user_error_no_remaining_GID/newusers.test b/tests/newusers/26_create_user_error_no_remaining_GID/newusers.test index 62950940..f4c9683e 100755 --- a/tests/newusers/26_create_user_error_no_remaining_GID/newusers.test +++ b/tests/newusers/26_create_user_error_no_remaining_GID/newusers.test @@ -37,16 +37,16 @@ echo "error message OK." rm -f tmp/newusers.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/newusers/27_create_user_error_invalid_username/data/group b/tests/newusers/27_create_user_error_invalid_username/data/group deleted file mode 100644 index 10123908..00000000 --- a/tests/newusers/27_create_user_error_invalid_username/data/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/newusers/27_create_user_error_invalid_username/data/gshadow b/tests/newusers/27_create_user_error_invalid_username/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/newusers/27_create_user_error_invalid_username/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/newusers/27_create_user_error_invalid_username/data/passwd b/tests/newusers/27_create_user_error_invalid_username/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/newusers/27_create_user_error_invalid_username/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/newusers/27_create_user_error_invalid_username/data/shadow b/tests/newusers/27_create_user_error_invalid_username/data/shadow deleted file mode 100644 index 031ce889..00000000 --- a/tests/newusers/27_create_user_error_invalid_username/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root::12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/newusers/27_create_user_error_invalid_username/newusers.test b/tests/newusers/27_create_user_error_invalid_username/newusers.test index 0321517b..7ba27801 100755 --- a/tests/newusers/27_create_user_error_invalid_username/newusers.test +++ b/tests/newusers/27_create_user_error_invalid_username/newusers.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/newusers.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/newusers/28_create_user_error_invalid_groupname/data/group b/tests/newusers/28_create_user_error_invalid_groupname/data/group deleted file mode 100644 index 10123908..00000000 --- a/tests/newusers/28_create_user_error_invalid_groupname/data/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/newusers/28_create_user_error_invalid_groupname/data/gshadow b/tests/newusers/28_create_user_error_invalid_groupname/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/newusers/28_create_user_error_invalid_groupname/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/newusers/28_create_user_error_invalid_groupname/data/passwd b/tests/newusers/28_create_user_error_invalid_groupname/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/newusers/28_create_user_error_invalid_groupname/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/newusers/28_create_user_error_invalid_groupname/data/shadow b/tests/newusers/28_create_user_error_invalid_groupname/data/shadow deleted file mode 100644 index 031ce889..00000000 --- a/tests/newusers/28_create_user_error_invalid_groupname/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root::12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/newusers/28_create_user_error_invalid_groupname/newusers.test b/tests/newusers/28_create_user_error_invalid_groupname/newusers.test index 915f8f79..6503bf17 100755 --- a/tests/newusers/28_create_user_error_invalid_groupname/newusers.test +++ b/tests/newusers/28_create_user_error_invalid_groupname/newusers.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/newusers.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/group b/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/group deleted file mode 100644 index 10123908..00000000 --- a/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/gshadow b/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/passwd b/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/shadow b/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/shadow deleted file mode 100644 index 031ce889..00000000 --- a/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root::12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/newusers/29_create_user_error_invalid_username_valid_groupname/newusers.test b/tests/newusers/29_create_user_error_invalid_username_valid_groupname/newusers.test index 7c8fe240..9131db77 100755 --- a/tests/newusers/29_create_user_error_invalid_username_valid_groupname/newusers.test +++ b/tests/newusers/29_create_user_error_invalid_username_valid_groupname/newusers.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/newusers.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/newusers/31_create_user_error_invalid_GID/data/group b/tests/newusers/31_create_user_error_invalid_GID/data/group deleted file mode 100644 index 10123908..00000000 --- a/tests/newusers/31_create_user_error_invalid_GID/data/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/newusers/31_create_user_error_invalid_GID/data/gshadow b/tests/newusers/31_create_user_error_invalid_GID/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/newusers/31_create_user_error_invalid_GID/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/newusers/31_create_user_error_invalid_GID/data/passwd b/tests/newusers/31_create_user_error_invalid_GID/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/newusers/31_create_user_error_invalid_GID/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/newusers/31_create_user_error_invalid_GID/data/shadow b/tests/newusers/31_create_user_error_invalid_GID/data/shadow deleted file mode 100644 index 031ce889..00000000 --- a/tests/newusers/31_create_user_error_invalid_GID/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root::12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/newusers/31_create_user_error_invalid_GID/newusers.test b/tests/newusers/31_create_user_error_invalid_GID/newusers.test index 01f0aaca..01e701e5 100755 --- a/tests/newusers/31_create_user_error_invalid_GID/newusers.test +++ b/tests/newusers/31_create_user_error_invalid_GID/newusers.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/newusers.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/newusers/32_create_user_error_gshadow_group_exists/data/group b/tests/newusers/32_create_user_error_gshadow_group_exists/data/group deleted file mode 100644 index 10123908..00000000 --- a/tests/newusers/32_create_user_error_gshadow_group_exists/data/group +++ /dev/null @@ -1,41 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: diff --git a/tests/newusers/32_create_user_error_gshadow_group_exists/data/gshadow b/tests/newusers/32_create_user_error_gshadow_group_exists/data/gshadow deleted file mode 100644 index e814af09..00000000 --- a/tests/newusers/32_create_user_error_gshadow_group_exists/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -bar:*:: diff --git a/tests/newusers/32_create_user_error_gshadow_group_exists/data/passwd b/tests/newusers/32_create_user_error_gshadow_group_exists/data/passwd deleted file mode 100644 index 43fc135a..00000000 --- a/tests/newusers/32_create_user_error_gshadow_group_exists/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/newusers/32_create_user_error_gshadow_group_exists/data/shadow b/tests/newusers/32_create_user_error_gshadow_group_exists/data/shadow deleted file mode 100644 index 031ce889..00000000 --- a/tests/newusers/32_create_user_error_gshadow_group_exists/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root::12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/newusers/32_create_user_error_gshadow_group_exists/newusers.test b/tests/newusers/32_create_user_error_gshadow_group_exists/newusers.test index e3f62fc5..40749e3b 100755 --- a/tests/newusers/32_create_user_error_gshadow_group_exists/newusers.test +++ b/tests/newusers/32_create_user_error_gshadow_group_exists/newusers.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/newusers.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/newusers/33_update_password_no_shadow_password/data/group b/tests/newusers/33_update_password_no_shadow_password/data/group deleted file mode 100644 index 555c889c..00000000 --- a/tests/newusers/33_update_password_no_shadow_password/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:65535:foo diff --git a/tests/newusers/33_update_password_no_shadow_password/data/gshadow b/tests/newusers/33_update_password_no_shadow_password/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/newusers/33_update_password_no_shadow_password/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/newusers/33_update_password_no_shadow_password/data/shadow b/tests/newusers/33_update_password_no_shadow_password/data/shadow deleted file mode 100644 index 031ce889..00000000 --- a/tests/newusers/33_update_password_no_shadow_password/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root::12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/newusers/33_update_password_no_shadow_password/newusers.test b/tests/newusers/33_update_password_no_shadow_password/newusers.test index ae78d43d..38189f78 100755 --- a/tests/newusers/33_update_password_no_shadow_password/newusers.test +++ b/tests/newusers/33_update_password_no_shadow_password/newusers.test @@ -22,13 +22,13 @@ echo -n "Check the passwd file..." ../../common/compare_file.pl data/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/newusers/34_update_password_no_shadow/data/group b/tests/newusers/34_update_password_no_shadow/data/group deleted file mode 100644 index 555c889c..00000000 --- a/tests/newusers/34_update_password_no_shadow/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:65535:foo diff --git a/tests/newusers/34_update_password_no_shadow/data/gshadow b/tests/newusers/34_update_password_no_shadow/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/newusers/34_update_password_no_shadow/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/newusers/34_update_password_no_shadow/data/shadow b/tests/newusers/34_update_password_no_shadow/data/shadow deleted file mode 100644 index 031ce889..00000000 --- a/tests/newusers/34_update_password_no_shadow/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root::12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/newusers/34_update_password_no_shadow/newusers.test b/tests/newusers/34_update_password_no_shadow/newusers.test index ee675c0d..1a9979e3 100755 --- a/tests/newusers/34_update_password_no_shadow/newusers.test +++ b/tests/newusers/34_update_password_no_shadow/newusers.test @@ -23,7 +23,7 @@ echo -n "Check the passwd file..." ../../common/compare_file.pl data/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../common/compare_file.pl config/etc/group /etc/group echo "OK" echo -n "Check the shadow file..." test ! -f /etc/shadow diff --git a/tests/newusers/38_update_password_no_shadow_encrypted/data/group b/tests/newusers/38_update_password_no_shadow_encrypted/data/group deleted file mode 100644 index 555c889c..00000000 --- a/tests/newusers/38_update_password_no_shadow_encrypted/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:65535:foo diff --git a/tests/newusers/38_update_password_no_shadow_encrypted/data/gshadow b/tests/newusers/38_update_password_no_shadow_encrypted/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/newusers/38_update_password_no_shadow_encrypted/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/newusers/38_update_password_no_shadow_encrypted/data/shadow b/tests/newusers/38_update_password_no_shadow_encrypted/data/shadow deleted file mode 100644 index 031ce889..00000000 --- a/tests/newusers/38_update_password_no_shadow_encrypted/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root::12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/newusers/39_update_password_no_shadow_password_encrypted/data/group b/tests/newusers/39_update_password_no_shadow_password_encrypted/data/group deleted file mode 100644 index 555c889c..00000000 --- a/tests/newusers/39_update_password_no_shadow_password_encrypted/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:65535:foo diff --git a/tests/newusers/39_update_password_no_shadow_password_encrypted/data/gshadow b/tests/newusers/39_update_password_no_shadow_password_encrypted/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/newusers/39_update_password_no_shadow_password_encrypted/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/newusers/39_update_password_no_shadow_password_encrypted/data/shadow b/tests/newusers/39_update_password_no_shadow_password_encrypted/data/shadow deleted file mode 100644 index 031ce889..00000000 --- a/tests/newusers/39_update_password_no_shadow_password_encrypted/data/shadow +++ /dev/null @@ -1,19 +0,0 @@ -root::12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: diff --git a/tests/newusers/40_update_password_encrypted/data/group b/tests/newusers/40_update_password_encrypted/data/group deleted file mode 100644 index 555c889c..00000000 --- a/tests/newusers/40_update_password_encrypted/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:65535:foo diff --git a/tests/newusers/40_update_password_encrypted/data/gshadow b/tests/newusers/40_update_password_encrypted/data/gshadow deleted file mode 100644 index ae424865..00000000 --- a/tests/newusers/40_update_password_encrypted/data/gshadow +++ /dev/null @@ -1,41 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: diff --git a/tests/newusers/40_update_password_encrypted/data/passwd b/tests/newusers/40_update_password_encrypted/data/passwd deleted file mode 100644 index 9de3b249..00000000 --- a/tests/newusers/40_update_password_encrypted/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:65535:65535:User Foo - Gecos Field::/bin/sh diff --git a/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/group b/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/group deleted file mode 100644 index bdc82974..00000000 --- a/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/group +++ /dev/null @@ -1,46 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:pass1:999:foo1,foo2 -foo:pass2:999:foo3 -foo1:x:1000: -foo2:x:1001: -foo3:x:1002: diff --git a/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/gshadow b/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/gshadow deleted file mode 100644 index 39460afe..00000000 --- a/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/gshadow +++ /dev/null @@ -1,45 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*::foo1,foo2,foo3 -foo1:*:: -foo2:*:: -foo3:!:: diff --git a/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/passwd b/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/passwd deleted file mode 100644 index 6a6f62f3..00000000 --- a/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/passwd +++ /dev/null @@ -1,22 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo1:x:1000:1000:::/bin/false -foo2:x:1001:1001:::/bin/false -foo3:x:1002:1002::/home/foo3:/bin/sh diff --git a/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/shadow b/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/shadow deleted file mode 100644 index 81582a0c..00000000 --- a/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/shadow +++ /dev/null @@ -1,22 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo1:!:12977:0:99999:7::: -foo2:!:12977:0:99999:7::: -foo3:!:13946:0:99999:7::: diff --git a/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/useradd.test b/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/useradd.test index 7538b657..165e47d0 100755 --- a/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/useradd.test +++ b/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/useradd.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/useradd.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/group b/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/group deleted file mode 100644 index 792c688e..00000000 --- a/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/group +++ /dev/null @@ -1,46 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:pass:998:foo1,foo2 -foo:pass:999:foo3 -foo1:x:1000: -foo2:x:1001: -foo3:x:1002: diff --git a/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/gshadow b/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/gshadow deleted file mode 100644 index 39460afe..00000000 --- a/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/gshadow +++ /dev/null @@ -1,45 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*::foo1,foo2,foo3 -foo1:*:: -foo2:*:: -foo3:!:: diff --git a/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/passwd b/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/passwd deleted file mode 100644 index 6a6f62f3..00000000 --- a/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/passwd +++ /dev/null @@ -1,22 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo1:x:1000:1000:::/bin/false -foo2:x:1001:1001:::/bin/false -foo3:x:1002:1002::/home/foo3:/bin/sh diff --git a/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/shadow b/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/shadow deleted file mode 100644 index 81582a0c..00000000 --- a/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/shadow +++ /dev/null @@ -1,22 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo1:!:12977:0:99999:7::: -foo2:!:12977:0:99999:7::: -foo3:!:13946:0:99999:7::: diff --git a/tests/split_groups/06_useradd_split_group_already_split_GID_differ/useradd.test b/tests/split_groups/06_useradd_split_group_already_split_GID_differ/useradd.test index a443eab2..970d10cf 100755 --- a/tests/split_groups/06_useradd_split_group_already_split_GID_differ/useradd.test +++ b/tests/split_groups/06_useradd_split_group_already_split_GID_differ/useradd.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/useradd.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/split_groups/08_useradd_no_split_group_already_split/data/group b/tests/split_groups/08_useradd_no_split_group_already_split/data/group deleted file mode 100644 index f7d6d122..00000000 --- a/tests/split_groups/08_useradd_no_split_group_already_split/data/group +++ /dev/null @@ -1,46 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:999:foo1,foo2 -foo:x:999:foo3 -foo1:x:1000: -foo2:x:1001: -foo3:x:1002: diff --git a/tests/split_groups/08_useradd_no_split_group_already_split/data/gshadow b/tests/split_groups/08_useradd_no_split_group_already_split/data/gshadow deleted file mode 100644 index 39460afe..00000000 --- a/tests/split_groups/08_useradd_no_split_group_already_split/data/gshadow +++ /dev/null @@ -1,45 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*::foo1,foo2,foo3 -foo1:*:: -foo2:*:: -foo3:!:: diff --git a/tests/split_groups/08_useradd_no_split_group_already_split/data/passwd b/tests/split_groups/08_useradd_no_split_group_already_split/data/passwd deleted file mode 100644 index 6a6f62f3..00000000 --- a/tests/split_groups/08_useradd_no_split_group_already_split/data/passwd +++ /dev/null @@ -1,22 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo1:x:1000:1000:::/bin/false -foo2:x:1001:1001:::/bin/false -foo3:x:1002:1002::/home/foo3:/bin/sh diff --git a/tests/split_groups/08_useradd_no_split_group_already_split/data/shadow b/tests/split_groups/08_useradd_no_split_group_already_split/data/shadow deleted file mode 100644 index 81582a0c..00000000 --- a/tests/split_groups/08_useradd_no_split_group_already_split/data/shadow +++ /dev/null @@ -1,22 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo1:!:12977:0:99999:7::: -foo2:!:12977:0:99999:7::: -foo3:!:13946:0:99999:7::: diff --git a/tests/split_groups/08_useradd_no_split_group_already_split/useradd.test b/tests/split_groups/08_useradd_no_split_group_already_split/useradd.test index 07f682a8..055dec9f 100755 --- a/tests/split_groups/08_useradd_no_split_group_already_split/useradd.test +++ b/tests/split_groups/08_useradd_no_split_group_already_split/useradd.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/useradd.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/split_groups/09_groupdel_split_group_already_split/data/passwd b/tests/split_groups/09_groupdel_split_group_already_split/data/passwd deleted file mode 100644 index 6a6f62f3..00000000 --- a/tests/split_groups/09_groupdel_split_group_already_split/data/passwd +++ /dev/null @@ -1,22 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo1:x:1000:1000:::/bin/false -foo2:x:1001:1001:::/bin/false -foo3:x:1002:1002::/home/foo3:/bin/sh diff --git a/tests/split_groups/09_groupdel_split_group_already_split/data/shadow b/tests/split_groups/09_groupdel_split_group_already_split/data/shadow deleted file mode 100644 index 81582a0c..00000000 --- a/tests/split_groups/09_groupdel_split_group_already_split/data/shadow +++ /dev/null @@ -1,22 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo1:!:12977:0:99999:7::: -foo2:!:12977:0:99999:7::: -foo3:!:13946:0:99999:7::: diff --git a/tests/split_groups/09_groupdel_split_group_already_split/groupdel.test b/tests/split_groups/09_groupdel_split_group_already_split/groupdel.test index 8e4dd976..0789a2ec 100755 --- a/tests/split_groups/09_groupdel_split_group_already_split/groupdel.test +++ b/tests/split_groups/09_groupdel_split_group_already_split/groupdel.test @@ -21,13 +21,13 @@ groupdel foo echo "OK" echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../common/compare_file.pl data/shadow /etc/shadow +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/split_groups/10_groupdel_no_split_group_already_split/data/group b/tests/split_groups/10_groupdel_no_split_group_already_split/data/group deleted file mode 100644 index f7d6d122..00000000 --- a/tests/split_groups/10_groupdel_no_split_group_already_split/data/group +++ /dev/null @@ -1,46 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100: -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:999:foo1,foo2 -foo:x:999:foo3 -foo1:x:1000: -foo2:x:1001: -foo3:x:1002: diff --git a/tests/split_groups/10_groupdel_no_split_group_already_split/data/gshadow b/tests/split_groups/10_groupdel_no_split_group_already_split/data/gshadow deleted file mode 100644 index 39460afe..00000000 --- a/tests/split_groups/10_groupdel_no_split_group_already_split/data/gshadow +++ /dev/null @@ -1,45 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*::foo1,foo2,foo3 -foo1:*:: -foo2:*:: -foo3:!:: diff --git a/tests/split_groups/10_groupdel_no_split_group_already_split/data/passwd b/tests/split_groups/10_groupdel_no_split_group_already_split/data/passwd deleted file mode 100644 index 6a6f62f3..00000000 --- a/tests/split_groups/10_groupdel_no_split_group_already_split/data/passwd +++ /dev/null @@ -1,22 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo1:x:1000:1000:::/bin/false -foo2:x:1001:1001:::/bin/false -foo3:x:1002:1002::/home/foo3:/bin/sh diff --git a/tests/split_groups/10_groupdel_no_split_group_already_split/data/shadow b/tests/split_groups/10_groupdel_no_split_group_already_split/data/shadow deleted file mode 100644 index 81582a0c..00000000 --- a/tests/split_groups/10_groupdel_no_split_group_already_split/data/shadow +++ /dev/null @@ -1,22 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo1:!:12977:0:99999:7::: -foo2:!:12977:0:99999:7::: -foo3:!:13946:0:99999:7::: diff --git a/tests/split_groups/10_groupdel_no_split_group_already_split/data/useradd.err b/tests/split_groups/10_groupdel_no_split_group_already_split/data/useradd.err deleted file mode 100644 index c9a6e546..00000000 --- a/tests/split_groups/10_groupdel_no_split_group_already_split/data/useradd.err +++ /dev/null @@ -1,2 +0,0 @@ -Multiple entries named 'foo' in /etc/group. Please fix this with pwck or grpck. -useradd: error adding new group entry diff --git a/tests/split_groups/10_groupdel_no_split_group_already_split/groupdel.test b/tests/split_groups/10_groupdel_no_split_group_already_split/groupdel.test index 6f2021dd..b1086b60 100755 --- a/tests/split_groups/10_groupdel_no_split_group_already_split/groupdel.test +++ b/tests/split_groups/10_groupdel_no_split_group_already_split/groupdel.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/groupdel.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/usertools/11_usermod_move_homedir/data/group b/tests/usertools/11_usermod_move_homedir/data/group deleted file mode 100644 index 50518255..00000000 --- a/tests/usertools/11_usermod_move_homedir/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/usertools/11_usermod_move_homedir/data/gshadow b/tests/usertools/11_usermod_move_homedir/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/usertools/11_usermod_move_homedir/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/usertools/11_usermod_move_homedir/data/shadow b/tests/usertools/11_usermod_move_homedir/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/usertools/11_usermod_move_homedir/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/usertools/11_usermod_move_homedir/usermod.test b/tests/usertools/11_usermod_move_homedir/usermod.test index 07618e60..b0ebf5c8 100755 --- a/tests/usertools/11_usermod_move_homedir/usermod.test +++ b/tests/usertools/11_usermod_move_homedir/usermod.test @@ -28,13 +28,13 @@ echo -n "Check the passwd file..." ../../common/compare_file.pl data/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" echo -n "Check the user's home directory was removed..." test ! -d /home/foo diff --git a/tests/usertools/12_usermod_move_homedir_dev_null/data/group b/tests/usertools/12_usermod_move_homedir_dev_null/data/group deleted file mode 100644 index 50518255..00000000 --- a/tests/usertools/12_usermod_move_homedir_dev_null/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/usertools/12_usermod_move_homedir_dev_null/data/gshadow b/tests/usertools/12_usermod_move_homedir_dev_null/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/usertools/12_usermod_move_homedir_dev_null/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/usertools/12_usermod_move_homedir_dev_null/data/shadow b/tests/usertools/12_usermod_move_homedir_dev_null/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/usertools/12_usermod_move_homedir_dev_null/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/usertools/12_usermod_move_homedir_dev_null/usermod.test b/tests/usertools/12_usermod_move_homedir_dev_null/usermod.test index 15a0198b..c0ce1c14 100755 --- a/tests/usertools/12_usermod_move_homedir_dev_null/usermod.test +++ b/tests/usertools/12_usermod_move_homedir_dev_null/usermod.test @@ -42,13 +42,13 @@ echo -n "Check the passwd file..." ../../common/compare_file.pl data/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" echo -n "Make sure /dev/null was not removed..." test -c /dev/null diff --git a/tests/usertools/13_usermod_move_homedir_file/data/group b/tests/usertools/13_usermod_move_homedir_file/data/group deleted file mode 100644 index 50518255..00000000 --- a/tests/usertools/13_usermod_move_homedir_file/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/usertools/13_usermod_move_homedir_file/data/gshadow b/tests/usertools/13_usermod_move_homedir_file/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/usertools/13_usermod_move_homedir_file/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/usertools/13_usermod_move_homedir_file/data/shadow b/tests/usertools/13_usermod_move_homedir_file/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/usertools/13_usermod_move_homedir_file/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/usertools/13_usermod_move_homedir_file/usermod.test b/tests/usertools/13_usermod_move_homedir_file/usermod.test index 65103e5a..2df56e05 100755 --- a/tests/usertools/13_usermod_move_homedir_file/usermod.test +++ b/tests/usertools/13_usermod_move_homedir_file/usermod.test @@ -44,13 +44,13 @@ echo -n "Check the passwd file..." ../../common/compare_file.pl data/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" echo -n "Check /home/foo was not removed..." test -f /home/foo diff --git a/tests/usertools/14_usermod_move_homedir_other_device/data/group b/tests/usertools/14_usermod_move_homedir_other_device/data/group deleted file mode 100644 index 50518255..00000000 --- a/tests/usertools/14_usermod_move_homedir_other_device/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/usertools/14_usermod_move_homedir_other_device/data/gshadow b/tests/usertools/14_usermod_move_homedir_other_device/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/usertools/14_usermod_move_homedir_other_device/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/usertools/14_usermod_move_homedir_other_device/data/shadow b/tests/usertools/14_usermod_move_homedir_other_device/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/usertools/14_usermod_move_homedir_other_device/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/usertools/14_usermod_move_homedir_other_device/usermod.test b/tests/usertools/14_usermod_move_homedir_other_device/usermod.test index b1cd71c1..e595ed32 100755 --- a/tests/usertools/14_usermod_move_homedir_other_device/usermod.test +++ b/tests/usertools/14_usermod_move_homedir_other_device/usermod.test @@ -35,13 +35,13 @@ echo -n "Check the passwd file..." ../../common/compare_file.pl data/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" echo -n "Check the user's home directory was removed..." test ! -d /home/foo diff --git a/tests/usertools/15_usermod_change_supplementary_groups/data/home_ls-a b/tests/usertools/15_usermod_change_supplementary_groups/data/home_ls-a deleted file mode 100644 index 89bbbd9a..00000000 --- a/tests/usertools/15_usermod_change_supplementary_groups/data/home_ls-a +++ /dev/null @@ -1,3 +0,0 @@ --rw-r--r-- foo:foo `/home/foo2/toto' -drwxr-xr-x foo:foo `/home/foo2/.' -drwxr-xr-x root:root `/home/foo2/..' diff --git a/tests/usertools/15_usermod_change_supplementary_groups/data/passwd b/tests/usertools/15_usermod_change_supplementary_groups/data/passwd deleted file mode 100644 index bf52df00..00000000 --- a/tests/usertools/15_usermod_change_supplementary_groups/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000::/home/foo:/bin/false diff --git a/tests/usertools/15_usermod_change_supplementary_groups/data/shadow b/tests/usertools/15_usermod_change_supplementary_groups/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/usertools/15_usermod_change_supplementary_groups/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/usertools/15_usermod_change_supplementary_groups/usermod.test b/tests/usertools/15_usermod_change_supplementary_groups/usermod.test index 604927a0..74d3ab7a 100755 --- a/tests/usertools/15_usermod_change_supplementary_groups/usermod.test +++ b/tests/usertools/15_usermod_change_supplementary_groups/usermod.test @@ -21,13 +21,13 @@ usermod -G bin,daemon foo echo "OK" echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../common/compare_file.pl data/shadow /etc/shadow +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/usertools/16_usermod_remove_supplementary_groups/data/home_ls-a b/tests/usertools/16_usermod_remove_supplementary_groups/data/home_ls-a deleted file mode 100644 index 89bbbd9a..00000000 --- a/tests/usertools/16_usermod_remove_supplementary_groups/data/home_ls-a +++ /dev/null @@ -1,3 +0,0 @@ --rw-r--r-- foo:foo `/home/foo2/toto' -drwxr-xr-x foo:foo `/home/foo2/.' -drwxr-xr-x root:root `/home/foo2/..' diff --git a/tests/usertools/16_usermod_remove_supplementary_groups/data/passwd b/tests/usertools/16_usermod_remove_supplementary_groups/data/passwd deleted file mode 100644 index bf52df00..00000000 --- a/tests/usertools/16_usermod_remove_supplementary_groups/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000::/home/foo:/bin/false diff --git a/tests/usertools/16_usermod_remove_supplementary_groups/data/shadow b/tests/usertools/16_usermod_remove_supplementary_groups/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/usertools/16_usermod_remove_supplementary_groups/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/usertools/16_usermod_remove_supplementary_groups/usermod.test b/tests/usertools/16_usermod_remove_supplementary_groups/usermod.test index 51fd5cf3..69651905 100755 --- a/tests/usertools/16_usermod_remove_supplementary_groups/usermod.test +++ b/tests/usertools/16_usermod_remove_supplementary_groups/usermod.test @@ -21,13 +21,13 @@ usermod -G "" foo echo "OK" echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../common/compare_file.pl data/shadow /etc/shadow +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/usertools/17_usermod_change_supplementary_groups_numerical/data/home_ls-a b/tests/usertools/17_usermod_change_supplementary_groups_numerical/data/home_ls-a deleted file mode 100644 index 89bbbd9a..00000000 --- a/tests/usertools/17_usermod_change_supplementary_groups_numerical/data/home_ls-a +++ /dev/null @@ -1,3 +0,0 @@ --rw-r--r-- foo:foo `/home/foo2/toto' -drwxr-xr-x foo:foo `/home/foo2/.' -drwxr-xr-x root:root `/home/foo2/..' diff --git a/tests/usertools/17_usermod_change_supplementary_groups_numerical/data/passwd b/tests/usertools/17_usermod_change_supplementary_groups_numerical/data/passwd deleted file mode 100644 index bf52df00..00000000 --- a/tests/usertools/17_usermod_change_supplementary_groups_numerical/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000::/home/foo:/bin/false diff --git a/tests/usertools/17_usermod_change_supplementary_groups_numerical/data/shadow b/tests/usertools/17_usermod_change_supplementary_groups_numerical/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/usertools/17_usermod_change_supplementary_groups_numerical/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/usertools/17_usermod_change_supplementary_groups_numerical/usermod.test b/tests/usertools/17_usermod_change_supplementary_groups_numerical/usermod.test index d374a95c..ecd3a5fc 100755 --- a/tests/usertools/17_usermod_change_supplementary_groups_numerical/usermod.test +++ b/tests/usertools/17_usermod_change_supplementary_groups_numerical/usermod.test @@ -21,13 +21,13 @@ usermod -G 13,bin,3 foo echo "OK" echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../common/compare_file.pl data/shadow /etc/shadow +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/group b/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/group deleted file mode 100644 index b6fae894..00000000 --- a/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3:root -adm:x:4:root,foo -tty:x:5: -disk:x:6: -lp:x:7:foo,root -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21:foo -voice:x:22: -cdrom:x:24: -floppy:x:25:foo -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/gshadow b/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/gshadow deleted file mode 100644 index 1f2ba8da..00000000 --- a/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*::root -adm:*::root,foo -tty:*::foo -disk:*:foo: -lp:*::foo,root -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:foo:foo -voice:*:: -cdrom:*:foo:foo -floppy:*::foo -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/home_ls-a b/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/home_ls-a deleted file mode 100644 index 89bbbd9a..00000000 --- a/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/home_ls-a +++ /dev/null @@ -1,3 +0,0 @@ --rw-r--r-- foo:foo `/home/foo2/toto' -drwxr-xr-x foo:foo `/home/foo2/.' -drwxr-xr-x root:root `/home/foo2/..' diff --git a/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/passwd b/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/passwd deleted file mode 100644 index bf52df00..00000000 --- a/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000::/home/foo:/bin/false diff --git a/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/shadow b/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/usermod.test b/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/usermod.test index 5742dba0..002bc53c 100755 --- a/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/usermod.test +++ b/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/usermod.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/usermod.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/group b/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/group deleted file mode 100644 index b6fae894..00000000 --- a/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3:root -adm:x:4:root,foo -tty:x:5: -disk:x:6: -lp:x:7:foo,root -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21:foo -voice:x:22: -cdrom:x:24: -floppy:x:25:foo -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/gshadow b/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/gshadow deleted file mode 100644 index 1f2ba8da..00000000 --- a/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*::root -adm:*::root,foo -tty:*::foo -disk:*:foo: -lp:*::foo,root -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:foo:foo -voice:*:: -cdrom:*:foo:foo -floppy:*::foo -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/home_ls-a b/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/home_ls-a deleted file mode 100644 index 89bbbd9a..00000000 --- a/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/home_ls-a +++ /dev/null @@ -1,3 +0,0 @@ --rw-r--r-- foo:foo `/home/foo2/toto' -drwxr-xr-x foo:foo `/home/foo2/.' -drwxr-xr-x root:root `/home/foo2/..' diff --git a/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/passwd b/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/passwd deleted file mode 100644 index bf52df00..00000000 --- a/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000::/home/foo:/bin/false diff --git a/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/shadow b/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/usermod.test b/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/usermod.test index 548b7d0a..1915240b 100755 --- a/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/usermod.test +++ b/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/usermod.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/usermod.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/usertools/20_usermod_rename_user_in_member_lists/data/home_ls-a b/tests/usertools/20_usermod_rename_user_in_member_lists/data/home_ls-a deleted file mode 100644 index 89bbbd9a..00000000 --- a/tests/usertools/20_usermod_rename_user_in_member_lists/data/home_ls-a +++ /dev/null @@ -1,3 +0,0 @@ --rw-r--r-- foo:foo `/home/foo2/toto' -drwxr-xr-x foo:foo `/home/foo2/.' -drwxr-xr-x root:root `/home/foo2/..' diff --git a/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/data/home_ls-a b/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/data/home_ls-a deleted file mode 100644 index 89bbbd9a..00000000 --- a/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/data/home_ls-a +++ /dev/null @@ -1,3 +0,0 @@ --rw-r--r-- foo:foo `/home/foo2/toto' -drwxr-xr-x foo:foo `/home/foo2/.' -drwxr-xr-x root:root `/home/foo2/..' diff --git a/tests/usertools/22_usermod-a_existing_supplementary_group/data/home_ls-a b/tests/usertools/22_usermod-a_existing_supplementary_group/data/home_ls-a deleted file mode 100644 index 89bbbd9a..00000000 --- a/tests/usertools/22_usermod-a_existing_supplementary_group/data/home_ls-a +++ /dev/null @@ -1,3 +0,0 @@ --rw-r--r-- foo:foo `/home/foo2/toto' -drwxr-xr-x foo:foo `/home/foo2/.' -drwxr-xr-x root:root `/home/foo2/..' diff --git a/tests/usertools/22_usermod-a_existing_supplementary_group/data/passwd b/tests/usertools/22_usermod-a_existing_supplementary_group/data/passwd deleted file mode 100644 index bf52df00..00000000 --- a/tests/usertools/22_usermod-a_existing_supplementary_group/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000::/home/foo:/bin/false diff --git a/tests/usertools/22_usermod-a_existing_supplementary_group/data/shadow b/tests/usertools/22_usermod-a_existing_supplementary_group/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/usertools/22_usermod-a_existing_supplementary_group/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/usertools/22_usermod-a_existing_supplementary_group/usermod.test b/tests/usertools/22_usermod-a_existing_supplementary_group/usermod.test index 3fd38c65..e83a3e06 100755 --- a/tests/usertools/22_usermod-a_existing_supplementary_group/usermod.test +++ b/tests/usertools/22_usermod-a_existing_supplementary_group/usermod.test @@ -21,13 +21,13 @@ usermod -a -G bin,daemon,floppy foo echo "OK" echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." ../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../common/compare_file.pl data/shadow /etc/shadow +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/usertools/23_usermod-a_existing_supplementary_group+rename/data/home_ls-a b/tests/usertools/23_usermod-a_existing_supplementary_group+rename/data/home_ls-a deleted file mode 100644 index 89bbbd9a..00000000 --- a/tests/usertools/23_usermod-a_existing_supplementary_group+rename/data/home_ls-a +++ /dev/null @@ -1,3 +0,0 @@ --rw-r--r-- foo:foo `/home/foo2/toto' -drwxr-xr-x foo:foo `/home/foo2/.' -drwxr-xr-x root:root `/home/foo2/..' diff --git a/tests/usertools/32_usermod-u_new_UID/data/group b/tests/usertools/32_usermod-u_new_UID/data/group deleted file mode 100644 index b6fae894..00000000 --- a/tests/usertools/32_usermod-u_new_UID/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3:root -adm:x:4:root,foo -tty:x:5: -disk:x:6: -lp:x:7:foo,root -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21:foo -voice:x:22: -cdrom:x:24: -floppy:x:25:foo -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/usertools/32_usermod-u_new_UID/data/gshadow b/tests/usertools/32_usermod-u_new_UID/data/gshadow deleted file mode 100644 index 1f2ba8da..00000000 --- a/tests/usertools/32_usermod-u_new_UID/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*::root -adm:*::root,foo -tty:*::foo -disk:*:foo: -lp:*::foo,root -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:foo:foo -voice:*:: -cdrom:*:foo:foo -floppy:*::foo -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/usertools/32_usermod-u_new_UID/data/home_ls-a b/tests/usertools/32_usermod-u_new_UID/data/home_ls-a deleted file mode 100644 index 89bbbd9a..00000000 --- a/tests/usertools/32_usermod-u_new_UID/data/home_ls-a +++ /dev/null @@ -1,3 +0,0 @@ --rw-r--r-- foo:foo `/home/foo2/toto' -drwxr-xr-x foo:foo `/home/foo2/.' -drwxr-xr-x root:root `/home/foo2/..' diff --git a/tests/usertools/32_usermod-u_new_UID/data/shadow b/tests/usertools/32_usermod-u_new_UID/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/usertools/32_usermod-u_new_UID/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/usertools/32_usermod-u_new_UID/usermod.test b/tests/usertools/32_usermod-u_new_UID/usermod.test index 84ebc5d7..ca04c6f7 100755 --- a/tests/usertools/32_usermod-u_new_UID/usermod.test +++ b/tests/usertools/32_usermod-u_new_UID/usermod.test @@ -24,13 +24,13 @@ echo -n "Check the passwd file..." ../../common/compare_file.pl data/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/usertools/33_usermod-u_existing_UID/data/group b/tests/usertools/33_usermod-u_existing_UID/data/group deleted file mode 100644 index feb1bcac..00000000 --- a/tests/usertools/33_usermod-u_existing_UID/data/group +++ /dev/null @@ -1,43 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3:root -adm:x:4:root,foo -tty:x:5: -disk:x:6: -lp:x:7:foo,root -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21:foo -voice:x:22: -cdrom:x:24: -floppy:x:25:foo -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: -foo2:x:1001: diff --git a/tests/usertools/33_usermod-u_existing_UID/data/gshadow b/tests/usertools/33_usermod-u_existing_UID/data/gshadow deleted file mode 100644 index 5f131b1e..00000000 --- a/tests/usertools/33_usermod-u_existing_UID/data/gshadow +++ /dev/null @@ -1,43 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*::root -adm:*::root,foo -tty:*::foo -disk:*:foo: -lp:*::foo,root -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:foo:foo -voice:*:: -cdrom:*:foo:foo -floppy:*::foo -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: -foo2:*:: diff --git a/tests/usertools/33_usermod-u_existing_UID/data/home_ls-a b/tests/usertools/33_usermod-u_existing_UID/data/home_ls-a deleted file mode 100644 index 89bbbd9a..00000000 --- a/tests/usertools/33_usermod-u_existing_UID/data/home_ls-a +++ /dev/null @@ -1,3 +0,0 @@ --rw-r--r-- foo:foo `/home/foo2/toto' -drwxr-xr-x foo:foo `/home/foo2/.' -drwxr-xr-x root:root `/home/foo2/..' diff --git a/tests/usertools/33_usermod-u_existing_UID/data/passwd b/tests/usertools/33_usermod-u_existing_UID/data/passwd deleted file mode 100644 index 6d87df11..00000000 --- a/tests/usertools/33_usermod-u_existing_UID/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000::/home/foo:/bin/false -foo2:x:1001:1001::/home/foo2:/bin/false diff --git a/tests/usertools/33_usermod-u_existing_UID/data/shadow b/tests/usertools/33_usermod-u_existing_UID/data/shadow deleted file mode 100644 index eaf0278f..00000000 --- a/tests/usertools/33_usermod-u_existing_UID/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: -foo2:!:12977:0:99999:7::: diff --git a/tests/usertools/33_usermod-u_existing_UID/usermod.test b/tests/usertools/33_usermod-u_existing_UID/usermod.test index 4210596e..10c1e28c 100755 --- a/tests/usertools/33_usermod-u_existing_UID/usermod.test +++ b/tests/usertools/33_usermod-u_existing_UID/usermod.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/usermod.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/usertools/34_usermod-u-o_existing_UID/data/group b/tests/usertools/34_usermod-u-o_existing_UID/data/group deleted file mode 100644 index feb1bcac..00000000 --- a/tests/usertools/34_usermod-u-o_existing_UID/data/group +++ /dev/null @@ -1,43 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3:root -adm:x:4:root,foo -tty:x:5: -disk:x:6: -lp:x:7:foo,root -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21:foo -voice:x:22: -cdrom:x:24: -floppy:x:25:foo -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: -foo2:x:1001: diff --git a/tests/usertools/34_usermod-u-o_existing_UID/data/gshadow b/tests/usertools/34_usermod-u-o_existing_UID/data/gshadow deleted file mode 100644 index 5f131b1e..00000000 --- a/tests/usertools/34_usermod-u-o_existing_UID/data/gshadow +++ /dev/null @@ -1,43 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*::root -adm:*::root,foo -tty:*::foo -disk:*:foo: -lp:*::foo,root -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:foo:foo -voice:*:: -cdrom:*:foo:foo -floppy:*::foo -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: -foo2:*:: diff --git a/tests/usertools/34_usermod-u-o_existing_UID/data/home_ls-a b/tests/usertools/34_usermod-u-o_existing_UID/data/home_ls-a deleted file mode 100644 index 89bbbd9a..00000000 --- a/tests/usertools/34_usermod-u-o_existing_UID/data/home_ls-a +++ /dev/null @@ -1,3 +0,0 @@ --rw-r--r-- foo:foo `/home/foo2/toto' -drwxr-xr-x foo:foo `/home/foo2/.' -drwxr-xr-x root:root `/home/foo2/..' diff --git a/tests/usertools/34_usermod-u-o_existing_UID/data/shadow b/tests/usertools/34_usermod-u-o_existing_UID/data/shadow deleted file mode 100644 index eaf0278f..00000000 --- a/tests/usertools/34_usermod-u-o_existing_UID/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: -foo2:!:12977:0:99999:7::: diff --git a/tests/usertools/34_usermod-u-o_existing_UID/usermod.test b/tests/usertools/34_usermod-u-o_existing_UID/usermod.test index 8c03f703..5ea5210e 100755 --- a/tests/usertools/34_usermod-u-o_existing_UID/usermod.test +++ b/tests/usertools/34_usermod-u-o_existing_UID/usermod.test @@ -24,13 +24,13 @@ echo -n "Check the passwd file..." ../../common/compare_file.pl data/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/usertools/35_usermod-u_invalid_UID/data/group b/tests/usertools/35_usermod-u_invalid_UID/data/group deleted file mode 100644 index feb1bcac..00000000 --- a/tests/usertools/35_usermod-u_invalid_UID/data/group +++ /dev/null @@ -1,43 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3:root -adm:x:4:root,foo -tty:x:5: -disk:x:6: -lp:x:7:foo,root -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21:foo -voice:x:22: -cdrom:x:24: -floppy:x:25:foo -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: -foo2:x:1001: diff --git a/tests/usertools/35_usermod-u_invalid_UID/data/gshadow b/tests/usertools/35_usermod-u_invalid_UID/data/gshadow deleted file mode 100644 index 5f131b1e..00000000 --- a/tests/usertools/35_usermod-u_invalid_UID/data/gshadow +++ /dev/null @@ -1,43 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*::root -adm:*::root,foo -tty:*::foo -disk:*:foo: -lp:*::foo,root -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:foo:foo -voice:*:: -cdrom:*:foo:foo -floppy:*::foo -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: -foo2:*:: diff --git a/tests/usertools/35_usermod-u_invalid_UID/data/home_ls-a b/tests/usertools/35_usermod-u_invalid_UID/data/home_ls-a deleted file mode 100644 index 89bbbd9a..00000000 --- a/tests/usertools/35_usermod-u_invalid_UID/data/home_ls-a +++ /dev/null @@ -1,3 +0,0 @@ --rw-r--r-- foo:foo `/home/foo2/toto' -drwxr-xr-x foo:foo `/home/foo2/.' -drwxr-xr-x root:root `/home/foo2/..' diff --git a/tests/usertools/35_usermod-u_invalid_UID/data/passwd b/tests/usertools/35_usermod-u_invalid_UID/data/passwd deleted file mode 100644 index 6d87df11..00000000 --- a/tests/usertools/35_usermod-u_invalid_UID/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000::/home/foo:/bin/false -foo2:x:1001:1001::/home/foo2:/bin/false diff --git a/tests/usertools/35_usermod-u_invalid_UID/data/shadow b/tests/usertools/35_usermod-u_invalid_UID/data/shadow deleted file mode 100644 index eaf0278f..00000000 --- a/tests/usertools/35_usermod-u_invalid_UID/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: -foo2:!:12977:0:99999:7::: diff --git a/tests/usertools/35_usermod-u_invalid_UID/usermod.test b/tests/usertools/35_usermod-u_invalid_UID/usermod.test index 5a5b3422..43f0dafb 100755 --- a/tests/usertools/35_usermod-u_invalid_UID/usermod.test +++ b/tests/usertools/35_usermod-u_invalid_UID/usermod.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/usermod.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/group b/tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/group deleted file mode 100644 index 50518255..00000000 --- a/tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3: -adm:x:4: -tty:x:5: -disk:x:6: -lp:x:7: -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21: -voice:x:22: -cdrom:x:24: -floppy:x:25: -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/gshadow b/tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/shadow b/tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/usertools/36_usermod_change_uid+move_homedir_other_device/usermod.test b/tests/usertools/36_usermod_change_uid+move_homedir_other_device/usermod.test index d828da21..6a8d7080 100755 --- a/tests/usertools/36_usermod_change_uid+move_homedir_other_device/usermod.test +++ b/tests/usertools/36_usermod_change_uid+move_homedir_other_device/usermod.test @@ -36,13 +36,13 @@ echo -n "Check the passwd file..." ../../common/compare_file.pl data/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" echo -n "Check the user's home directory was removed..." test ! -d /home/foo diff --git a/tests/usertools/37_Debian_Bug_470745/data/home_ls-a b/tests/usertools/37_Debian_Bug_470745/data/home_ls-a deleted file mode 100644 index 89bbbd9a..00000000 --- a/tests/usertools/37_Debian_Bug_470745/data/home_ls-a +++ /dev/null @@ -1,3 +0,0 @@ --rw-r--r-- foo:foo `/home/foo2/toto' -drwxr-xr-x foo:foo `/home/foo2/.' -drwxr-xr-x root:root `/home/foo2/..' diff --git a/tests/usertools/38_usermod_invalid_user/data/group b/tests/usertools/38_usermod_invalid_user/data/group deleted file mode 100644 index feb1bcac..00000000 --- a/tests/usertools/38_usermod_invalid_user/data/group +++ /dev/null @@ -1,43 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3:root -adm:x:4:root,foo -tty:x:5: -disk:x:6: -lp:x:7:foo,root -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21:foo -voice:x:22: -cdrom:x:24: -floppy:x:25:foo -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: -foo2:x:1001: diff --git a/tests/usertools/38_usermod_invalid_user/data/gshadow b/tests/usertools/38_usermod_invalid_user/data/gshadow deleted file mode 100644 index 5f131b1e..00000000 --- a/tests/usertools/38_usermod_invalid_user/data/gshadow +++ /dev/null @@ -1,43 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*::root -adm:*::root,foo -tty:*::foo -disk:*:foo: -lp:*::foo,root -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:foo:foo -voice:*:: -cdrom:*:foo:foo -floppy:*::foo -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: -foo2:*:: diff --git a/tests/usertools/38_usermod_invalid_user/data/home_ls-a b/tests/usertools/38_usermod_invalid_user/data/home_ls-a deleted file mode 100644 index 89bbbd9a..00000000 --- a/tests/usertools/38_usermod_invalid_user/data/home_ls-a +++ /dev/null @@ -1,3 +0,0 @@ --rw-r--r-- foo:foo `/home/foo2/toto' -drwxr-xr-x foo:foo `/home/foo2/.' -drwxr-xr-x root:root `/home/foo2/..' diff --git a/tests/usertools/38_usermod_invalid_user/data/passwd b/tests/usertools/38_usermod_invalid_user/data/passwd deleted file mode 100644 index 6d87df11..00000000 --- a/tests/usertools/38_usermod_invalid_user/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000::/home/foo:/bin/false -foo2:x:1001:1001::/home/foo2:/bin/false diff --git a/tests/usertools/38_usermod_invalid_user/data/shadow b/tests/usertools/38_usermod_invalid_user/data/shadow deleted file mode 100644 index eaf0278f..00000000 --- a/tests/usertools/38_usermod_invalid_user/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: -foo2:!:12977:0:99999:7::: diff --git a/tests/usertools/38_usermod_invalid_user/usermod.test b/tests/usertools/38_usermod_invalid_user/usermod.test index fb1340c7..e88034d7 100755 --- a/tests/usertools/38_usermod_invalid_user/usermod.test +++ b/tests/usertools/38_usermod_invalid_user/usermod.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/usermod.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/usertools/39_usermod_-c_invalid_comment/data/group b/tests/usertools/39_usermod_-c_invalid_comment/data/group deleted file mode 100644 index feb1bcac..00000000 --- a/tests/usertools/39_usermod_-c_invalid_comment/data/group +++ /dev/null @@ -1,43 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3:root -adm:x:4:root,foo -tty:x:5: -disk:x:6: -lp:x:7:foo,root -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21:foo -voice:x:22: -cdrom:x:24: -floppy:x:25:foo -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: -foo2:x:1001: diff --git a/tests/usertools/39_usermod_-c_invalid_comment/data/gshadow b/tests/usertools/39_usermod_-c_invalid_comment/data/gshadow deleted file mode 100644 index 5f131b1e..00000000 --- a/tests/usertools/39_usermod_-c_invalid_comment/data/gshadow +++ /dev/null @@ -1,43 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*::root -adm:*::root,foo -tty:*::foo -disk:*:foo: -lp:*::foo,root -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:foo:foo -voice:*:: -cdrom:*:foo:foo -floppy:*::foo -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: -foo2:*:: diff --git a/tests/usertools/39_usermod_-c_invalid_comment/data/home_ls-a b/tests/usertools/39_usermod_-c_invalid_comment/data/home_ls-a deleted file mode 100644 index 89bbbd9a..00000000 --- a/tests/usertools/39_usermod_-c_invalid_comment/data/home_ls-a +++ /dev/null @@ -1,3 +0,0 @@ --rw-r--r-- foo:foo `/home/foo2/toto' -drwxr-xr-x foo:foo `/home/foo2/.' -drwxr-xr-x root:root `/home/foo2/..' diff --git a/tests/usertools/39_usermod_-c_invalid_comment/data/passwd b/tests/usertools/39_usermod_-c_invalid_comment/data/passwd deleted file mode 100644 index 6d87df11..00000000 --- a/tests/usertools/39_usermod_-c_invalid_comment/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000::/home/foo:/bin/false -foo2:x:1001:1001::/home/foo2:/bin/false diff --git a/tests/usertools/39_usermod_-c_invalid_comment/data/shadow b/tests/usertools/39_usermod_-c_invalid_comment/data/shadow deleted file mode 100644 index eaf0278f..00000000 --- a/tests/usertools/39_usermod_-c_invalid_comment/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: -foo2:!:12977:0:99999:7::: diff --git a/tests/usertools/39_usermod_-c_invalid_comment/usermod.test b/tests/usertools/39_usermod_-c_invalid_comment/usermod.test index 400c77e6..5a240eda 100755 --- a/tests/usertools/39_usermod_-c_invalid_comment/usermod.test +++ b/tests/usertools/39_usermod_-c_invalid_comment/usermod.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/usermod.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/usertools/40_usermod_-d_invalid_homedir/data/group b/tests/usertools/40_usermod_-d_invalid_homedir/data/group deleted file mode 100644 index feb1bcac..00000000 --- a/tests/usertools/40_usermod_-d_invalid_homedir/data/group +++ /dev/null @@ -1,43 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3:root -adm:x:4:root,foo -tty:x:5: -disk:x:6: -lp:x:7:foo,root -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21:foo -voice:x:22: -cdrom:x:24: -floppy:x:25:foo -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: -foo2:x:1001: diff --git a/tests/usertools/40_usermod_-d_invalid_homedir/data/gshadow b/tests/usertools/40_usermod_-d_invalid_homedir/data/gshadow deleted file mode 100644 index 5f131b1e..00000000 --- a/tests/usertools/40_usermod_-d_invalid_homedir/data/gshadow +++ /dev/null @@ -1,43 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*::root -adm:*::root,foo -tty:*::foo -disk:*:foo: -lp:*::foo,root -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:foo:foo -voice:*:: -cdrom:*:foo:foo -floppy:*::foo -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: -foo2:*:: diff --git a/tests/usertools/40_usermod_-d_invalid_homedir/data/home_ls-a b/tests/usertools/40_usermod_-d_invalid_homedir/data/home_ls-a deleted file mode 100644 index 89bbbd9a..00000000 --- a/tests/usertools/40_usermod_-d_invalid_homedir/data/home_ls-a +++ /dev/null @@ -1,3 +0,0 @@ --rw-r--r-- foo:foo `/home/foo2/toto' -drwxr-xr-x foo:foo `/home/foo2/.' -drwxr-xr-x root:root `/home/foo2/..' diff --git a/tests/usertools/40_usermod_-d_invalid_homedir/data/passwd b/tests/usertools/40_usermod_-d_invalid_homedir/data/passwd deleted file mode 100644 index 6d87df11..00000000 --- a/tests/usertools/40_usermod_-d_invalid_homedir/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000::/home/foo:/bin/false -foo2:x:1001:1001::/home/foo2:/bin/false diff --git a/tests/usertools/40_usermod_-d_invalid_homedir/data/shadow b/tests/usertools/40_usermod_-d_invalid_homedir/data/shadow deleted file mode 100644 index eaf0278f..00000000 --- a/tests/usertools/40_usermod_-d_invalid_homedir/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: -foo2:!:12977:0:99999:7::: diff --git a/tests/usertools/40_usermod_-d_invalid_homedir/usermod.test b/tests/usertools/40_usermod_-d_invalid_homedir/usermod.test index 37ec48d6..c510489d 100755 --- a/tests/usertools/40_usermod_-d_invalid_homedir/usermod.test +++ b/tests/usertools/40_usermod_-d_invalid_homedir/usermod.test @@ -38,16 +38,16 @@ echo "error message OK." rm -f tmp/usermod.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/usertools/41_usermod_-d_invalid_shell/data/group b/tests/usertools/41_usermod_-d_invalid_shell/data/group deleted file mode 100644 index feb1bcac..00000000 --- a/tests/usertools/41_usermod_-d_invalid_shell/data/group +++ /dev/null @@ -1,43 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3:root -adm:x:4:root,foo -tty:x:5: -disk:x:6: -lp:x:7:foo,root -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21:foo -voice:x:22: -cdrom:x:24: -floppy:x:25:foo -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: -foo2:x:1001: diff --git a/tests/usertools/41_usermod_-d_invalid_shell/data/gshadow b/tests/usertools/41_usermod_-d_invalid_shell/data/gshadow deleted file mode 100644 index 5f131b1e..00000000 --- a/tests/usertools/41_usermod_-d_invalid_shell/data/gshadow +++ /dev/null @@ -1,43 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*::root -adm:*::root,foo -tty:*::foo -disk:*:foo: -lp:*::foo,root -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:foo:foo -voice:*:: -cdrom:*:foo:foo -floppy:*::foo -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: -foo2:*:: diff --git a/tests/usertools/41_usermod_-d_invalid_shell/data/home_ls-a b/tests/usertools/41_usermod_-d_invalid_shell/data/home_ls-a deleted file mode 100644 index 89bbbd9a..00000000 --- a/tests/usertools/41_usermod_-d_invalid_shell/data/home_ls-a +++ /dev/null @@ -1,3 +0,0 @@ --rw-r--r-- foo:foo `/home/foo2/toto' -drwxr-xr-x foo:foo `/home/foo2/.' -drwxr-xr-x root:root `/home/foo2/..' diff --git a/tests/usertools/41_usermod_-d_invalid_shell/data/passwd b/tests/usertools/41_usermod_-d_invalid_shell/data/passwd deleted file mode 100644 index 6d87df11..00000000 --- a/tests/usertools/41_usermod_-d_invalid_shell/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000::/home/foo:/bin/false -foo2:x:1001:1001::/home/foo2:/bin/false diff --git a/tests/usertools/41_usermod_-d_invalid_shell/data/shadow b/tests/usertools/41_usermod_-d_invalid_shell/data/shadow deleted file mode 100644 index eaf0278f..00000000 --- a/tests/usertools/41_usermod_-d_invalid_shell/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: -foo2:!:12977:0:99999:7::: diff --git a/tests/usertools/41_usermod_-d_invalid_shell/usermod.test b/tests/usertools/41_usermod_-d_invalid_shell/usermod.test index b380aabe..44ce22b8 100755 --- a/tests/usertools/41_usermod_-d_invalid_shell/usermod.test +++ b/tests/usertools/41_usermod_-d_invalid_shell/usermod.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/usermod.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/usertools/42_usermod_-g_invalid_group_name/data/group b/tests/usertools/42_usermod_-g_invalid_group_name/data/group deleted file mode 100644 index feb1bcac..00000000 --- a/tests/usertools/42_usermod_-g_invalid_group_name/data/group +++ /dev/null @@ -1,43 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3:root -adm:x:4:root,foo -tty:x:5: -disk:x:6: -lp:x:7:foo,root -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21:foo -voice:x:22: -cdrom:x:24: -floppy:x:25:foo -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: -foo2:x:1001: diff --git a/tests/usertools/42_usermod_-g_invalid_group_name/data/gshadow b/tests/usertools/42_usermod_-g_invalid_group_name/data/gshadow deleted file mode 100644 index 5f131b1e..00000000 --- a/tests/usertools/42_usermod_-g_invalid_group_name/data/gshadow +++ /dev/null @@ -1,43 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*::root -adm:*::root,foo -tty:*::foo -disk:*:foo: -lp:*::foo,root -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:foo:foo -voice:*:: -cdrom:*:foo:foo -floppy:*::foo -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: -foo2:*:: diff --git a/tests/usertools/42_usermod_-g_invalid_group_name/data/home_ls-a b/tests/usertools/42_usermod_-g_invalid_group_name/data/home_ls-a deleted file mode 100644 index 89bbbd9a..00000000 --- a/tests/usertools/42_usermod_-g_invalid_group_name/data/home_ls-a +++ /dev/null @@ -1,3 +0,0 @@ --rw-r--r-- foo:foo `/home/foo2/toto' -drwxr-xr-x foo:foo `/home/foo2/.' -drwxr-xr-x root:root `/home/foo2/..' diff --git a/tests/usertools/42_usermod_-g_invalid_group_name/data/passwd b/tests/usertools/42_usermod_-g_invalid_group_name/data/passwd deleted file mode 100644 index 6d87df11..00000000 --- a/tests/usertools/42_usermod_-g_invalid_group_name/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000::/home/foo:/bin/false -foo2:x:1001:1001::/home/foo2:/bin/false diff --git a/tests/usertools/42_usermod_-g_invalid_group_name/data/shadow b/tests/usertools/42_usermod_-g_invalid_group_name/data/shadow deleted file mode 100644 index eaf0278f..00000000 --- a/tests/usertools/42_usermod_-g_invalid_group_name/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: -foo2:!:12977:0:99999:7::: diff --git a/tests/usertools/42_usermod_-g_invalid_group_name/usermod.test b/tests/usertools/42_usermod_-g_invalid_group_name/usermod.test index e6b3e687..22fd1073 100755 --- a/tests/usertools/42_usermod_-g_invalid_group_name/usermod.test +++ b/tests/usertools/42_usermod_-g_invalid_group_name/usermod.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/usermod.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/usertools/43_usermod_-g_invalid_group_ID/data/group b/tests/usertools/43_usermod_-g_invalid_group_ID/data/group deleted file mode 100644 index feb1bcac..00000000 --- a/tests/usertools/43_usermod_-g_invalid_group_ID/data/group +++ /dev/null @@ -1,43 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3:root -adm:x:4:root,foo -tty:x:5: -disk:x:6: -lp:x:7:foo,root -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21:foo -voice:x:22: -cdrom:x:24: -floppy:x:25:foo -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: -foo2:x:1001: diff --git a/tests/usertools/43_usermod_-g_invalid_group_ID/data/gshadow b/tests/usertools/43_usermod_-g_invalid_group_ID/data/gshadow deleted file mode 100644 index 5f131b1e..00000000 --- a/tests/usertools/43_usermod_-g_invalid_group_ID/data/gshadow +++ /dev/null @@ -1,43 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*::root -adm:*::root,foo -tty:*::foo -disk:*:foo: -lp:*::foo,root -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:foo:foo -voice:*:: -cdrom:*:foo:foo -floppy:*::foo -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: -foo2:*:: diff --git a/tests/usertools/43_usermod_-g_invalid_group_ID/data/home_ls-a b/tests/usertools/43_usermod_-g_invalid_group_ID/data/home_ls-a deleted file mode 100644 index 89bbbd9a..00000000 --- a/tests/usertools/43_usermod_-g_invalid_group_ID/data/home_ls-a +++ /dev/null @@ -1,3 +0,0 @@ --rw-r--r-- foo:foo `/home/foo2/toto' -drwxr-xr-x foo:foo `/home/foo2/.' -drwxr-xr-x root:root `/home/foo2/..' diff --git a/tests/usertools/43_usermod_-g_invalid_group_ID/data/passwd b/tests/usertools/43_usermod_-g_invalid_group_ID/data/passwd deleted file mode 100644 index 6d87df11..00000000 --- a/tests/usertools/43_usermod_-g_invalid_group_ID/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000::/home/foo:/bin/false -foo2:x:1001:1001::/home/foo2:/bin/false diff --git a/tests/usertools/43_usermod_-g_invalid_group_ID/data/shadow b/tests/usertools/43_usermod_-g_invalid_group_ID/data/shadow deleted file mode 100644 index eaf0278f..00000000 --- a/tests/usertools/43_usermod_-g_invalid_group_ID/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: -foo2:!:12977:0:99999:7::: diff --git a/tests/usertools/43_usermod_-g_invalid_group_ID/usermod.test b/tests/usertools/43_usermod_-g_invalid_group_ID/usermod.test index 128fb367..5d60cef2 100755 --- a/tests/usertools/43_usermod_-g_invalid_group_ID/usermod.test +++ b/tests/usertools/43_usermod_-g_invalid_group_ID/usermod.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/usermod.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/usertools/44_usermod-l_existing_username/data/group b/tests/usertools/44_usermod-l_existing_username/data/group deleted file mode 100644 index feb1bcac..00000000 --- a/tests/usertools/44_usermod-l_existing_username/data/group +++ /dev/null @@ -1,43 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3:root -adm:x:4:root,foo -tty:x:5: -disk:x:6: -lp:x:7:foo,root -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21:foo -voice:x:22: -cdrom:x:24: -floppy:x:25:foo -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: -foo2:x:1001: diff --git a/tests/usertools/44_usermod-l_existing_username/data/gshadow b/tests/usertools/44_usermod-l_existing_username/data/gshadow deleted file mode 100644 index 5f131b1e..00000000 --- a/tests/usertools/44_usermod-l_existing_username/data/gshadow +++ /dev/null @@ -1,43 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*::root -adm:*::root,foo -tty:*::foo -disk:*:foo: -lp:*::foo,root -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:foo:foo -voice:*:: -cdrom:*:foo:foo -floppy:*::foo -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: -foo2:*:: diff --git a/tests/usertools/44_usermod-l_existing_username/data/home_ls-a b/tests/usertools/44_usermod-l_existing_username/data/home_ls-a deleted file mode 100644 index 89bbbd9a..00000000 --- a/tests/usertools/44_usermod-l_existing_username/data/home_ls-a +++ /dev/null @@ -1,3 +0,0 @@ --rw-r--r-- foo:foo `/home/foo2/toto' -drwxr-xr-x foo:foo `/home/foo2/.' -drwxr-xr-x root:root `/home/foo2/..' diff --git a/tests/usertools/44_usermod-l_existing_username/data/passwd b/tests/usertools/44_usermod-l_existing_username/data/passwd deleted file mode 100644 index 6d87df11..00000000 --- a/tests/usertools/44_usermod-l_existing_username/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000::/home/foo:/bin/false -foo2:x:1001:1001::/home/foo2:/bin/false diff --git a/tests/usertools/44_usermod-l_existing_username/data/shadow b/tests/usertools/44_usermod-l_existing_username/data/shadow deleted file mode 100644 index eaf0278f..00000000 --- a/tests/usertools/44_usermod-l_existing_username/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: -foo2:!:12977:0:99999:7::: diff --git a/tests/usertools/44_usermod-l_existing_username/usermod.test b/tests/usertools/44_usermod-l_existing_username/usermod.test index 8ae85a63..f3cbf150 100755 --- a/tests/usertools/44_usermod-l_existing_username/usermod.test +++ b/tests/usertools/44_usermod-l_existing_username/usermod.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/usermod.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/usertools/45_usermod-l_existing_username_passwd/data/group b/tests/usertools/45_usermod-l_existing_username_passwd/data/group deleted file mode 100644 index feb1bcac..00000000 --- a/tests/usertools/45_usermod-l_existing_username_passwd/data/group +++ /dev/null @@ -1,43 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3:root -adm:x:4:root,foo -tty:x:5: -disk:x:6: -lp:x:7:foo,root -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21:foo -voice:x:22: -cdrom:x:24: -floppy:x:25:foo -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: -foo2:x:1001: diff --git a/tests/usertools/45_usermod-l_existing_username_passwd/data/gshadow b/tests/usertools/45_usermod-l_existing_username_passwd/data/gshadow deleted file mode 100644 index 5f131b1e..00000000 --- a/tests/usertools/45_usermod-l_existing_username_passwd/data/gshadow +++ /dev/null @@ -1,43 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*::root -adm:*::root,foo -tty:*::foo -disk:*:foo: -lp:*::foo,root -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:foo:foo -voice:*:: -cdrom:*:foo:foo -floppy:*::foo -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: -foo2:*:: diff --git a/tests/usertools/45_usermod-l_existing_username_passwd/data/home_ls-a b/tests/usertools/45_usermod-l_existing_username_passwd/data/home_ls-a deleted file mode 100644 index 89bbbd9a..00000000 --- a/tests/usertools/45_usermod-l_existing_username_passwd/data/home_ls-a +++ /dev/null @@ -1,3 +0,0 @@ --rw-r--r-- foo:foo `/home/foo2/toto' -drwxr-xr-x foo:foo `/home/foo2/.' -drwxr-xr-x root:root `/home/foo2/..' diff --git a/tests/usertools/45_usermod-l_existing_username_passwd/data/passwd b/tests/usertools/45_usermod-l_existing_username_passwd/data/passwd deleted file mode 100644 index 6d87df11..00000000 --- a/tests/usertools/45_usermod-l_existing_username_passwd/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000::/home/foo:/bin/false -foo2:x:1001:1001::/home/foo2:/bin/false diff --git a/tests/usertools/45_usermod-l_existing_username_passwd/data/shadow b/tests/usertools/45_usermod-l_existing_username_passwd/data/shadow deleted file mode 100644 index 7d2cc657..00000000 --- a/tests/usertools/45_usermod-l_existing_username_passwd/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: -foo3:!:12977:0:99999:7::: diff --git a/tests/usertools/45_usermod-l_existing_username_passwd/usermod.test b/tests/usertools/45_usermod-l_existing_username_passwd/usermod.test index 8ae85a63..f3cbf150 100755 --- a/tests/usertools/45_usermod-l_existing_username_passwd/usermod.test +++ b/tests/usertools/45_usermod-l_existing_username_passwd/usermod.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/usermod.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/usertools/46_usermod-l_existing_username_shadow/data/group b/tests/usertools/46_usermod-l_existing_username_shadow/data/group deleted file mode 100644 index feb1bcac..00000000 --- a/tests/usertools/46_usermod-l_existing_username_shadow/data/group +++ /dev/null @@ -1,43 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3:root -adm:x:4:root,foo -tty:x:5: -disk:x:6: -lp:x:7:foo,root -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21:foo -voice:x:22: -cdrom:x:24: -floppy:x:25:foo -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: -foo2:x:1001: diff --git a/tests/usertools/46_usermod-l_existing_username_shadow/data/gshadow b/tests/usertools/46_usermod-l_existing_username_shadow/data/gshadow deleted file mode 100644 index 5f131b1e..00000000 --- a/tests/usertools/46_usermod-l_existing_username_shadow/data/gshadow +++ /dev/null @@ -1,43 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*::root -adm:*::root,foo -tty:*::foo -disk:*:foo: -lp:*::foo,root -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:foo:foo -voice:*:: -cdrom:*:foo:foo -floppy:*::foo -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: -foo2:*:: diff --git a/tests/usertools/46_usermod-l_existing_username_shadow/data/home_ls-a b/tests/usertools/46_usermod-l_existing_username_shadow/data/home_ls-a deleted file mode 100644 index 89bbbd9a..00000000 --- a/tests/usertools/46_usermod-l_existing_username_shadow/data/home_ls-a +++ /dev/null @@ -1,3 +0,0 @@ --rw-r--r-- foo:foo `/home/foo2/toto' -drwxr-xr-x foo:foo `/home/foo2/.' -drwxr-xr-x root:root `/home/foo2/..' diff --git a/tests/usertools/46_usermod-l_existing_username_shadow/data/passwd b/tests/usertools/46_usermod-l_existing_username_shadow/data/passwd deleted file mode 100644 index 92eddca1..00000000 --- a/tests/usertools/46_usermod-l_existing_username_shadow/data/passwd +++ /dev/null @@ -1,21 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:x:1000:1000::/home/foo:/bin/false -foo3:x:1001:1001::/home/foo2:/bin/false diff --git a/tests/usertools/46_usermod-l_existing_username_shadow/data/shadow b/tests/usertools/46_usermod-l_existing_username_shadow/data/shadow deleted file mode 100644 index eaf0278f..00000000 --- a/tests/usertools/46_usermod-l_existing_username_shadow/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: -foo2:!:12977:0:99999:7::: diff --git a/tests/usertools/46_usermod-l_existing_username_shadow/usermod.test b/tests/usertools/46_usermod-l_existing_username_shadow/usermod.test index 8ae85a63..f3cbf150 100755 --- a/tests/usertools/46_usermod-l_existing_username_shadow/usermod.test +++ b/tests/usertools/46_usermod-l_existing_username_shadow/usermod.test @@ -36,16 +36,16 @@ echo "error message OK." rm -f tmp/usermod.err echo -n "Check the passwd file..." -../../common/compare_file.pl data/passwd /etc/passwd +../../common/compare_file.pl config/etc/passwd /etc/passwd echo "OK" echo -n "Check the group file..." -../../common/compare_file.pl data/group /etc/group +../../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 +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." -../../common/compare_file.pl data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/usertools/47_usermod-l_no_shadow_file/data/home_ls-a b/tests/usertools/47_usermod-l_no_shadow_file/data/home_ls-a deleted file mode 100644 index 89bbbd9a..00000000 --- a/tests/usertools/47_usermod-l_no_shadow_file/data/home_ls-a +++ /dev/null @@ -1,3 +0,0 @@ --rw-r--r-- foo:foo `/home/foo2/toto' -drwxr-xr-x foo:foo `/home/foo2/.' -drwxr-xr-x root:root `/home/foo2/..' diff --git a/tests/usertools/48_userdel_keep_group_if_primary_other_user/data/gshadow b/tests/usertools/48_userdel_keep_group_if_primary_other_user/data/gshadow deleted file mode 100644 index 5042e581..00000000 --- a/tests/usertools/48_userdel_keep_group_if_primary_other_user/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/usertools/48_userdel_keep_group_if_primary_other_user/userdel.test b/tests/usertools/48_userdel_keep_group_if_primary_other_user/userdel.test index b3e74ad2..750780e2 100755 --- a/tests/usertools/48_userdel_keep_group_if_primary_other_user/userdel.test +++ b/tests/usertools/48_userdel_keep_group_if_primary_other_user/userdel.test @@ -39,7 +39,7 @@ 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 data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/data/gshadow b/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/data/gshadow deleted file mode 100644 index 9fdfaa0c..00000000 --- a/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/data/gshadow +++ /dev/null @@ -1,43 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*:: -adm:*:: -tty:*:: -disk:*:: -lp:*:: -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo3:*:: -foo2:*:: diff --git a/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/userdel.test b/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/userdel.test index d34c7eef..4293f278 100755 --- a/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/userdel.test +++ b/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/userdel.test @@ -30,7 +30,7 @@ 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 data/gshadow /etc/gshadow +../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" log_status "$0" "SUCCESS" diff --git a/tests/usertools/52_userdel_delete_user_no_shadow_entry/data/shadow b/tests/usertools/52_userdel_delete_user_no_shadow_entry/data/shadow deleted file mode 100644 index 2c64068b..00000000 --- a/tests/usertools/52_userdel_delete_user_no_shadow_entry/data/shadow +++ /dev/null @@ -1,21 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo3:!:12977:0:99999:7::: -foo2:!:12977:0:99999:7::: diff --git a/tests/usertools/52_userdel_delete_user_no_shadow_entry/userdel.test b/tests/usertools/52_userdel_delete_user_no_shadow_entry/userdel.test index 332cf007..3f583368 100755 --- a/tests/usertools/52_userdel_delete_user_no_shadow_entry/userdel.test +++ b/tests/usertools/52_userdel_delete_user_no_shadow_entry/userdel.test @@ -27,7 +27,7 @@ echo -n "Check the group file..." ../../common/compare_file.pl data/group /etc/group echo "OK" echo -n "Check the shadow file..." -../../common/compare_file.pl data/shadow /etc/shadow +../../common/compare_file.pl config/etc/shadow /etc/shadow echo "OK" echo -n "Check the gshadow file..." ../../common/compare_file.pl data/gshadow /etc/gshadow diff --git a/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/data/chpasswd.err b/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/data/chpasswd.err deleted file mode 100644 index 498b5c81..00000000 --- a/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/data/chpasswd.err +++ /dev/null @@ -1,6 +0,0 @@ -chpasswd: (user nobody) pam_chauthtok() failed, error: -Authentication token manipulation error -chpasswd: (line 1, user nobody) password not changed -chpasswd: (user lp) pam_chauthtok() failed, error: -Authentication token manipulation error -chpasswd: (line 2, user lp) password not changed diff --git a/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/data/passwd b/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/data/passwd deleted file mode 100644 index a9a8b927..00000000 --- a/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/data/passwd +++ /dev/null @@ -1,19 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:@PASS_DES test2@:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:@PASS_DES test@:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false diff --git a/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/data/passwd b/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/data/passwd deleted file mode 100644 index d9798a6e..00000000 --- a/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:foopass:1000:1000::/home/foo:/bin/false diff --git a/tests/usertools/usermod/06_usermod_lock_already_locked_password3/data/passwd b/tests/usertools/usermod/06_usermod_lock_already_locked_password3/data/passwd deleted file mode 100644 index d9798a6e..00000000 --- a/tests/usertools/usermod/06_usermod_lock_already_locked_password3/data/passwd +++ /dev/null @@ -1,20 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -daemon:x:1:1:daemon:/usr/sbin:/bin/sh -bin:x:2:2:bin:/bin:/bin/sh -sys:x:3:3:sys:/dev:/bin/sh -sync:x:4:65534:sync:/bin:/bin/sync -games:x:5:60:games:/usr/games:/bin/sh -man:x:6:12:man:/var/cache/man:/bin/sh -lp:x:7:7:lp:/var/spool/lpd:/bin/sh -mail:x:8:8:mail:/var/mail:/bin/sh -news:x:9:9:news:/var/spool/news:/bin/sh -uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh -proxy:x:13:13:proxy:/bin:/bin/sh -www-data:x:33:33:www-data:/var/www:/bin/sh -backup:x:34:34:backup:/var/backups:/bin/sh -list:x:38:38:Mailing List Manager:/var/list:/bin/sh -irc:x:39:39:ircd:/var/run/ircd:/bin/sh -gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh -nobody:x:65534:65534:nobody:/nonexistent:/bin/sh -Debian-exim:x:102:102::/var/spool/exim4:/bin/false -foo:foopass:1000:1000::/home/foo:/bin/false diff --git a/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/data/gshadow b/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/data/gshadow deleted file mode 100644 index e982c7ca..00000000 --- a/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*::root -adm:*::root -tty:*:: -disk:*:: -lp:*::root -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -bar:*:: diff --git a/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/usermod.test b/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/usermod.test index 2cbf5106..5efc96fe 100755 --- a/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/usermod.test +++ b/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/usermod.test @@ -52,7 +52,7 @@ 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 data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" lastlog > tmp/lastlog.out2 diff --git a/tests/usertools/usermod/41_usermod-u_faillog_not_created/data/group b/tests/usertools/usermod/41_usermod-u_faillog_not_created/data/group deleted file mode 100644 index b6fae894..00000000 --- a/tests/usertools/usermod/41_usermod-u_faillog_not_created/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3:root -adm:x:4:root,foo -tty:x:5: -disk:x:6: -lp:x:7:foo,root -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21:foo -voice:x:22: -cdrom:x:24: -floppy:x:25:foo -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/usertools/usermod/41_usermod-u_faillog_not_created/data/gshadow b/tests/usertools/usermod/41_usermod-u_faillog_not_created/data/gshadow deleted file mode 100644 index 1f2ba8da..00000000 --- a/tests/usertools/usermod/41_usermod-u_faillog_not_created/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*::root -adm:*::root,foo -tty:*::foo -disk:*:foo: -lp:*::foo,root -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:foo:foo -voice:*:: -cdrom:*:foo:foo -floppy:*::foo -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/usertools/usermod/41_usermod-u_faillog_not_created/data/shadow b/tests/usertools/usermod/41_usermod-u_faillog_not_created/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/usertools/usermod/41_usermod-u_faillog_not_created/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/data/group b/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/data/group deleted file mode 100644 index b6fae894..00000000 --- a/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/data/group +++ /dev/null @@ -1,42 +0,0 @@ -root:x:0: -daemon:x:1: -bin:x:2: -sys:x:3:root -adm:x:4:root,foo -tty:x:5: -disk:x:6: -lp:x:7:foo,root -mail:x:8: -news:x:9: -uucp:x:10: -man:x:12: -proxy:x:13: -kmem:x:15: -dialout:x:20: -fax:x:21:foo -voice:x:22: -cdrom:x:24: -floppy:x:25:foo -tape:x:26: -sudo:x:27: -audio:x:29: -dip:x:30: -www-data:x:33: -backup:x:34: -operator:x:37: -list:x:38: -irc:x:39: -src:x:40: -gnats:x:41: -shadow:x:42: -utmp:x:43: -video:x:44: -sasl:x:45: -plugdev:x:46: -staff:x:50: -games:x:60: -users:x:100:foo -nogroup:x:65534: -crontab:x:101: -Debian-exim:x:102: -foo:x:1000: diff --git a/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/data/gshadow b/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/data/gshadow deleted file mode 100644 index 1f2ba8da..00000000 --- a/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*::root -adm:*::root,foo -tty:*::foo -disk:*:foo: -lp:*::foo,root -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:foo:foo -voice:*:: -cdrom:*:foo:foo -floppy:*::foo -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -foo:*:: diff --git a/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/data/shadow b/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/data/shadow deleted file mode 100644 index 2baad3b4..00000000 --- a/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/data/shadow +++ /dev/null @@ -1,20 +0,0 @@ -root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7::: -daemon:*:12977:0:99999:7::: -bin:*:12977:0:99999:7::: -sys:*:12977:0:99999:7::: -sync:*:12977:0:99999:7::: -games:*:12977:0:99999:7::: -man:*:12977:0:99999:7::: -lp:*:12977:0:99999:7::: -mail:*:12977:0:99999:7::: -news:*:12977:0:99999:7::: -uucp:*:12977:0:99999:7::: -proxy:*:12977:0:99999:7::: -www-data:*:12977:0:99999:7::: -backup:*:12977:0:99999:7::: -list:*:12977:0:99999:7::: -irc:*:12977:0:99999:7::: -gnats:*:12977:0:99999:7::: -nobody:*:12977:0:99999:7::: -Debian-exim:!:12977:0:99999:7::: -foo:!:12977:0:99999:7::: diff --git a/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/data/gshadow b/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/data/gshadow deleted file mode 100644 index e982c7ca..00000000 --- a/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/data/gshadow +++ /dev/null @@ -1,42 +0,0 @@ -root:*:: -daemon:*:: -bin:*:: -sys:*::root -adm:*::root -tty:*:: -disk:*:: -lp:*::root -mail:*:: -news:*:: -uucp:*:: -man:*:: -proxy:*:: -kmem:*:: -dialout:*:: -fax:*:: -voice:*:: -cdrom:*:: -floppy:*:: -tape:*:: -sudo:*:: -audio:*:: -dip:*:: -www-data:*:: -backup:*:: -operator:*:: -list:*:: -irc:*:: -src:*:: -gnats:*:: -shadow:*:: -utmp:*:: -video:*:: -sasl:*:: -plugdev:*:: -staff:*:: -games:*:: -users:*:: -nogroup:*:: -crontab:x:: -Debian-exim:x:: -bar:*:: diff --git a/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/usermod.test b/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/usermod.test index 846e5bb9..b597cc18 100755 --- a/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/usermod.test +++ b/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/usermod.test @@ -53,7 +53,7 @@ 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 data/gshadow /etc/gshadow +../../../common/compare_file.pl config/etc/gshadow /etc/gshadow echo "OK" faillog > tmp/faillog.out2