[Pkg-shadow-commits] r3428 - in debian/trunk/tests: cktools/02_pwck_sort cktools/02_pwck_sort/data cktools/03_grpck_sort cktools/03_grpck_sort/data cktools/04_pwck_sort_missing_shadow_user cktools/04_pwck_sort_missing_shadow_user/data cktools/05_grpck_sort_missing_shadow_group cktools/05_grpck_sort_missing_shadow_group/data cktools/06_pwck_sort_NIS_server cktools/06_pwck_sort_NIS_server/data cktools/07_pwck_sort_NIS_client cktools/07_pwck_sort_NIS_client/data cktools/grpck/04_grpck_missing_field_group_delete cktools/grpck/04_grpck_missing_field_group_delete/data cktools/grpck/05_grpck_missing_field_group_keep cktools/grpck/05_grpck_missing_field_group_keep/data cktools/grpck/06_grpck_missing_field_group_no_changes cktools/grpck/06_grpck_missing_field_group_no_changes/data cktools/grpck/07_grpck_missing_field_gshadow_add cktools/grpck/07_grpck_missing_field_gshadow_add/data cktools/grpck/08_grpck_missing_field_gshadow_delete cktools/grpck/08_grpck_missing_field_gshadow_delete/data cktools/grpck/09_grpck_missing_field_gshadow_no_changes cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data cktools/grpck/11_grpck_missing_field_gshadow_local/data cktools/grpck/12_grpck_unknown_user_group cktools/grpck/12_grpck_unknown_user_group/data cktools/grpck/13_grpck_unknown_user_gshadow cktools/grpck/13_grpck_unknown_user_gshadow/data cktools/grpck/14_grpck_unknown_user_adm_gshadow cktools/grpck/14_grpck_unknown_user_adm_gshadow/data cktools/grpck/15_grpck_unknown_user_duplicate_group cktools/grpck/15_grpck_unknown_user_duplicate_group/data cktools/grpck/16_grpck_duplicate_entry_group cktools/grpck/16_grpck_duplicate_entry_group/data cktools/grpck/17_grpck_duplicate_entry_gshadow cktools/grpck/17_grpck_duplicate_entry_gshadow/data cktools/grpck/18_grpck_duplicate_entry_group_no_changes cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data cktools/grpck/21_grpck_invalid_group_name cktools/grpck/21_grpck_invalid_group_name/data cktools/grpck/22_grpck_invalid_group_ID_-1 cktools/grpck/22_grpck_invalid_group_ID_-1/data cktools/grpck/23_grpck_invalid_group_ID_4294967295 cktools/grpck/23_grpck_invalid_group_ID_4294967295/data cktools/grpck/24_grpck_invalid_group_ID_4294967296 cktools/grpck/24_grpck_invalid_group_ID_4294967296/data cktools/grpck/26_grpck_no_gshadow_file cktools/grpck/26_grpck_no_gshadow_file/data cktools/grpck/27_grpck_sort_no_gshadow_file cktools/grpck/27_grpck_sort_no_gshadow_file/data cktools/grpck/35_grpck_duplicate_entry_group_NIS cktools/grpck/35_grpck_duplicate_entry_group_NIS/data cktools/pwck cktools/pwck/05_pwck_missing_field_passwd_keep cktools/pwck/05_pwck_missing_field_passwd_keep/data cktools/pwck/07_pwck_missing_field_shadow_add cktools/pwck/07_pwck_missing_field_shadow_add/data cktools/pwck/08_pwck_missing_field_shadow_delete cktools/pwck/08_pwck_missing_field_shadow_delete/data cktools/pwck/13_pwck_duplicate_entry_passwd cktools/pwck/13_pwck_duplicate_entry_passwd/data cktools/pwck/14_pwck_duplicate_entry_shadow cktools/pwck/14_pwck_duplicate_entry_shadow/data cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/data cktools/pwck/20_pwck_invalid_user_ID_4294967295/data convtools/02_grpconv_remove_gshadow_only_entries convtools/02_grpconv_remove_gshadow_only_entries/data convtools/03_grpconv_copy_passwd convtools/03_grpconv_copy_passwd/data convtools/04_grpconv_no_password convtools/04_grpconv_no_password/data convtools/05_grpconv_copy_passwd_existing_gshadow convtools/05_grpconv_copy_passwd_existing_gshadow/data convtools/06_grpconv_error_group_locked convtools/06_grpconv_error_group_locked/data convtools/07_grpconv_error_gshadow_locked convtools/07_grpconv_error_gshadow_locked/data convtools/08_grpunconv_no_gshadow_file convtools/08_grpunconv_no_gshadow_file/data convtools/09_grpunconv_error_group_locked convtools/09_grpunconv_error_group_locked/data convtools/10_grpunconv_error_gshadow_locked convtools/10_grpunconv_error_gshadow_locked/data convtools/11_pwconv_error_passwd_locked convtools/11_pwconv_error_passwd_locked/data convtools/12_pwconv_error_shadow_locked convtools/12_pwconv_error_shadow_locked/data convtools/13_pwunconv_error_passwd_locked convtools/13_pwunconv_error_passwd_locked/data convtools/14_pwunconv_error_shadow_locked convtools/14_pwunconv_error_shadow_locked/data convtools/15_pwconv_remove_shadow_only_entries convtools/15_pwconv_remove_shadow_only_entries/data convtools/16_pwconv_copy_passwd convtools/16_pwconv_copy_passwd/data convtools/17_pwunconv_no_shadow_file convtools/17_pwunconv_no_shadow_file/data convtools/18_pwunconv_user_not_in_shadow convtools/18_pwunconv_user_not_in_shadow/data failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/data failures/groupadd/01_groupadd_gshadow_rename_failure failures/groupadd/01_groupadd_gshadow_rename_failure/data failures/groupadd/02_groupadd_group_rename_failure failures/groupadd/02_groupadd_group_rename_failure/data failures/groupadd/03_groupadd_gshadow_open_failure failures/groupadd/03_groupadd_gshadow_open_failure/data failures/groupadd/04_groupadd_group_open_failure failures/groupadd/04_groupadd_group_open_failure/data failures/groupdel/01_groupdel_gshadow_rename_failure failures/groupdel/01_groupdel_gshadow_rename_failure/data failures/groupdel/02_groupdel_group_rename_failure failures/groupdel/02_groupdel_group_rename_failure/data failures/groupdel/03_groupdel_gshadow_open_failure failures/groupdel/03_groupdel_gshadow_open_failure/data failures/groupdel/04_groupdel_group_open_failure failures/groupdel/04_groupdel_group_open_failure/data failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data failures/groupmod/03_groupmod_change_group_name_group_rename_failure failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data failures/groupmod/04_groupmod_group_open_failure failures/groupmod/04_groupmod_group_open_failure/data failures/groupmod/05_groupmod_gshadow_open_failure failures/groupmod/05_groupmod_gshadow_open_failure/data failures/groupmod/06_groupmod_-g_no_gshadow_open_failure failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data failures/groupmod/07_groupmod_passwd_open_failure failures/groupmod/07_groupmod_passwd_open_failure/data failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data failures/groupmod/09_groupmod_-n_no_passwd_open_failure failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data failures/grpck/02_grpck_group_open_failure/data failures/userdel/04_userdel_passwd_rename_failure/data failures/usermod/01_usermod_change_user_name_gshadow_rename_failure failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data failures/usermod/02_usermod_change_uid_passwd_rename_failure failures/usermod/02_usermod_change_uid_passwd_rename_failure/data failures/usermod/03_usermod_change_user_name_group_rename_failure failures/usermod/03_usermod_change_user_name_group_rename_failure/data failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data failures/usermod/05_usermod_change_uid_shadow_rename_failure failures/usermod/05_usermod_change_uid_shadow_rename_failure/data failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data grouptools/gpasswd/01_gpasswd_change_member_list grouptools/gpasswd/01_gpasswd_change_member_list/data grouptools/gpasswd/02_gpasswd_change_member_list grouptools/gpasswd/02_gpasswd_change_member_list/data grouptools/gpasswd/03_gpasswd_change_member_list grouptools/gpasswd/03_gpasswd_change_member_list/data grouptools/gpasswd/04_gpasswd_change_member_list grouptools/gpasswd/04_gpasswd_change_member_list/data grouptools/gpasswd/05_gpasswd_change_member_list grouptools/gpasswd/05_gpasswd_change_member_list/data grouptools/gpasswd/06_gpasswd_change_member_list grouptools/gpasswd/06_gpasswd_change_member_list/data grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/data grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/data grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/data grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/data grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/data grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/data grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data grouptools/gpasswd/19_gpasswd_change_passwd-root grouptools/gpasswd/19_gpasswd_change_passwd-root/data grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/data grouptools/gpasswd/22_gpasswd_change_passwd-myuser grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/data grouptools/gpasswd/25_gpasswd_remove_password grouptools/gpasswd/25_gpasswd_remove_password/data grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/data grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/data grouptools/gpasswd/28_gpasswd_lock_password grouptools/gpasswd/28_gpasswd_lock_password/data grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/data grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/data grouptools/gpasswd/31_gpasswd_add_user_to_group grouptools/gpasswd/31_gpasswd_add_user_to_group/data grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/data grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data grouptools/gpasswd/34_gpasswd_remove_user_from_group grouptools/gpasswd/34_gpasswd_remove_user_from_group/data grouptools/gpasswd/35_gpasswd_remove_user_from_group grouptools/gpasswd/35_gpasswd_remove_user_from_group/data grouptools/gpasswd/36_gpasswd_remove_user_from_group grouptools/gpasswd/36_gpasswd_remove_user_from_group/data grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/data grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/data grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/data grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/data grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/data grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/data grouptools/gpasswd/43_gpasswd_-r_locked_group grouptools/gpasswd/43_gpasswd_-r_locked_group/data grouptools/gpasswd/44_gpasswd_-r_locked_gshadow grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data grouptools/gpasswd/45_gpasswd_-r_unknown_group grouptools/gpasswd/45_gpasswd_-r_unknown_group/data grouptools/gpasswd/46_gpasswd_-a_unknown_user grouptools/gpasswd/46_gpasswd_-a_unknown_user/data grouptools/gpasswd/47_gpasswd_-M_unknown_user grouptools/gpasswd/47_gpasswd_-M_unknown_user/data grouptools/gpasswd/48_gpasswd_change_admin_list grouptools/gpasswd/48_gpasswd_change_admin_list/data grouptools/gpasswd/49_gpasswd_change_admin_list grouptools/gpasswd/49_gpasswd_change_admin_list/data grouptools/gpasswd/50_gpasswd_change_admin_list grouptools/gpasswd/50_gpasswd_change_admin_list/data grouptools/gpasswd/51_gpasswd_change_admin_list grouptools/gpasswd/51_gpasswd_change_admin_list/data grouptools/gpasswd/52_gpasswd_change_admin_list grouptools/gpasswd/52_gpasswd_change_admin_list/data grouptools/gpasswd/53_gpasswd_change_admin_list grouptools/gpasswd/53_gpasswd_change_admin_list/data grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data grouptools/gpasswd/56_gpasswd_add_user_to_group grouptools/gpasswd/56_gpasswd_add_user_to_group/data grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data grouptools/gpasswd/60_gpasswd_add_long_user_to_group grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data grouptools/groupadd/01_groupadd_add_group grouptools/groupadd/01_groupadd_add_group/data grouptools/groupadd/02_groupadd_add_group_GID_MIN grouptools/groupadd/02_groupadd_add_group_GID_MIN/data grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/data grouptools/groupadd/04_groupadd_set_password grouptools/groupadd/04_groupadd_set_password/data grouptools/groupadd/05_groupadd_set_GID grouptools/groupadd/05_groupadd_set_GID/data grouptools/groupadd/06_groupadd_-f_add_existing_group grouptools/groupadd/06_groupadd_-f_add_existing_group/data grouptools/groupadd/07_groupadd_-f_add_existing_GID grouptools/groupadd/07_groupadd_-f_add_existing_GID/data grouptools/groupadd/08_groupadd_locked_group grouptools/groupadd/08_groupadd_locked_group/data grouptools/groupadd/09_groupadd_locked_gshadow grouptools/groupadd/09_groupadd_locked_gshadow/data grouptools/groupadd/10_groupadd_-o_add_existing_GID grouptools/groupadd/10_groupadd_-o_add_existing_GID/data grouptools/groupadd/11_groupadd_invalid_GID grouptools/groupadd/11_groupadd_invalid_GID/data grouptools/groupadd/12_groupadd_negativ_GID grouptools/groupadd/12_groupadd_negativ_GID/data grouptools/groupadd/13_groupadd_invalid_name grouptools/groupadd/13_groupadd_invalid_name/data grouptools/groupadd/14_groupadd_invalid_-K_option grouptools/groupadd/14_groupadd_invalid_-K_option/data grouptools/groupadd/15_groupadd_invalid_-K_no_= grouptools/groupadd/15_groupadd_invalid_-K_no_=/data grouptools/groupadd/16_groupadd_existing_group grouptools/groupadd/16_groupadd_existing_group/data grouptools/groupadd/17_groupadd_add_systemgroup grouptools/groupadd/17_groupadd_add_systemgroup/data grouptools/groupadd/18_groupadd_no_more_GID grouptools/groupadd/18_groupadd_no_more_GID/data grouptools/groupadd/19_groupadd_-r_no_more_system_GID grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data grouptools/groupadd/20_groupadd_add_existing_GID grouptools/groupadd/20_groupadd_add_existing_GID/data grouptools/groupadd/25_groupadd_no_gshadow grouptools/groupadd/25_groupadd_no_gshadow/data grouptools/groupdel/01_groupdel_delete_group grouptools/groupdel/01_groupdel_delete_group/data grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data grouptools/groupdel/04_groupdel_delete_group_error_busy_group grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data grouptools/groupdel/05_groupdel_delete_group_error_unknown_group grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data grouptools/groupdel/06_groupdel_delete_group_error_locked_group grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data grouptools/groupmems/01_groupmems_root_add_user grouptools/groupmems/01_groupmems_root_add_user/data grouptools/groupmems/02_groupmems_root_del_user grouptools/groupmems/02_groupmems_root_del_user/data grouptools/groupmems/03_groupmems_root_del_user_admin grouptools/groupmems/03_groupmems_root_del_user_admin/data grouptools/groupmems/04_groupmems_root_del_user_admin_and_user grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/data grouptools/groupmems/05_groupmems_root_add_user_with_other_users grouptools/groupmems/05_groupmems_root_add_user_with_other_users/data grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/data grouptools/groupmems/07_groupmems_root_del_user_with_other_users grouptools/groupmems/07_groupmems_root_del_user_with_other_users/data grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/data grouptools/groupmems/09_groupmems_root_purge_user grouptools/groupmems/09_groupmems_root_purge_user/data grouptools/groupmems/10_groupmems_root_purge_user_with_other_users grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/data grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/data grouptools/groupmems/12_groupmems_user_add_user grouptools/groupmems/12_groupmems_user_add_user/data grouptools/groupmems/13_groupmems_user_del_user grouptools/groupmems/13_groupmems_user_del_user/data grouptools/groupmems/14_groupmems_user_del_user_admin grouptools/groupmems/14_groupmems_user_del_user_admin/data grouptools/groupmems/15_groupmems_user_del_user_admin_and_user grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/data grouptools/groupmems/16_groupmems_user_add_user_with_other_users grouptools/groupmems/16_groupmems_user_add_user_with_other_users/data grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/data grouptools/groupmems/18_groupmems_user_del_user_with_other_users grouptools/groupmems/18_groupmems_user_del_user_with_other_users/data grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/data grouptools/groupmems/20_groupmems_user_purge_user grouptools/groupmems/20_groupmems_user_purge_user/data grouptools/groupmems/21_groupmems_user_purge_user_with_other_users grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/data grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/data grouptools/groupmems/23_groupmems_user_add_user-not_in_groups grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data grouptools/groupmems/24_groupmems_user_add_user-not_primary_group grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data grouptools/groupmems/25_groupmems_user_add_user-not_user_group grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data grouptools/groupmems/26_groupmems_user_add_user-already_member grouptools/groupmems/26_groupmems_user_add_user-already_member/data grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/data grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/data grouptools/groupmems/32_groupmems_user_del_user-not_member grouptools/groupmems/32_groupmems_user_del_user-not_member/data grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/data grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/data grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data grouptools/groupmems/37_groupmems_user_purge_user-empty_group grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/data grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data grouptools/groupmems/40_groupmems_user_del_user-not_primary_group grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data grouptools/groupmems/42_groupmems_user_list_users grouptools/groupmems/42_groupmems_user_list_users/data grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data grouptools/groupmems/44_groupmems_user_list_users-another_group grouptools/groupmems/44_groupmems_user_list_users-another_group/data grouptools/groupmems/45_groupmems_user_list_users-group_locked grouptools/groupmems/45_groupmems_user_list_users-group_locked/data grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data grouptools/groupmems/47_groupmems_user_add_user-group_locked grouptools/groupmems/47_groupmems_user_add_user-group_locked/data grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data grouptools/groupmems/49_groupmems_user_del_user-group_locked grouptools/groupmems/49_groupmems_user_del_user-group_locked/data grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data grouptools/groupmems/51_groupmems_user_purge_user-group_locked grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data grouptools/groupmod/01_groupmod_change_gid grouptools/groupmod/01_groupmod_change_gid/data grouptools/groupmod/02_groupmod_change_gid_change_primary_group grouptools/groupmod/02_groupmod_change_gid_change_primary_group/data grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/data grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data grouptools/groupmod/06_groupmod_change_group_name grouptools/groupmod/06_groupmod_change_group_name/data grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/data grouptools/groupmod/09_groupmod_set_password grouptools/groupmod/09_groupmod_set_password/data grouptools/groupmod/10_groupmod_set_password_no_gshadow_group grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data grouptools/groupmod/11_groupmod_set_password_no_gshadow_file grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/data grouptools/groupmod/12_groupmod_change_gid_error_unknown_group grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data grouptools/groupmod/13_groupmod_change_gid_error_used_GID grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data grouptools/groupmod/14_groupmod_change_group_name_error_used_name grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data grouptools/groupmod/16_groupmod_change_group_name_no_changes grouptools/groupmod/16_groupmod_change_group_name_no_changes/data grouptools/groupmod/17_groupmod_change_gid_error_locked_group grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data grouptools/groupmod/21_groupmod_change_gid_error_no_group grouptools/groupmod/21_groupmod_change_gid_error_no_group/data grouptools/groupmod/22_groupmod_change_gid_and_group_name grouptools/groupmod/22_groupmod_change_gid_and_group_name/data grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/data grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/data grouptools/groupmod/29_groupmod_-g_same_gid_new_name grouptools/groupmod/29_groupmod_-g_same_gid_new_name/data grouptools/groupmod/30_groupmod_-g_same_gid_same_name grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data grouptools/groupmod/31_groupmod_-g_same_gid grouptools/groupmod/31_groupmod_-g_same_gid/data grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/data newusers/02_update_password newusers/02_update_password/data newusers/03_no_update_pid newusers/03_no_update_pid/data newusers/04_no_update_gid newusers/04_no_update_gid/data newusers/10_create_user_gid-as-group-bar newusers/10_create_user_gid-as-group-bar/data newusers/11_update_gecos newusers/11_update_gecos/data newusers/12_update_shell newusers/12_update_shell/data newusers/15_update_new-home newusers/15_update_new-home/data newusers/16_update_existing-home newusers/16_update_existing-home/data newusers/18_create_user_gid-already-used newusers/18_create_user_gid-already-used/data newusers/19_update_keep-old-home newusers/19_update_keep-old-home/data newusers/23_create_user_error_negativ_UID newusers/23_create_user_error_negativ_UID/data newusers/24_create_user_error_invalid_UID newusers/24_create_user_error_invalid_UID/data newusers/25_create_user_error_no_remaining_UID newusers/25_create_user_error_no_remaining_UID/data newusers/26_create_user_error_no_remaining_GID newusers/26_create_user_error_no_remaining_GID/data newusers/27_create_user_error_invalid_username newusers/27_create_user_error_invalid_username/data newusers/28_create_user_error_invalid_groupname newusers/28_create_user_error_invalid_groupname/data newusers/29_create_user_error_invalid_username_valid_groupname newusers/29_create_user_error_invalid_username_valid_groupname/data newusers/31_create_user_error_invalid_GID newusers/31_create_user_error_invalid_GID/data newusers/32_create_user_error_gshadow_group_exists newusers/32_create_user_error_gshadow_group_exists/data newusers/33_update_password_no_shadow_password newusers/33_update_password_no_shadow_password/data newusers/34_update_password_no_shadow newusers/34_update_password_no_shadow/data newusers/38_update_password_no_shadow_encrypted/data newusers/39_update_password_no_shadow_password_encrypted/data newusers/40_update_password_encrypted/data split_groups/05_useradd_split_group_already_split_passwd_differ split_groups/05_useradd_split_group_already_split_passwd_differ/data split_groups/06_useradd_split_group_already_split_GID_differ split_groups/06_useradd_split_group_already_split_GID_differ/data split_groups/08_useradd_no_split_group_already_split split_groups/08_useradd_no_split_group_already_split/data split_groups/09_groupdel_split_group_already_split split_groups/09_groupdel_split_group_already_split/data split_groups/10_groupdel_no_split_group_already_split split_groups/10_groupdel_no_split_group_already_split/data usertools/11_usermod_move_homedir usertools/11_usermod_move_homedir/data usertools/12_usermod_move_homedir_dev_null usertools/12_usermod_move_homedir_dev_null/data usertools/13_usermod_move_homedir_file usertools/13_usermod_move_homedir_file/data usertools/14_usermod_move_homedir_other_device usertools/14_usermod_move_homedir_other_device/data usertools/15_usermod_change_supplementary_groups usertools/15_usermod_change_supplementary_groups/data usertools/16_usermod_remove_supplementary_groups usertools/16_usermod_remove_supplementary_groups/data usertools/17_usermod_change_supplementary_groups_numerical usertools/17_usermod_change_supplementary_groups_numerical/data usertools/18_usermod_change_supplementary_groups-unknown_group usertools/18_usermod_change_supplementary_groups-unknown_group/data usertools/19_usermod_change_supplementary_groups-unknown_numerical_group usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data usertools/20_usermod_rename_user_in_member_lists/data usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/data usertools/22_usermod-a_existing_supplementary_group usertools/22_usermod-a_existing_supplementary_group/data usertools/23_usermod-a_existing_supplementary_group+rename/data usertools/32_usermod-u_new_UID usertools/32_usermod-u_new_UID/data usertools/33_usermod-u_existing_UID usertools/33_usermod-u_existing_UID/data usertools/34_usermod-u-o_existing_UID usertools/34_usermod-u-o_existing_UID/data usertools/35_usermod-u_invalid_UID usertools/35_usermod-u_invalid_UID/data usertools/36_usermod_change_uid+move_homedir_other_device usertools/36_usermod_change_uid+move_homedir_other_device/data usertools/37_Debian_Bug_470745/data usertools/38_usermod_invalid_user usertools/38_usermod_invalid_user/data usertools/39_usermod_-c_invalid_comment usertools/39_usermod_-c_invalid_comment/data usertools/40_usermod_-d_invalid_homedir usertools/40_usermod_-d_invalid_homedir/data usertools/41_usermod_-d_invalid_shell usertools/41_usermod_-d_invalid_shell/data usertools/42_usermod_-g_invalid_group_name usertools/42_usermod_-g_invalid_group_name/data usertools/43_usermod_-g_invalid_group_ID usertools/43_usermod_-g_invalid_group_ID/data usertools/44_usermod-l_existing_username usertools/44_usermod-l_existing_username/data usertools/45_usermod-l_existing_username_passwd usertools/45_usermod-l_existing_username_passwd/data usertools/46_usermod-l_existing_username_shadow usertools/46_usermod-l_existing_username_shadow/data usertools/47_usermod-l_no_shadow_file/data usertools/48_userdel_keep_group_if_primary_other_user usertools/48_userdel_keep_group_if_primary_other_user/data usertools/50_userdel_delete_users_group_no_gshadow_group usertools/50_userdel_delete_users_group_no_gshadow_group/data usertools/52_userdel_delete_user_no_shadow_entry usertools/52_userdel_delete_user_no_shadow_entry/data usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/data usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/data usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/data usertools/usermod/06_usermod_lock_already_locked_password3/data usertools/usermod/40_usermod-u_reset_new_lastlog_entry usertools/usermod/40_usermod-u_reset_new_lastlog_entry/data usertools/usermod/41_usermod-u_faillog_not_created/data usertools/usermod/42_usermod-u_copy_faillog_entry/data usertools/usermod/43_usermod-u_reset_new_faillog_entry usertools/usermod/43_usermod-u_reset_new_faillog_entry/data

• Previous message: [Pkg-shadow-commits] r3427 - debian/trunk/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry
• Next message: [Pkg-shadow-commits] r3429 - debian/trunk/debian
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Author: nekral-guest
Date: 2011-07-17 12:00:16 +0000 (Sun, 17 Jul 2011)
New Revision: 3428

Added:
   debian/trunk/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/
Removed:
   debian/trunk/tests/cktools/02_pwck_sort/data/group
   debian/trunk/tests/cktools/02_pwck_sort/data/gshadow
   debian/trunk/tests/cktools/03_grpck_sort/data/passwd
   debian/trunk/tests/cktools/03_grpck_sort/data/shadow
   debian/trunk/tests/cktools/04_pwck_sort_missing_shadow_user/data/group
   debian/trunk/tests/cktools/04_pwck_sort_missing_shadow_user/data/gshadow
   debian/trunk/tests/cktools/05_grpck_sort_missing_shadow_group/data/passwd
   debian/trunk/tests/cktools/05_grpck_sort_missing_shadow_group/data/shadow
   debian/trunk/tests/cktools/06_pwck_sort_NIS_server/data/group
   debian/trunk/tests/cktools/06_pwck_sort_NIS_server/data/gshadow
   debian/trunk/tests/cktools/07_pwck_sort_NIS_client/data/group
   debian/trunk/tests/cktools/07_pwck_sort_NIS_client/data/gshadow
   debian/trunk/tests/cktools/grpck/04_grpck_missing_field_group_delete/data/passwd
   debian/trunk/tests/cktools/grpck/04_grpck_missing_field_group_delete/data/shadow
   debian/trunk/tests/cktools/grpck/05_grpck_missing_field_group_keep/data/group
   debian/trunk/tests/cktools/grpck/05_grpck_missing_field_group_keep/data/passwd
   debian/trunk/tests/cktools/grpck/05_grpck_missing_field_group_keep/data/shadow
   debian/trunk/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/group
   debian/trunk/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/gshadow
   debian/trunk/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/passwd
   debian/trunk/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/shadow
   debian/trunk/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/data/group
   debian/trunk/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/data/passwd
   debian/trunk/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/data/shadow
   debian/trunk/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/data/group
   debian/trunk/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/data/passwd
   debian/trunk/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/data/shadow
   debian/trunk/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/group
   debian/trunk/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/gshadow
   debian/trunk/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/passwd
   debian/trunk/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/shadow
   debian/trunk/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/data/passwd
   debian/trunk/tests/cktools/grpck/12_grpck_unknown_user_group/data/gshadow
   debian/trunk/tests/cktools/grpck/12_grpck_unknown_user_group/data/passwd
   debian/trunk/tests/cktools/grpck/12_grpck_unknown_user_group/data/shadow
   debian/trunk/tests/cktools/grpck/13_grpck_unknown_user_gshadow/data/group
   debian/trunk/tests/cktools/grpck/13_grpck_unknown_user_gshadow/data/passwd
   debian/trunk/tests/cktools/grpck/13_grpck_unknown_user_gshadow/data/shadow
   debian/trunk/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/data/group
   debian/trunk/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/data/passwd
   debian/trunk/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/data/shadow
   debian/trunk/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/data/gshadow
   debian/trunk/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/data/passwd
   debian/trunk/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/data/shadow
   debian/trunk/tests/cktools/grpck/16_grpck_duplicate_entry_group/data/gshadow
   debian/trunk/tests/cktools/grpck/16_grpck_duplicate_entry_group/data/passwd
   debian/trunk/tests/cktools/grpck/16_grpck_duplicate_entry_group/data/shadow
   debian/trunk/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/data/group
   debian/trunk/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/data/passwd
   debian/trunk/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/data/shadow
   debian/trunk/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/group
   debian/trunk/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/gshadow
   debian/trunk/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/passwd
   debian/trunk/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/shadow
   debian/trunk/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/group
   debian/trunk/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/gshadow
   debian/trunk/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/passwd
   debian/trunk/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/shadow
   debian/trunk/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data/group
   debian/trunk/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data/passwd
   debian/trunk/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data/shadow
   debian/trunk/tests/cktools/grpck/21_grpck_invalid_group_name/data/group
   debian/trunk/tests/cktools/grpck/21_grpck_invalid_group_name/data/gshadow
   debian/trunk/tests/cktools/grpck/21_grpck_invalid_group_name/data/passwd
   debian/trunk/tests/cktools/grpck/21_grpck_invalid_group_name/data/shadow
   debian/trunk/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/data/passwd
   debian/trunk/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/data/shadow
   debian/trunk/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/group
   debian/trunk/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/gshadow
   debian/trunk/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/passwd
   debian/trunk/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/shadow
   debian/trunk/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/data/passwd
   debian/trunk/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/data/shadow
   debian/trunk/tests/cktools/grpck/26_grpck_no_gshadow_file/data/group
   debian/trunk/tests/cktools/grpck/26_grpck_no_gshadow_file/data/passwd
   debian/trunk/tests/cktools/grpck/26_grpck_no_gshadow_file/data/shadow
   debian/trunk/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/data/passwd
   debian/trunk/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/data/shadow
   debian/trunk/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/data/gshadow
   debian/trunk/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/data/passwd
   debian/trunk/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/data/shadow
   debian/trunk/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/data/passwd
   debian/trunk/tests/cktools/pwck/07_pwck_missing_field_shadow_add/data/passwd
   debian/trunk/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/data/passwd
   debian/trunk/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/data/shadow
   debian/trunk/tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/
   debian/trunk/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/data/passwd
   debian/trunk/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/data/shadow
   debian/trunk/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/data/passwd
   debian/trunk/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/data/shadow
   debian/trunk/tests/convtools/02_grpconv_remove_gshadow_only_entries/data/group
   debian/trunk/tests/convtools/02_grpconv_remove_gshadow_only_entries/data/passwd
   debian/trunk/tests/convtools/02_grpconv_remove_gshadow_only_entries/data/shadow
   debian/trunk/tests/convtools/03_grpconv_copy_passwd/data/passwd
   debian/trunk/tests/convtools/03_grpconv_copy_passwd/data/shadow
   debian/trunk/tests/convtools/04_grpconv_no_password/data/passwd
   debian/trunk/tests/convtools/04_grpconv_no_password/data/shadow
   debian/trunk/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/data/passwd
   debian/trunk/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/data/shadow
   debian/trunk/tests/convtools/06_grpconv_error_group_locked/data/group
   debian/trunk/tests/convtools/06_grpconv_error_group_locked/data/gshadow
   debian/trunk/tests/convtools/06_grpconv_error_group_locked/data/passwd
   debian/trunk/tests/convtools/06_grpconv_error_group_locked/data/shadow
   debian/trunk/tests/convtools/07_grpconv_error_gshadow_locked/data/group
   debian/trunk/tests/convtools/07_grpconv_error_gshadow_locked/data/gshadow
   debian/trunk/tests/convtools/07_grpconv_error_gshadow_locked/data/passwd
   debian/trunk/tests/convtools/07_grpconv_error_gshadow_locked/data/shadow
   debian/trunk/tests/convtools/08_grpunconv_no_gshadow_file/data/group
   debian/trunk/tests/convtools/08_grpunconv_no_gshadow_file/data/passwd
   debian/trunk/tests/convtools/08_grpunconv_no_gshadow_file/data/shadow
   debian/trunk/tests/convtools/09_grpunconv_error_group_locked/data/group
   debian/trunk/tests/convtools/09_grpunconv_error_group_locked/data/gshadow
   debian/trunk/tests/convtools/09_grpunconv_error_group_locked/data/passwd
   debian/trunk/tests/convtools/09_grpunconv_error_group_locked/data/shadow
   debian/trunk/tests/convtools/10_grpunconv_error_gshadow_locked/data/group
   debian/trunk/tests/convtools/10_grpunconv_error_gshadow_locked/data/gshadow
   debian/trunk/tests/convtools/10_grpunconv_error_gshadow_locked/data/passwd
   debian/trunk/tests/convtools/10_grpunconv_error_gshadow_locked/data/shadow
   debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/group
   debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/gshadow
   debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/passwd
   debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/shadow
   debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/group
   debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/gshadow
   debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/passwd
   debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/shadow
   debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/group
   debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/gshadow
   debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/passwd
   debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/shadow
   debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/group
   debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/gshadow
   debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/passwd
   debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/shadow
   debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/group
   debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/gshadow
   debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/passwd
   debian/trunk/tests/convtools/16_pwconv_copy_passwd/data/group
   debian/trunk/tests/convtools/16_pwconv_copy_passwd/data/gshadow
   debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/data/group
   debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/data/gshadow
   debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/data/passwd
   debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/data/group
   debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/data/gshadow
   debian/trunk/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/data/shadow
   debian/trunk/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/gshadow
   debian/trunk/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/passwd
   debian/trunk/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/shadow
   debian/trunk/tests/failures/groupadd/02_groupadd_group_rename_failure/data/group
   debian/trunk/tests/failures/groupadd/02_groupadd_group_rename_failure/data/gshadow
   debian/trunk/tests/failures/groupadd/02_groupadd_group_rename_failure/data/passwd
   debian/trunk/tests/failures/groupadd/02_groupadd_group_rename_failure/data/shadow
   debian/trunk/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/group
   debian/trunk/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/gshadow
   debian/trunk/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/passwd
   debian/trunk/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/shadow
   debian/trunk/tests/failures/groupadd/04_groupadd_group_open_failure/data/group
   debian/trunk/tests/failures/groupadd/04_groupadd_group_open_failure/data/gshadow
   debian/trunk/tests/failures/groupadd/04_groupadd_group_open_failure/data/passwd
   debian/trunk/tests/failures/groupadd/04_groupadd_group_open_failure/data/shadow
   debian/trunk/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/gshadow
   debian/trunk/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/passwd
   debian/trunk/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/shadow
   debian/trunk/tests/failures/groupdel/02_groupdel_group_rename_failure/data/group
   debian/trunk/tests/failures/groupdel/02_groupdel_group_rename_failure/data/gshadow
   debian/trunk/tests/failures/groupdel/02_groupdel_group_rename_failure/data/passwd
   debian/trunk/tests/failures/groupdel/02_groupdel_group_rename_failure/data/shadow
   debian/trunk/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/group
   debian/trunk/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/gshadow
   debian/trunk/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/passwd
   debian/trunk/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/shadow
   debian/trunk/tests/failures/groupdel/04_groupdel_group_open_failure/data/group
   debian/trunk/tests/failures/groupdel/04_groupdel_group_open_failure/data/gshadow
   debian/trunk/tests/failures/groupdel/04_groupdel_group_open_failure/data/passwd
   debian/trunk/tests/failures/groupdel/04_groupdel_group_open_failure/data/shadow
   debian/trunk/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/gshadow
   debian/trunk/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/passwd
   debian/trunk/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/shadow
   debian/trunk/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/gshadow
   debian/trunk/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/passwd
   debian/trunk/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/shadow
   debian/trunk/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/group
   debian/trunk/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/gshadow
   debian/trunk/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/passwd
   debian/trunk/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/shadow
   debian/trunk/tests/failures/groupmod/04_groupmod_group_open_failure/data/group
   debian/trunk/tests/failures/groupmod/04_groupmod_group_open_failure/data/gshadow
   debian/trunk/tests/failures/groupmod/04_groupmod_group_open_failure/data/passwd
   debian/trunk/tests/failures/groupmod/04_groupmod_group_open_failure/data/shadow
   debian/trunk/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/group
   debian/trunk/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/gshadow
   debian/trunk/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/passwd
   debian/trunk/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/shadow
   debian/trunk/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/groupmod.err
   debian/trunk/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/gshadow
   debian/trunk/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/passwd
   debian/trunk/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/shadow
   debian/trunk/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/group
   debian/trunk/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/gshadow
   debian/trunk/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/passwd
   debian/trunk/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/shadow
   debian/trunk/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/group
   debian/trunk/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/groupmod.err
   debian/trunk/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/gshadow
   debian/trunk/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/passwd
   debian/trunk/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/shadow
   debian/trunk/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/groupmod.err
   debian/trunk/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/passwd
   debian/trunk/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/shadow
   debian/trunk/tests/failures/grpck/02_grpck_group_open_failure/data/group
   debian/trunk/tests/failures/userdel/04_userdel_passwd_rename_failure/data/group
   debian/trunk/tests/failures/userdel/04_userdel_passwd_rename_failure/data/passwd
   debian/trunk/tests/failures/userdel/04_userdel_passwd_rename_failure/data/shadow
   debian/trunk/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/gshadow
   debian/trunk/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/group
   debian/trunk/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/gshadow
   debian/trunk/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/passwd
   debian/trunk/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/shadow
   debian/trunk/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/data/group
   debian/trunk/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/data/gshadow
   debian/trunk/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/group
   debian/trunk/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/gshadow
   debian/trunk/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/usermod.err
   debian/trunk/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/group
   debian/trunk/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/gshadow
   debian/trunk/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/shadow
   debian/trunk/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/group
   debian/trunk/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/gshadow
   debian/trunk/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/passwd
   debian/trunk/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/shadow
   debian/trunk/tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/passwd
   debian/trunk/tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/shadow
   debian/trunk/tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/passwd
   debian/trunk/tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/shadow
   debian/trunk/tests/grouptools/gpasswd/03_gpasswd_change_member_list/data/passwd
   debian/trunk/tests/grouptools/gpasswd/03_gpasswd_change_member_list/data/shadow
   debian/trunk/tests/grouptools/gpasswd/04_gpasswd_change_member_list/data/passwd
   debian/trunk/tests/grouptools/gpasswd/04_gpasswd_change_member_list/data/shadow
   debian/trunk/tests/grouptools/gpasswd/05_gpasswd_change_member_list/data/passwd
   debian/trunk/tests/grouptools/gpasswd/05_gpasswd_change_member_list/data/shadow
   debian/trunk/tests/grouptools/gpasswd/06_gpasswd_change_member_list/data/passwd
   debian/trunk/tests/grouptools/gpasswd/06_gpasswd_change_member_list/data/shadow
   debian/trunk/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/data/passwd
   debian/trunk/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/data/shadow
   debian/trunk/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/data/passwd
   debian/trunk/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/data/shadow
   debian/trunk/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/data/passwd
   debian/trunk/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/data/shadow
   debian/trunk/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/data/passwd
   debian/trunk/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/data/shadow
   debian/trunk/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/data/passwd
   debian/trunk/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/data/shadow
   debian/trunk/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/data/passwd
   debian/trunk/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/data/shadow
   debian/trunk/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/gshadow
   debian/trunk/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/passwd
   debian/trunk/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/shadow
   debian/trunk/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data/gshadow
   debian/trunk/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data/passwd
   debian/trunk/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data/shadow
   debian/trunk/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data/gshadow
   debian/trunk/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data/passwd
   debian/trunk/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data/shadow
   debian/trunk/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data/gshadow
   debian/trunk/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data/passwd
   debian/trunk/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data/shadow
   debian/trunk/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data/gshadow
   debian/trunk/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data/passwd
   debian/trunk/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data/shadow
   debian/trunk/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data/gshadow
   debian/trunk/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data/passwd
   debian/trunk/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data/shadow
   debian/trunk/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/data/group
   debian/trunk/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/data/passwd
   debian/trunk/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/data/shadow
   debian/trunk/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data/group
   debian/trunk/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data/passwd
   debian/trunk/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data/shadow
   debian/trunk/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/data/passwd
   debian/trunk/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/data/shadow
   debian/trunk/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data/group
   debian/trunk/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data/passwd
   debian/trunk/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data/shadow
   debian/trunk/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/group
   debian/trunk/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/gshadow
   debian/trunk/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/passwd
   debian/trunk/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/shadow
   debian/trunk/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/data/group
   debian/trunk/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/data/passwd
   debian/trunk/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/data/shadow
   debian/trunk/tests/grouptools/gpasswd/25_gpasswd_remove_password/data/passwd
   debian/trunk/tests/grouptools/gpasswd/25_gpasswd_remove_password/data/shadow
   debian/trunk/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/data/passwd
   debian/trunk/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/data/shadow
   debian/trunk/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/data/passwd
   debian/trunk/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/data/shadow
   debian/trunk/tests/grouptools/gpasswd/28_gpasswd_lock_password/data/passwd
   debian/trunk/tests/grouptools/gpasswd/28_gpasswd_lock_password/data/shadow
   debian/trunk/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/data/passwd
   debian/trunk/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/data/shadow
   debian/trunk/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/data/passwd
   debian/trunk/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/data/shadow
   debian/trunk/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/data/passwd
   debian/trunk/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/data/shadow
   debian/trunk/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/data/passwd
   debian/trunk/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/data/shadow
   debian/trunk/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data/gshadow
   debian/trunk/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data/passwd
   debian/trunk/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data/shadow
   debian/trunk/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/passwd
   debian/trunk/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/shadow
   debian/trunk/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/data/passwd
   debian/trunk/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/data/shadow
   debian/trunk/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/data/passwd
   debian/trunk/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/data/shadow
   debian/trunk/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/data/passwd
   debian/trunk/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/data/shadow
   debian/trunk/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/data/passwd
   debian/trunk/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/data/shadow
   debian/trunk/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/data/passwd
   debian/trunk/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/data/shadow
   debian/trunk/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/data/passwd
   debian/trunk/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/data/shadow
   debian/trunk/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/data/passwd
   debian/trunk/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/data/shadow
   debian/trunk/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/data/passwd
   debian/trunk/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/data/shadow
   debian/trunk/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/group
   debian/trunk/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/gshadow
   debian/trunk/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/passwd
   debian/trunk/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/shadow
   debian/trunk/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/group
   debian/trunk/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/gshadow
   debian/trunk/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/passwd
   debian/trunk/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/shadow
   debian/trunk/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/group
   debian/trunk/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/gshadow
   debian/trunk/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/passwd
   debian/trunk/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/shadow
   debian/trunk/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/group
   debian/trunk/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/gshadow
   debian/trunk/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/passwd
   debian/trunk/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/shadow
   debian/trunk/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/group
   debian/trunk/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/gshadow
   debian/trunk/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/passwd
   debian/trunk/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/shadow
   debian/trunk/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/data/group
   debian/trunk/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/data/passwd
   debian/trunk/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/data/shadow
   debian/trunk/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/group
   debian/trunk/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/passwd
   debian/trunk/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/shadow
   debian/trunk/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/data/group
   debian/trunk/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/data/passwd
   debian/trunk/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/data/shadow
   debian/trunk/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/data/group
   debian/trunk/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/data/passwd
   debian/trunk/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/data/shadow
   debian/trunk/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/data/group
   debian/trunk/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/data/passwd
   debian/trunk/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/data/shadow
   debian/trunk/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/data/group
   debian/trunk/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/data/passwd
   debian/trunk/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/data/shadow
   debian/trunk/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data/group
   debian/trunk/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data/passwd
   debian/trunk/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data/shadow
   debian/trunk/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/group
   debian/trunk/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/gshadow
   debian/trunk/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/passwd
   debian/trunk/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/shadow
   debian/trunk/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/group
   debian/trunk/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/gshadow
   debian/trunk/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/passwd
   debian/trunk/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/shadow
   debian/trunk/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/group
   debian/trunk/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/gshadow
   debian/trunk/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/passwd
   debian/trunk/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/shadow
   debian/trunk/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data/gshadow
   debian/trunk/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data/passwd
   debian/trunk/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data/shadow
   debian/trunk/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data/group
   debian/trunk/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data/passwd
   debian/trunk/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data/shadow
   debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/passwd
   debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/shadow
   debian/trunk/tests/grouptools/groupadd/01_groupadd_add_group/data/passwd
   debian/trunk/tests/grouptools/groupadd/01_groupadd_add_group/data/shadow
   debian/trunk/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/data/passwd
   debian/trunk/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/data/shadow
   debian/trunk/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/data/passwd
   debian/trunk/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/data/shadow
   debian/trunk/tests/grouptools/groupadd/04_groupadd_set_password/data/passwd
   debian/trunk/tests/grouptools/groupadd/04_groupadd_set_password/data/shadow
   debian/trunk/tests/grouptools/groupadd/05_groupadd_set_GID/data/passwd
   debian/trunk/tests/grouptools/groupadd/05_groupadd_set_GID/data/shadow
   debian/trunk/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/group
   debian/trunk/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/gshadow
   debian/trunk/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/passwd
   debian/trunk/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/shadow
   debian/trunk/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/data/passwd
   debian/trunk/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/data/shadow
   debian/trunk/tests/grouptools/groupadd/08_groupadd_locked_group/data/group
   debian/trunk/tests/grouptools/groupadd/08_groupadd_locked_group/data/gshadow
   debian/trunk/tests/grouptools/groupadd/08_groupadd_locked_group/data/passwd
   debian/trunk/tests/grouptools/groupadd/08_groupadd_locked_group/data/shadow
   debian/trunk/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/group
   debian/trunk/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/gshadow
   debian/trunk/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/passwd
   debian/trunk/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/shadow
   debian/trunk/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/data/passwd
   debian/trunk/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/data/shadow
   debian/trunk/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/group
   debian/trunk/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/gshadow
   debian/trunk/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/passwd
   debian/trunk/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/shadow
   debian/trunk/tests/grouptools/groupadd/12_groupadd_negativ_GID/data/group
   debian/trunk/tests/grouptools/groupadd/12_groupadd_negativ_GID/data/gshadow
   debian/trunk/tests/grouptools/groupadd/12_groupadd_negativ_GID/data/passwd
   debian/trunk/tests/grouptools/groupadd/12_groupadd_negativ_GID/data/shadow
   debian/trunk/tests/grouptools/groupadd/13_groupadd_invalid_name/data/group
   debian/trunk/tests/grouptools/groupadd/13_groupadd_invalid_name/data/gshadow
   debian/trunk/tests/grouptools/groupadd/13_groupadd_invalid_name/data/passwd
   debian/trunk/tests/grouptools/groupadd/13_groupadd_invalid_name/data/shadow
   debian/trunk/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/group
   debian/trunk/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/gshadow
   debian/trunk/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/passwd
   debian/trunk/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/shadow
   debian/trunk/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/group
   debian/trunk/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/gshadow
   debian/trunk/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/passwd
   debian/trunk/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/shadow
   debian/trunk/tests/grouptools/groupadd/16_groupadd_existing_group/data/group
   debian/trunk/tests/grouptools/groupadd/16_groupadd_existing_group/data/gshadow
   debian/trunk/tests/grouptools/groupadd/16_groupadd_existing_group/data/passwd
   debian/trunk/tests/grouptools/groupadd/16_groupadd_existing_group/data/shadow
   debian/trunk/tests/grouptools/groupadd/17_groupadd_add_systemgroup/data/passwd
   debian/trunk/tests/grouptools/groupadd/17_groupadd_add_systemgroup/data/shadow
   debian/trunk/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/group
   debian/trunk/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/gshadow
   debian/trunk/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/passwd
   debian/trunk/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/shadow
   debian/trunk/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/group
   debian/trunk/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/gshadow
   debian/trunk/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/passwd
   debian/trunk/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/shadow
   debian/trunk/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/group
   debian/trunk/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/gshadow
   debian/trunk/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/passwd
   debian/trunk/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/shadow
   debian/trunk/tests/grouptools/groupadd/25_groupadd_no_gshadow/data/passwd
   debian/trunk/tests/grouptools/groupadd/25_groupadd_no_gshadow/data/shadow
   debian/trunk/tests/grouptools/groupdel/01_groupdel_delete_group/data/passwd
   debian/trunk/tests/grouptools/groupdel/01_groupdel_delete_group/data/shadow
   debian/trunk/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data/gshadow
   debian/trunk/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data/passwd
   debian/trunk/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data/shadow
   debian/trunk/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/gshadow
   debian/trunk/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/passwd
   debian/trunk/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/shadow
   debian/trunk/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/group
   debian/trunk/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/gshadow
   debian/trunk/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/passwd
   debian/trunk/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/shadow
   debian/trunk/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/group
   debian/trunk/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/gshadow
   debian/trunk/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/passwd
   debian/trunk/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/shadow
   debian/trunk/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/group
   debian/trunk/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/gshadow
   debian/trunk/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/passwd
   debian/trunk/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/shadow
   debian/trunk/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/group
   debian/trunk/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/gshadow
   debian/trunk/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/passwd
   debian/trunk/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/shadow
   debian/trunk/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/group
   debian/trunk/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/gshadow
   debian/trunk/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/passwd
   debian/trunk/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/shadow
   debian/trunk/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/group
   debian/trunk/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/gshadow
   debian/trunk/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/passwd
   debian/trunk/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/shadow
   debian/trunk/tests/grouptools/groupmems/01_groupmems_root_add_user/data/passwd
   debian/trunk/tests/grouptools/groupmems/01_groupmems_root_add_user/data/shadow
   debian/trunk/tests/grouptools/groupmems/02_groupmems_root_del_user/data/passwd
   debian/trunk/tests/grouptools/groupmems/02_groupmems_root_del_user/data/shadow
   debian/trunk/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/data/passwd
   debian/trunk/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/data/shadow
   debian/trunk/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/data/passwd
   debian/trunk/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/data/shadow
   debian/trunk/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/data/passwd
   debian/trunk/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/data/shadow
   debian/trunk/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/data/passwd
   debian/trunk/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/data/shadow
   debian/trunk/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/data/passwd
   debian/trunk/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/data/shadow
   debian/trunk/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/data/passwd
   debian/trunk/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/data/shadow
   debian/trunk/tests/grouptools/groupmems/09_groupmems_root_purge_user/data/passwd
   debian/trunk/tests/grouptools/groupmems/09_groupmems_root_purge_user/data/shadow
   debian/trunk/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/data/passwd
   debian/trunk/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/data/shadow
   debian/trunk/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/data/passwd
   debian/trunk/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/data/shadow
   debian/trunk/tests/grouptools/groupmems/12_groupmems_user_add_user/data/passwd
   debian/trunk/tests/grouptools/groupmems/12_groupmems_user_add_user/data/shadow
   debian/trunk/tests/grouptools/groupmems/13_groupmems_user_del_user/data/passwd
   debian/trunk/tests/grouptools/groupmems/13_groupmems_user_del_user/data/shadow
   debian/trunk/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/data/passwd
   debian/trunk/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/data/shadow
   debian/trunk/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/data/passwd
   debian/trunk/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/data/shadow
   debian/trunk/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/data/passwd
   debian/trunk/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/data/shadow
   debian/trunk/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/data/passwd
   debian/trunk/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/data/shadow
   debian/trunk/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/data/passwd
   debian/trunk/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/data/shadow
   debian/trunk/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/data/passwd
   debian/trunk/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/data/shadow
   debian/trunk/tests/grouptools/groupmems/20_groupmems_user_purge_user/data/passwd
   debian/trunk/tests/grouptools/groupmems/20_groupmems_user_purge_user/data/shadow
   debian/trunk/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/data/passwd
   debian/trunk/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/data/shadow
   debian/trunk/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/data/passwd
   debian/trunk/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/data/shadow
   debian/trunk/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/group
   debian/trunk/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/gshadow
   debian/trunk/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/passwd
   debian/trunk/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/shadow
   debian/trunk/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/group
   debian/trunk/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/gshadow
   debian/trunk/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/passwd
   debian/trunk/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/shadow
   debian/trunk/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/group
   debian/trunk/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/gshadow
   debian/trunk/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/passwd
   debian/trunk/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/shadow
   debian/trunk/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/group
   debian/trunk/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/gshadow
   debian/trunk/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/passwd
   debian/trunk/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/shadow
   debian/trunk/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/group
   debian/trunk/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/gshadow
   debian/trunk/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/passwd
   debian/trunk/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/shadow
   debian/trunk/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data/gshadow
   debian/trunk/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data/passwd
   debian/trunk/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data/shadow
   debian/trunk/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/group
   debian/trunk/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/gshadow
   debian/trunk/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/passwd
   debian/trunk/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/shadow
   debian/trunk/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/data/passwd
   debian/trunk/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/data/shadow
   debian/trunk/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/data/passwd
   debian/trunk/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/data/shadow
   debian/trunk/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/group
   debian/trunk/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/gshadow
   debian/trunk/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/passwd
   debian/trunk/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/shadow
   debian/trunk/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data/gshadow
   debian/trunk/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data/passwd
   debian/trunk/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data/shadow
   debian/trunk/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/data/passwd
   debian/trunk/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/data/shadow
   debian/trunk/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/data/passwd
   debian/trunk/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/data/shadow
   debian/trunk/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data/gshadow
   debian/trunk/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data/passwd
   debian/trunk/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data/shadow
   debian/trunk/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data/group
   debian/trunk/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data/passwd
   debian/trunk/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data/shadow
   debian/trunk/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/data/passwd
   debian/trunk/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/data/shadow
   debian/trunk/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data/gshadow
   debian/trunk/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data/passwd
   debian/trunk/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data/shadow
   debian/trunk/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/group
   debian/trunk/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/gshadow
   debian/trunk/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/passwd
   debian/trunk/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/shadow
   debian/trunk/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/group
   debian/trunk/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/gshadow
   debian/trunk/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/passwd
   debian/trunk/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/shadow
   debian/trunk/tests/grouptools/groupmems/42_groupmems_user_list_users/data/group
   debian/trunk/tests/grouptools/groupmems/42_groupmems_user_list_users/data/gshadow
   debian/trunk/tests/grouptools/groupmems/42_groupmems_user_list_users/data/passwd
   debian/trunk/tests/grouptools/groupmems/42_groupmems_user_list_users/data/shadow
   debian/trunk/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/group
   debian/trunk/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/gshadow
   debian/trunk/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/passwd
   debian/trunk/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/shadow
   debian/trunk/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/group
   debian/trunk/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/gshadow
   debian/trunk/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/passwd
   debian/trunk/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/shadow
   debian/trunk/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/group
   debian/trunk/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/gshadow
   debian/trunk/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/passwd
   debian/trunk/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/shadow
   debian/trunk/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/group
   debian/trunk/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/gshadow
   debian/trunk/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/passwd
   debian/trunk/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/shadow
   debian/trunk/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/group
   debian/trunk/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/gshadow
   debian/trunk/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/passwd
   debian/trunk/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/shadow
   debian/trunk/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/group
   debian/trunk/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/gshadow
   debian/trunk/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/passwd
   debian/trunk/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/shadow
   debian/trunk/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/group
   debian/trunk/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/gshadow
   debian/trunk/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/passwd
   debian/trunk/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/shadow
   debian/trunk/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/group
   debian/trunk/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/gshadow
   debian/trunk/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/passwd
   debian/trunk/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/shadow
   debian/trunk/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/group
   debian/trunk/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/gshadow
   debian/trunk/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/passwd
   debian/trunk/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/shadow
   debian/trunk/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/group
   debian/trunk/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/gshadow
   debian/trunk/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/passwd
   debian/trunk/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/shadow
   debian/trunk/tests/grouptools/groupmod/01_groupmod_change_gid/data/gshadow
   debian/trunk/tests/grouptools/groupmod/01_groupmod_change_gid/data/passwd
   debian/trunk/tests/grouptools/groupmod/01_groupmod_change_gid/data/shadow
   debian/trunk/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/data/gshadow
   debian/trunk/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/data/shadow
   debian/trunk/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data/gshadow
   debian/trunk/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data/passwd
   debian/trunk/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data/shadow
   debian/trunk/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/data/passwd
   debian/trunk/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/data/shadow
   debian/trunk/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data/gshadow
   debian/trunk/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data/passwd
   debian/trunk/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data/shadow
   debian/trunk/tests/grouptools/groupmod/06_groupmod_change_group_name/data/passwd
   debian/trunk/tests/grouptools/groupmod/06_groupmod_change_group_name/data/shadow
   debian/trunk/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data/gshadow
   debian/trunk/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data/passwd
   debian/trunk/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data/shadow
   debian/trunk/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/data/passwd
   debian/trunk/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/data/shadow
   debian/trunk/tests/grouptools/groupmod/09_groupmod_set_password/data/group
   debian/trunk/tests/grouptools/groupmod/09_groupmod_set_password/data/passwd
   debian/trunk/tests/grouptools/groupmod/09_groupmod_set_password/data/shadow
   debian/trunk/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data/group
   debian/trunk/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data/passwd
   debian/trunk/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data/shadow
   debian/trunk/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/data/passwd
   debian/trunk/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/data/shadow
   debian/trunk/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/group
   debian/trunk/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/gshadow
   debian/trunk/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/passwd
   debian/trunk/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/shadow
   debian/trunk/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/group
   debian/trunk/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/gshadow
   debian/trunk/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/passwd
   debian/trunk/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/shadow
   debian/trunk/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/group
   debian/trunk/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/gshadow
   debian/trunk/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/passwd
   debian/trunk/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/shadow
   debian/trunk/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/group
   debian/trunk/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/gshadow
   debian/trunk/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/passwd
   debian/trunk/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/shadow
   debian/trunk/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/group
   debian/trunk/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/gshadow
   debian/trunk/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/passwd
   debian/trunk/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/shadow
   debian/trunk/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/group
   debian/trunk/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/gshadow
   debian/trunk/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/passwd
   debian/trunk/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/shadow
   debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/gshadow
   debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/passwd
   debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/shadow
   debian/trunk/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/group
   debian/trunk/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/gshadow
   debian/trunk/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/passwd
   debian/trunk/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/shadow
   debian/trunk/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/group
   debian/trunk/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/gshadow
   debian/trunk/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/passwd
   debian/trunk/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/shadow
   debian/trunk/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/group
   debian/trunk/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/gshadow
   debian/trunk/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/passwd
   debian/trunk/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/shadow
   debian/trunk/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/data/passwd
   debian/trunk/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/data/shadow
   debian/trunk/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/data/shadow
   debian/trunk/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/group
   debian/trunk/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/gshadow
   debian/trunk/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/passwd
   debian/trunk/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/shadow
   debian/trunk/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/group
   debian/trunk/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/gshadow
   debian/trunk/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/passwd
   debian/trunk/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/shadow
   debian/trunk/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/data/passwd
   debian/trunk/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/data/shadow
   debian/trunk/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/data/passwd
   debian/trunk/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/data/shadow
   debian/trunk/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/group
   debian/trunk/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/gshadow
   debian/trunk/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/passwd
   debian/trunk/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/shadow
   debian/trunk/tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/group
   debian/trunk/tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/gshadow
   debian/trunk/tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/passwd
   debian/trunk/tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/shadow
   debian/trunk/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/data/passwd
   debian/trunk/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/data/shadow
   debian/trunk/tests/newusers/02_update_password/data/group
   debian/trunk/tests/newusers/02_update_password/data/gshadow
   debian/trunk/tests/newusers/02_update_password/data/passwd
   debian/trunk/tests/newusers/03_no_update_pid/data/group
   debian/trunk/tests/newusers/03_no_update_pid/data/gshadow
   debian/trunk/tests/newusers/03_no_update_pid/data/passwd
   debian/trunk/tests/newusers/04_no_update_gid/data/group
   debian/trunk/tests/newusers/04_no_update_gid/data/gshadow
   debian/trunk/tests/newusers/04_no_update_gid/data/passwd
   debian/trunk/tests/newusers/10_create_user_gid-as-group-bar/data/group
   debian/trunk/tests/newusers/10_create_user_gid-as-group-bar/data/gshadow
   debian/trunk/tests/newusers/11_update_gecos/data/group
   debian/trunk/tests/newusers/11_update_gecos/data/gshadow
   debian/trunk/tests/newusers/12_update_shell/data/group
   debian/trunk/tests/newusers/12_update_shell/data/gshadow
   debian/trunk/tests/newusers/15_update_new-home/data/group
   debian/trunk/tests/newusers/15_update_new-home/data/gshadow
   debian/trunk/tests/newusers/16_update_existing-home/data/group
   debian/trunk/tests/newusers/16_update_existing-home/data/gshadow
   debian/trunk/tests/newusers/18_create_user_gid-already-used/data/group
   debian/trunk/tests/newusers/18_create_user_gid-already-used/data/gshadow
   debian/trunk/tests/newusers/19_update_keep-old-home/data/group
   debian/trunk/tests/newusers/19_update_keep-old-home/data/gshadow
   debian/trunk/tests/newusers/23_create_user_error_negativ_UID/data/group
   debian/trunk/tests/newusers/23_create_user_error_negativ_UID/data/gshadow
   debian/trunk/tests/newusers/23_create_user_error_negativ_UID/data/passwd
   debian/trunk/tests/newusers/23_create_user_error_negativ_UID/data/shadow
   debian/trunk/tests/newusers/24_create_user_error_invalid_UID/data/group
   debian/trunk/tests/newusers/24_create_user_error_invalid_UID/data/gshadow
   debian/trunk/tests/newusers/24_create_user_error_invalid_UID/data/passwd
   debian/trunk/tests/newusers/24_create_user_error_invalid_UID/data/shadow
   debian/trunk/tests/newusers/25_create_user_error_no_remaining_UID/data/group
   debian/trunk/tests/newusers/25_create_user_error_no_remaining_UID/data/gshadow
   debian/trunk/tests/newusers/25_create_user_error_no_remaining_UID/data/passwd
   debian/trunk/tests/newusers/25_create_user_error_no_remaining_UID/data/shadow
   debian/trunk/tests/newusers/26_create_user_error_no_remaining_GID/data/group
   debian/trunk/tests/newusers/26_create_user_error_no_remaining_GID/data/gshadow
   debian/trunk/tests/newusers/26_create_user_error_no_remaining_GID/data/passwd
   debian/trunk/tests/newusers/26_create_user_error_no_remaining_GID/data/shadow
   debian/trunk/tests/newusers/27_create_user_error_invalid_username/data/group
   debian/trunk/tests/newusers/27_create_user_error_invalid_username/data/gshadow
   debian/trunk/tests/newusers/27_create_user_error_invalid_username/data/passwd
   debian/trunk/tests/newusers/27_create_user_error_invalid_username/data/shadow
   debian/trunk/tests/newusers/28_create_user_error_invalid_groupname/data/group
   debian/trunk/tests/newusers/28_create_user_error_invalid_groupname/data/gshadow
   debian/trunk/tests/newusers/28_create_user_error_invalid_groupname/data/passwd
   debian/trunk/tests/newusers/28_create_user_error_invalid_groupname/data/shadow
   debian/trunk/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/group
   debian/trunk/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/gshadow
   debian/trunk/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/passwd
   debian/trunk/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/shadow
   debian/trunk/tests/newusers/31_create_user_error_invalid_GID/data/group
   debian/trunk/tests/newusers/31_create_user_error_invalid_GID/data/gshadow
   debian/trunk/tests/newusers/31_create_user_error_invalid_GID/data/passwd
   debian/trunk/tests/newusers/31_create_user_error_invalid_GID/data/shadow
   debian/trunk/tests/newusers/32_create_user_error_gshadow_group_exists/data/group
   debian/trunk/tests/newusers/32_create_user_error_gshadow_group_exists/data/gshadow
   debian/trunk/tests/newusers/32_create_user_error_gshadow_group_exists/data/passwd
   debian/trunk/tests/newusers/32_create_user_error_gshadow_group_exists/data/shadow
   debian/trunk/tests/newusers/33_update_password_no_shadow_password/data/group
   debian/trunk/tests/newusers/33_update_password_no_shadow_password/data/gshadow
   debian/trunk/tests/newusers/33_update_password_no_shadow_password/data/shadow
   debian/trunk/tests/newusers/34_update_password_no_shadow/data/group
   debian/trunk/tests/newusers/34_update_password_no_shadow/data/gshadow
   debian/trunk/tests/newusers/34_update_password_no_shadow/data/shadow
   debian/trunk/tests/newusers/38_update_password_no_shadow_encrypted/data/group
   debian/trunk/tests/newusers/38_update_password_no_shadow_encrypted/data/gshadow
   debian/trunk/tests/newusers/38_update_password_no_shadow_encrypted/data/shadow
   debian/trunk/tests/newusers/39_update_password_no_shadow_password_encrypted/data/group
   debian/trunk/tests/newusers/39_update_password_no_shadow_password_encrypted/data/gshadow
   debian/trunk/tests/newusers/39_update_password_no_shadow_password_encrypted/data/shadow
   debian/trunk/tests/newusers/40_update_password_encrypted/data/group
   debian/trunk/tests/newusers/40_update_password_encrypted/data/gshadow
   debian/trunk/tests/newusers/40_update_password_encrypted/data/passwd
   debian/trunk/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/group
   debian/trunk/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/gshadow
   debian/trunk/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/passwd
   debian/trunk/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/shadow
   debian/trunk/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/group
   debian/trunk/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/gshadow
   debian/trunk/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/passwd
   debian/trunk/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/shadow
   debian/trunk/tests/split_groups/08_useradd_no_split_group_already_split/data/group
   debian/trunk/tests/split_groups/08_useradd_no_split_group_already_split/data/gshadow
   debian/trunk/tests/split_groups/08_useradd_no_split_group_already_split/data/passwd
   debian/trunk/tests/split_groups/08_useradd_no_split_group_already_split/data/shadow
   debian/trunk/tests/split_groups/09_groupdel_split_group_already_split/data/passwd
   debian/trunk/tests/split_groups/09_groupdel_split_group_already_split/data/shadow
   debian/trunk/tests/split_groups/10_groupdel_no_split_group_already_split/data/group
   debian/trunk/tests/split_groups/10_groupdel_no_split_group_already_split/data/gshadow
   debian/trunk/tests/split_groups/10_groupdel_no_split_group_already_split/data/passwd
   debian/trunk/tests/split_groups/10_groupdel_no_split_group_already_split/data/shadow
   debian/trunk/tests/split_groups/10_groupdel_no_split_group_already_split/data/useradd.err
   debian/trunk/tests/usertools/11_usermod_move_homedir/data/group
   debian/trunk/tests/usertools/11_usermod_move_homedir/data/gshadow
   debian/trunk/tests/usertools/11_usermod_move_homedir/data/shadow
   debian/trunk/tests/usertools/12_usermod_move_homedir_dev_null/data/group
   debian/trunk/tests/usertools/12_usermod_move_homedir_dev_null/data/gshadow
   debian/trunk/tests/usertools/12_usermod_move_homedir_dev_null/data/shadow
   debian/trunk/tests/usertools/13_usermod_move_homedir_file/data/group
   debian/trunk/tests/usertools/13_usermod_move_homedir_file/data/gshadow
   debian/trunk/tests/usertools/13_usermod_move_homedir_file/data/shadow
   debian/trunk/tests/usertools/14_usermod_move_homedir_other_device/data/group
   debian/trunk/tests/usertools/14_usermod_move_homedir_other_device/data/gshadow
   debian/trunk/tests/usertools/14_usermod_move_homedir_other_device/data/shadow
   debian/trunk/tests/usertools/15_usermod_change_supplementary_groups/data/home_ls-a
   debian/trunk/tests/usertools/15_usermod_change_supplementary_groups/data/passwd
   debian/trunk/tests/usertools/15_usermod_change_supplementary_groups/data/shadow
   debian/trunk/tests/usertools/16_usermod_remove_supplementary_groups/data/home_ls-a
   debian/trunk/tests/usertools/16_usermod_remove_supplementary_groups/data/passwd
   debian/trunk/tests/usertools/16_usermod_remove_supplementary_groups/data/shadow
   debian/trunk/tests/usertools/17_usermod_change_supplementary_groups_numerical/data/home_ls-a
   debian/trunk/tests/usertools/17_usermod_change_supplementary_groups_numerical/data/passwd
   debian/trunk/tests/usertools/17_usermod_change_supplementary_groups_numerical/data/shadow
   debian/trunk/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/group
   debian/trunk/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/gshadow
   debian/trunk/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/home_ls-a
   debian/trunk/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/passwd
   debian/trunk/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/shadow
   debian/trunk/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/group
   debian/trunk/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/gshadow
   debian/trunk/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/home_ls-a
   debian/trunk/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/passwd
   debian/trunk/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/shadow
   debian/trunk/tests/usertools/20_usermod_rename_user_in_member_lists/data/home_ls-a
   debian/trunk/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/data/home_ls-a
   debian/trunk/tests/usertools/22_usermod-a_existing_supplementary_group/data/home_ls-a
   debian/trunk/tests/usertools/22_usermod-a_existing_supplementary_group/data/passwd
   debian/trunk/tests/usertools/22_usermod-a_existing_supplementary_group/data/shadow
   debian/trunk/tests/usertools/23_usermod-a_existing_supplementary_group+rename/data/home_ls-a
   debian/trunk/tests/usertools/32_usermod-u_new_UID/data/group
   debian/trunk/tests/usertools/32_usermod-u_new_UID/data/gshadow
   debian/trunk/tests/usertools/32_usermod-u_new_UID/data/home_ls-a
   debian/trunk/tests/usertools/32_usermod-u_new_UID/data/shadow
   debian/trunk/tests/usertools/33_usermod-u_existing_UID/data/group
   debian/trunk/tests/usertools/33_usermod-u_existing_UID/data/gshadow
   debian/trunk/tests/usertools/33_usermod-u_existing_UID/data/home_ls-a
   debian/trunk/tests/usertools/33_usermod-u_existing_UID/data/passwd
   debian/trunk/tests/usertools/33_usermod-u_existing_UID/data/shadow
   debian/trunk/tests/usertools/34_usermod-u-o_existing_UID/data/group
   debian/trunk/tests/usertools/34_usermod-u-o_existing_UID/data/gshadow
   debian/trunk/tests/usertools/34_usermod-u-o_existing_UID/data/home_ls-a
   debian/trunk/tests/usertools/34_usermod-u-o_existing_UID/data/shadow
   debian/trunk/tests/usertools/35_usermod-u_invalid_UID/data/group
   debian/trunk/tests/usertools/35_usermod-u_invalid_UID/data/gshadow
   debian/trunk/tests/usertools/35_usermod-u_invalid_UID/data/home_ls-a
   debian/trunk/tests/usertools/35_usermod-u_invalid_UID/data/passwd
   debian/trunk/tests/usertools/35_usermod-u_invalid_UID/data/shadow
   debian/trunk/tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/group
   debian/trunk/tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/gshadow
   debian/trunk/tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/shadow
   debian/trunk/tests/usertools/37_Debian_Bug_470745/data/home_ls-a
   debian/trunk/tests/usertools/38_usermod_invalid_user/data/group
   debian/trunk/tests/usertools/38_usermod_invalid_user/data/gshadow
   debian/trunk/tests/usertools/38_usermod_invalid_user/data/home_ls-a
   debian/trunk/tests/usertools/38_usermod_invalid_user/data/passwd
   debian/trunk/tests/usertools/38_usermod_invalid_user/data/shadow
   debian/trunk/tests/usertools/39_usermod_-c_invalid_comment/data/group
   debian/trunk/tests/usertools/39_usermod_-c_invalid_comment/data/gshadow
   debian/trunk/tests/usertools/39_usermod_-c_invalid_comment/data/home_ls-a
   debian/trunk/tests/usertools/39_usermod_-c_invalid_comment/data/passwd
   debian/trunk/tests/usertools/39_usermod_-c_invalid_comment/data/shadow
   debian/trunk/tests/usertools/40_usermod_-d_invalid_homedir/data/group
   debian/trunk/tests/usertools/40_usermod_-d_invalid_homedir/data/gshadow
   debian/trunk/tests/usertools/40_usermod_-d_invalid_homedir/data/home_ls-a
   debian/trunk/tests/usertools/40_usermod_-d_invalid_homedir/data/passwd
   debian/trunk/tests/usertools/40_usermod_-d_invalid_homedir/data/shadow
   debian/trunk/tests/usertools/41_usermod_-d_invalid_shell/data/group
   debian/trunk/tests/usertools/41_usermod_-d_invalid_shell/data/gshadow
   debian/trunk/tests/usertools/41_usermod_-d_invalid_shell/data/home_ls-a
   debian/trunk/tests/usertools/41_usermod_-d_invalid_shell/data/passwd
   debian/trunk/tests/usertools/41_usermod_-d_invalid_shell/data/shadow
   debian/trunk/tests/usertools/42_usermod_-g_invalid_group_name/data/group
   debian/trunk/tests/usertools/42_usermod_-g_invalid_group_name/data/gshadow
   debian/trunk/tests/usertools/42_usermod_-g_invalid_group_name/data/home_ls-a
   debian/trunk/tests/usertools/42_usermod_-g_invalid_group_name/data/passwd
   debian/trunk/tests/usertools/42_usermod_-g_invalid_group_name/data/shadow
   debian/trunk/tests/usertools/43_usermod_-g_invalid_group_ID/data/group
   debian/trunk/tests/usertools/43_usermod_-g_invalid_group_ID/data/gshadow
   debian/trunk/tests/usertools/43_usermod_-g_invalid_group_ID/data/home_ls-a
   debian/trunk/tests/usertools/43_usermod_-g_invalid_group_ID/data/passwd
   debian/trunk/tests/usertools/43_usermod_-g_invalid_group_ID/data/shadow
   debian/trunk/tests/usertools/44_usermod-l_existing_username/data/group
   debian/trunk/tests/usertools/44_usermod-l_existing_username/data/gshadow
   debian/trunk/tests/usertools/44_usermod-l_existing_username/data/home_ls-a
   debian/trunk/tests/usertools/44_usermod-l_existing_username/data/passwd
   debian/trunk/tests/usertools/44_usermod-l_existing_username/data/shadow
   debian/trunk/tests/usertools/45_usermod-l_existing_username_passwd/data/group
   debian/trunk/tests/usertools/45_usermod-l_existing_username_passwd/data/gshadow
   debian/trunk/tests/usertools/45_usermod-l_existing_username_passwd/data/home_ls-a
   debian/trunk/tests/usertools/45_usermod-l_existing_username_passwd/data/passwd
   debian/trunk/tests/usertools/45_usermod-l_existing_username_passwd/data/shadow
   debian/trunk/tests/usertools/46_usermod-l_existing_username_shadow/data/group
   debian/trunk/tests/usertools/46_usermod-l_existing_username_shadow/data/gshadow
   debian/trunk/tests/usertools/46_usermod-l_existing_username_shadow/data/home_ls-a
   debian/trunk/tests/usertools/46_usermod-l_existing_username_shadow/data/passwd
   debian/trunk/tests/usertools/46_usermod-l_existing_username_shadow/data/shadow
   debian/trunk/tests/usertools/47_usermod-l_no_shadow_file/data/home_ls-a
   debian/trunk/tests/usertools/48_userdel_keep_group_if_primary_other_user/data/gshadow
   debian/trunk/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/data/gshadow
   debian/trunk/tests/usertools/52_userdel_delete_user_no_shadow_entry/data/shadow
   debian/trunk/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/data/chpasswd.err
   debian/trunk/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/data/passwd
   debian/trunk/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/data/passwd
   debian/trunk/tests/usertools/usermod/06_usermod_lock_already_locked_password3/data/passwd
   debian/trunk/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/data/gshadow
   debian/trunk/tests/usertools/usermod/41_usermod-u_faillog_not_created/data/group
   debian/trunk/tests/usertools/usermod/41_usermod-u_faillog_not_created/data/gshadow
   debian/trunk/tests/usertools/usermod/41_usermod-u_faillog_not_created/data/shadow
   debian/trunk/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/data/group
   debian/trunk/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/data/gshadow
   debian/trunk/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/data/shadow
   debian/trunk/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/data/gshadow
Modified:
   debian/trunk/tests/cktools/02_pwck_sort/pwck.test
   debian/trunk/tests/cktools/03_grpck_sort/grpck.test
   debian/trunk/tests/cktools/04_pwck_sort_missing_shadow_user/pwck.test
   debian/trunk/tests/cktools/05_grpck_sort_missing_shadow_group/grpck.test
   debian/trunk/tests/cktools/06_pwck_sort_NIS_server/pwck.test
   debian/trunk/tests/cktools/07_pwck_sort_NIS_client/pwck.test
   debian/trunk/tests/cktools/grpck/04_grpck_missing_field_group_delete/grpck.test
   debian/trunk/tests/cktools/grpck/05_grpck_missing_field_group_keep/grpck.test
   debian/trunk/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/grpck.test
   debian/trunk/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/grpck.test
   debian/trunk/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/grpck.test
   debian/trunk/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/grpck.test
   debian/trunk/tests/cktools/grpck/12_grpck_unknown_user_group/grpck.test
   debian/trunk/tests/cktools/grpck/13_grpck_unknown_user_gshadow/grpck.test
   debian/trunk/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/grpck.test
   debian/trunk/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/grpck.test
   debian/trunk/tests/cktools/grpck/16_grpck_duplicate_entry_group/grpck.test
   debian/trunk/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/grpck.test
   debian/trunk/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/grpck.test
   debian/trunk/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/grpck.test
   debian/trunk/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/grpck.test
   debian/trunk/tests/cktools/grpck/21_grpck_invalid_group_name/grpck.test
   debian/trunk/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/grpck.test
   debian/trunk/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/grpck.test
   debian/trunk/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/grpck.test
   debian/trunk/tests/cktools/grpck/26_grpck_no_gshadow_file/grpck.test
   debian/trunk/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/grpck.test
   debian/trunk/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/grpck.test
   debian/trunk/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/pwck.test
   debian/trunk/tests/cktools/pwck/07_pwck_missing_field_shadow_add/pwck.test
   debian/trunk/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/pwck.test
   debian/trunk/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/pwck.test
   debian/trunk/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/pwck.test
   debian/trunk/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/pwck.test
   debian/trunk/tests/convtools/02_grpconv_remove_gshadow_only_entries/grpconv.test
   debian/trunk/tests/convtools/03_grpconv_copy_passwd/grpconv.test
   debian/trunk/tests/convtools/04_grpconv_no_password/grpconv.test
   debian/trunk/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/grpconv.test
   debian/trunk/tests/convtools/06_grpconv_error_group_locked/grpconv.test
   debian/trunk/tests/convtools/07_grpconv_error_gshadow_locked/grpconv.test
   debian/trunk/tests/convtools/08_grpunconv_no_gshadow_file/grpunconv.test
   debian/trunk/tests/convtools/09_grpunconv_error_group_locked/grpunconv.test
   debian/trunk/tests/convtools/10_grpunconv_error_gshadow_locked/grpunconv.test
   debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/pwconv.test
   debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/pwconv.test
   debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/pwunconv.test
   debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/pwunconv.test
   debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/pwconv.test
   debian/trunk/tests/convtools/16_pwconv_copy_passwd/pwconv.test
   debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/pwunconv.test
   debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/pwunconv.test
   debian/trunk/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/groupadd.test
   debian/trunk/tests/failures/groupadd/02_groupadd_group_rename_failure/groupadd.test
   debian/trunk/tests/failures/groupadd/03_groupadd_gshadow_open_failure/groupadd.test
   debian/trunk/tests/failures/groupadd/04_groupadd_group_open_failure/groupadd.test
   debian/trunk/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/groupdel.test
   debian/trunk/tests/failures/groupdel/02_groupdel_group_rename_failure/groupdel.test
   debian/trunk/tests/failures/groupdel/03_groupdel_gshadow_open_failure/groupdel.test
   debian/trunk/tests/failures/groupdel/04_groupdel_group_open_failure/groupdel.test
   debian/trunk/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/groupmod.test
   debian/trunk/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/groupmod.test
   debian/trunk/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/groupmod.test
   debian/trunk/tests/failures/groupmod/04_groupmod_group_open_failure/groupmod.test
   debian/trunk/tests/failures/groupmod/05_groupmod_gshadow_open_failure/groupmod.test
   debian/trunk/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/groupmod.test
   debian/trunk/tests/failures/groupmod/07_groupmod_passwd_open_failure/groupmod.test
   debian/trunk/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/groupmod.test
   debian/trunk/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/groupmod.test
   debian/trunk/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/usermod.test
   debian/trunk/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/usermod.test
   debian/trunk/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/usermod.test
   debian/trunk/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/usermod.test
   debian/trunk/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/usermod.test
   debian/trunk/tests/grouptools/gpasswd/01_gpasswd_change_member_list/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/02_gpasswd_change_member_list/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/03_gpasswd_change_member_list/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/04_gpasswd_change_member_list/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/05_gpasswd_change_member_list/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/06_gpasswd_change_member_list/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/25_gpasswd_remove_password/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/28_gpasswd_lock_password/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/gpasswd.test
   debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/gpasswd.test
   debian/trunk/tests/grouptools/groupadd/01_groupadd_add_group/groupadd.test
   debian/trunk/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/groupadd.test
   debian/trunk/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/groupadd.test
   debian/trunk/tests/grouptools/groupadd/04_groupadd_set_password/groupadd.test
   debian/trunk/tests/grouptools/groupadd/05_groupadd_set_GID/groupadd.test
   debian/trunk/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/groupadd.test
   debian/trunk/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/groupadd.test
   debian/trunk/tests/grouptools/groupadd/08_groupadd_locked_group/groupadd.test
   debian/trunk/tests/grouptools/groupadd/09_groupadd_locked_gshadow/groupadd.test
   debian/trunk/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/groupadd.test
   debian/trunk/tests/grouptools/groupadd/11_groupadd_invalid_GID/groupadd.test
   debian/trunk/tests/grouptools/groupadd/12_groupadd_negativ_GID/groupadd.test
   debian/trunk/tests/grouptools/groupadd/13_groupadd_invalid_name/groupadd.test
   debian/trunk/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/groupadd.test
   debian/trunk/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/groupadd.test
   debian/trunk/tests/grouptools/groupadd/16_groupadd_existing_group/groupadd.test
   debian/trunk/tests/grouptools/groupadd/17_groupadd_add_systemgroup/groupadd.test
   debian/trunk/tests/grouptools/groupadd/18_groupadd_no_more_GID/groupadd.test
   debian/trunk/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/groupadd.test
   debian/trunk/tests/grouptools/groupadd/20_groupadd_add_existing_GID/groupadd.test
   debian/trunk/tests/grouptools/groupadd/25_groupadd_no_gshadow/groupadd.test
   debian/trunk/tests/grouptools/groupdel/01_groupdel_delete_group/groupdel.test
   debian/trunk/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/groupdel.test
   debian/trunk/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/groupdel.test
   debian/trunk/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/groupdel.test
   debian/trunk/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/groupdel.test
   debian/trunk/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/groupdel.test
   debian/trunk/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/groupdel.test
   debian/trunk/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/groupdel.test
   debian/trunk/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/groupdel.test
   debian/trunk/tests/grouptools/groupmems/01_groupmems_root_add_user/groupmems.test
   debian/trunk/tests/grouptools/groupmems/02_groupmems_root_del_user/groupmems.test
   debian/trunk/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/groupmems.test
   debian/trunk/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/groupmems.test
   debian/trunk/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/groupmems.test
   debian/trunk/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/groupmems.test
   debian/trunk/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/groupmems.test
   debian/trunk/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/groupmems.test
   debian/trunk/tests/grouptools/groupmems/09_groupmems_root_purge_user/groupmems.test
   debian/trunk/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/groupmems.test
   debian/trunk/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/groupmems.test
   debian/trunk/tests/grouptools/groupmems/12_groupmems_user_add_user/groupmems.test
   debian/trunk/tests/grouptools/groupmems/13_groupmems_user_del_user/groupmems.test
   debian/trunk/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/groupmems.test
   debian/trunk/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/groupmems.test
   debian/trunk/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/groupmems.test
   debian/trunk/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/groupmems.test
   debian/trunk/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/groupmems.test
   debian/trunk/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/groupmems.test
   debian/trunk/tests/grouptools/groupmems/20_groupmems_user_purge_user/groupmems.test
   debian/trunk/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/groupmems.test
   debian/trunk/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/groupmems.test
   debian/trunk/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/groupmems.test
   debian/trunk/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/groupmems.test
   debian/trunk/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/groupmems.test
   debian/trunk/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/groupmems.test
   debian/trunk/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/groupmems.test
   debian/trunk/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/groupmems.test
   debian/trunk/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/groupmems.test
   debian/trunk/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/groupmems.test
   debian/trunk/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/groupmems.test
   debian/trunk/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/groupmems.test
   debian/trunk/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/groupmems.test
   debian/trunk/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/groupmems.test
   debian/trunk/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/groupmems.test
   debian/trunk/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/groupmems.test
   debian/trunk/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/groupmems.test
   debian/trunk/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/groupmems.test
   debian/trunk/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/groupmems.test
   debian/trunk/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/groupmems.test
   debian/trunk/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/groupmems.test
   debian/trunk/tests/grouptools/groupmems/42_groupmems_user_list_users/groupmems.test
   debian/trunk/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/groupmems.test
   debian/trunk/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/groupmems.test
   debian/trunk/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/groupmems.test
   debian/trunk/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/groupmems.test
   debian/trunk/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/groupmems.test
   debian/trunk/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/groupmems.test
   debian/trunk/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/groupmems.test
   debian/trunk/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/groupmems.test
   debian/trunk/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/groupmems.test
   debian/trunk/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/groupmems.test
   debian/trunk/tests/grouptools/groupmod/01_groupmod_change_gid/groupmod.test
   debian/trunk/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/groupmod.test
   debian/trunk/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/groupmod.test
   debian/trunk/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/groupmod.test
   debian/trunk/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/groupmod.test
   debian/trunk/tests/grouptools/groupmod/06_groupmod_change_group_name/groupmod.test
   debian/trunk/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/groupmod.test
   debian/trunk/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/groupmod.test
   debian/trunk/tests/grouptools/groupmod/09_groupmod_set_password/groupmod.test
   debian/trunk/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/groupmod.test
   debian/trunk/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/groupmod.test
   debian/trunk/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/groupmod.test
   debian/trunk/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/groupmod.test
   debian/trunk/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/groupmod.test
   debian/trunk/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/groupmod.test
   debian/trunk/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/groupmod.test
   debian/trunk/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/groupmod.test
   debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/groupmod.test
   debian/trunk/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/groupmod.test
   debian/trunk/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/groupmod.test
   debian/trunk/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/groupmod.test
   debian/trunk/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/groupmod.test
   debian/trunk/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/groupmod.test
   debian/trunk/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/groupmod.test
   debian/trunk/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/groupmod.test
   debian/trunk/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/groupmod.test
   debian/trunk/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/groupmod.test
   debian/trunk/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/groupmod.test
   debian/trunk/tests/grouptools/groupmod/31_groupmod_-g_same_gid/groupmod.test
   debian/trunk/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/groupmod.test
   debian/trunk/tests/newusers/02_update_password/newusers.test
   debian/trunk/tests/newusers/03_no_update_pid/newusers.test
   debian/trunk/tests/newusers/04_no_update_gid/newusers.test
   debian/trunk/tests/newusers/10_create_user_gid-as-group-bar/newusers.test
   debian/trunk/tests/newusers/11_update_gecos/newusers.test
   debian/trunk/tests/newusers/12_update_shell/newusers.test
   debian/trunk/tests/newusers/15_update_new-home/newusers.test
   debian/trunk/tests/newusers/16_update_existing-home/newusers.test
   debian/trunk/tests/newusers/18_create_user_gid-already-used/newusers.test
   debian/trunk/tests/newusers/19_update_keep-old-home/newusers.test
   debian/trunk/tests/newusers/23_create_user_error_negativ_UID/newusers.test
   debian/trunk/tests/newusers/24_create_user_error_invalid_UID/newusers.test
   debian/trunk/tests/newusers/25_create_user_error_no_remaining_UID/newusers.test
   debian/trunk/tests/newusers/26_create_user_error_no_remaining_GID/newusers.test
   debian/trunk/tests/newusers/27_create_user_error_invalid_username/newusers.test
   debian/trunk/tests/newusers/28_create_user_error_invalid_groupname/newusers.test
   debian/trunk/tests/newusers/29_create_user_error_invalid_username_valid_groupname/newusers.test
   debian/trunk/tests/newusers/31_create_user_error_invalid_GID/newusers.test
   debian/trunk/tests/newusers/32_create_user_error_gshadow_group_exists/newusers.test
   debian/trunk/tests/newusers/33_update_password_no_shadow_password/newusers.test
   debian/trunk/tests/newusers/34_update_password_no_shadow/newusers.test
   debian/trunk/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/useradd.test
   debian/trunk/tests/split_groups/06_useradd_split_group_already_split_GID_differ/useradd.test
   debian/trunk/tests/split_groups/08_useradd_no_split_group_already_split/useradd.test
   debian/trunk/tests/split_groups/09_groupdel_split_group_already_split/groupdel.test
   debian/trunk/tests/split_groups/10_groupdel_no_split_group_already_split/groupdel.test
   debian/trunk/tests/usertools/11_usermod_move_homedir/usermod.test
   debian/trunk/tests/usertools/12_usermod_move_homedir_dev_null/usermod.test
   debian/trunk/tests/usertools/13_usermod_move_homedir_file/usermod.test
   debian/trunk/tests/usertools/14_usermod_move_homedir_other_device/usermod.test
   debian/trunk/tests/usertools/15_usermod_change_supplementary_groups/usermod.test
   debian/trunk/tests/usertools/16_usermod_remove_supplementary_groups/usermod.test
   debian/trunk/tests/usertools/17_usermod_change_supplementary_groups_numerical/usermod.test
   debian/trunk/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/usermod.test
   debian/trunk/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/usermod.test
   debian/trunk/tests/usertools/22_usermod-a_existing_supplementary_group/usermod.test
   debian/trunk/tests/usertools/32_usermod-u_new_UID/usermod.test
   debian/trunk/tests/usertools/33_usermod-u_existing_UID/usermod.test
   debian/trunk/tests/usertools/34_usermod-u-o_existing_UID/usermod.test
   debian/trunk/tests/usertools/35_usermod-u_invalid_UID/usermod.test
   debian/trunk/tests/usertools/36_usermod_change_uid+move_homedir_other_device/usermod.test
   debian/trunk/tests/usertools/38_usermod_invalid_user/usermod.test
   debian/trunk/tests/usertools/39_usermod_-c_invalid_comment/usermod.test
   debian/trunk/tests/usertools/40_usermod_-d_invalid_homedir/usermod.test
   debian/trunk/tests/usertools/41_usermod_-d_invalid_shell/usermod.test
   debian/trunk/tests/usertools/42_usermod_-g_invalid_group_name/usermod.test
   debian/trunk/tests/usertools/43_usermod_-g_invalid_group_ID/usermod.test
   debian/trunk/tests/usertools/44_usermod-l_existing_username/usermod.test
   debian/trunk/tests/usertools/45_usermod-l_existing_username_passwd/usermod.test
   debian/trunk/tests/usertools/46_usermod-l_existing_username_shadow/usermod.test
   debian/trunk/tests/usertools/48_userdel_keep_group_if_primary_other_user/userdel.test
   debian/trunk/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/userdel.test
   debian/trunk/tests/usertools/52_userdel_delete_user_no_shadow_entry/userdel.test
   debian/trunk/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/usermod.test
   debian/trunk/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/usermod.test
Log:
Remove unused files or files identical to config.


Deleted: debian/trunk/tests/cktools/02_pwck_sort/data/group
===================================================================
--- debian/trunk/tests/cktools/02_pwck_sort/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/02_pwck_sort/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/cktools/02_pwck_sort/data/gshadow
===================================================================
--- debian/trunk/tests/cktools/02_pwck_sort/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/02_pwck_sort/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Modified: debian/trunk/tests/cktools/02_pwck_sort/pwck.test
===================================================================
--- debian/trunk/tests/cktools/02_pwck_sort/pwck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/02_pwck_sort/pwck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 ../../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"

Deleted: debian/trunk/tests/cktools/03_grpck_sort/data/passwd
===================================================================
--- debian/trunk/tests/cktools/03_grpck_sort/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/03_grpck_sort/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/03_grpck_sort/data/shadow
===================================================================
--- debian/trunk/tests/cktools/03_grpck_sort/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/03_grpck_sort/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/cktools/03_grpck_sort/grpck.test
===================================================================
--- debian/trunk/tests/cktools/03_grpck_sort/grpck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/03_grpck_sort/grpck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/cktools/04_pwck_sort_missing_shadow_user/data/group
===================================================================
--- debian/trunk/tests/cktools/04_pwck_sort_missing_shadow_user/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/04_pwck_sort_missing_shadow_user/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/cktools/04_pwck_sort_missing_shadow_user/data/gshadow
===================================================================
--- debian/trunk/tests/cktools/04_pwck_sort_missing_shadow_user/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/04_pwck_sort_missing_shadow_user/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Modified: debian/trunk/tests/cktools/04_pwck_sort_missing_shadow_user/pwck.test
===================================================================
--- debian/trunk/tests/cktools/04_pwck_sort_missing_shadow_user/pwck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/04_pwck_sort_missing_shadow_user/pwck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 ../../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"

Deleted: debian/trunk/tests/cktools/05_grpck_sort_missing_shadow_group/data/passwd
===================================================================
--- debian/trunk/tests/cktools/05_grpck_sort_missing_shadow_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/05_grpck_sort_missing_shadow_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/05_grpck_sort_missing_shadow_group/data/shadow
===================================================================
--- debian/trunk/tests/cktools/05_grpck_sort_missing_shadow_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/05_grpck_sort_missing_shadow_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/cktools/05_grpck_sort_missing_shadow_group/grpck.test
===================================================================
--- debian/trunk/tests/cktools/05_grpck_sort_missing_shadow_group/grpck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/05_grpck_sort_missing_shadow_group/grpck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/cktools/06_pwck_sort_NIS_server/data/group
===================================================================
--- debian/trunk/tests/cktools/06_pwck_sort_NIS_server/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/06_pwck_sort_NIS_server/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:
-+:::

Deleted: debian/trunk/tests/cktools/06_pwck_sort_NIS_server/data/gshadow
===================================================================
--- debian/trunk/tests/cktools/06_pwck_sort_NIS_server/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/06_pwck_sort_NIS_server/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::
-+:::

Modified: debian/trunk/tests/cktools/06_pwck_sort_NIS_server/pwck.test
===================================================================
--- debian/trunk/tests/cktools/06_pwck_sort_NIS_server/pwck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/06_pwck_sort_NIS_server/pwck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 ../../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"

Deleted: debian/trunk/tests/cktools/07_pwck_sort_NIS_client/data/group
===================================================================
--- debian/trunk/tests/cktools/07_pwck_sort_NIS_client/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/07_pwck_sort_NIS_client/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Deleted: debian/trunk/tests/cktools/07_pwck_sort_NIS_client/data/gshadow
===================================================================
--- debian/trunk/tests/cktools/07_pwck_sort_NIS_client/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/07_pwck_sort_NIS_client/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::
-+:::

Modified: debian/trunk/tests/cktools/07_pwck_sort_NIS_client/pwck.test
===================================================================
--- debian/trunk/tests/cktools/07_pwck_sort_NIS_client/pwck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/07_pwck_sort_NIS_client/pwck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 ../../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"

Deleted: debian/trunk/tests/cktools/grpck/04_grpck_missing_field_group_delete/data/passwd
===================================================================
--- debian/trunk/tests/cktools/grpck/04_grpck_missing_field_group_delete/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/04_grpck_missing_field_group_delete/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/04_grpck_missing_field_group_delete/data/shadow
===================================================================
--- debian/trunk/tests/cktools/grpck/04_grpck_missing_field_group_delete/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/04_grpck_missing_field_group_delete/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/cktools/grpck/04_grpck_missing_field_group_delete/grpck.test
===================================================================
--- debian/trunk/tests/cktools/grpck/04_grpck_missing_field_group_delete/grpck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/04_grpck_missing_field_group_delete/grpck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -19,13 +19,13 @@
 ./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

Deleted: debian/trunk/tests/cktools/grpck/05_grpck_missing_field_group_keep/data/group
===================================================================
--- debian/trunk/tests/cktools/grpck/05_grpck_missing_field_group_keep/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/05_grpck_missing_field_group_keep/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/05_grpck_missing_field_group_keep/data/passwd
===================================================================
--- debian/trunk/tests/cktools/grpck/05_grpck_missing_field_group_keep/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/05_grpck_missing_field_group_keep/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/05_grpck_missing_field_group_keep/data/shadow
===================================================================
--- debian/trunk/tests/cktools/grpck/05_grpck_missing_field_group_keep/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/05_grpck_missing_field_group_keep/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/cktools/grpck/05_grpck_missing_field_group_keep/grpck.test
===================================================================
--- debian/trunk/tests/cktools/grpck/05_grpck_missing_field_group_keep/grpck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/05_grpck_missing_field_group_keep/grpck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -19,13 +19,13 @@
 ./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

Deleted: debian/trunk/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/group
===================================================================
--- debian/trunk/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/gshadow
===================================================================
--- debian/trunk/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/passwd
===================================================================
--- debian/trunk/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/shadow
===================================================================
--- debian/trunk/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/grpck.test
===================================================================
--- debian/trunk/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/grpck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/06_grpck_missing_field_group_no_changes/grpck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -19,16 +19,16 @@
 ./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"

Deleted: debian/trunk/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/data/group
===================================================================
--- debian/trunk/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/data/passwd
===================================================================
--- debian/trunk/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/data/shadow
===================================================================
--- debian/trunk/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/grpck.test
===================================================================
--- debian/trunk/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/grpck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/07_grpck_missing_field_gshadow_add/grpck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -19,13 +19,13 @@
 ./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

Deleted: debian/trunk/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/data/group
===================================================================
--- debian/trunk/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/data/passwd
===================================================================
--- debian/trunk/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/data/shadow
===================================================================
--- debian/trunk/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/grpck.test
===================================================================
--- debian/trunk/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/grpck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/08_grpck_missing_field_gshadow_delete/grpck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -19,13 +19,13 @@
 ./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

Deleted: debian/trunk/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/group
===================================================================
--- debian/trunk/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/gshadow
===================================================================
--- debian/trunk/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*:

Deleted: debian/trunk/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/passwd
===================================================================
--- debian/trunk/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/shadow
===================================================================
--- debian/trunk/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/grpck.test
===================================================================
--- debian/trunk/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/grpck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/09_grpck_missing_field_gshadow_no_changes/grpck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -19,16 +19,16 @@
 ./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"

Deleted: debian/trunk/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/data/passwd
===================================================================
--- debian/trunk/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/11_grpck_missing_field_gshadow_local/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/12_grpck_unknown_user_group/data/gshadow
===================================================================
--- debian/trunk/tests/cktools/grpck/12_grpck_unknown_user_group/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/12_grpck_unknown_user_group/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/12_grpck_unknown_user_group/data/passwd
===================================================================
--- debian/trunk/tests/cktools/grpck/12_grpck_unknown_user_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/12_grpck_unknown_user_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/12_grpck_unknown_user_group/data/shadow
===================================================================
--- debian/trunk/tests/cktools/grpck/12_grpck_unknown_user_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/12_grpck_unknown_user_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/cktools/grpck/12_grpck_unknown_user_group/grpck.test
===================================================================
--- debian/trunk/tests/cktools/grpck/12_grpck_unknown_user_group/grpck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/12_grpck_unknown_user_group/grpck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -19,16 +19,16 @@
 ./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"

Deleted: debian/trunk/tests/cktools/grpck/13_grpck_unknown_user_gshadow/data/group
===================================================================
--- debian/trunk/tests/cktools/grpck/13_grpck_unknown_user_gshadow/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/13_grpck_unknown_user_gshadow/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/13_grpck_unknown_user_gshadow/data/passwd
===================================================================
--- debian/trunk/tests/cktools/grpck/13_grpck_unknown_user_gshadow/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/13_grpck_unknown_user_gshadow/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/13_grpck_unknown_user_gshadow/data/shadow
===================================================================
--- debian/trunk/tests/cktools/grpck/13_grpck_unknown_user_gshadow/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/13_grpck_unknown_user_gshadow/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/cktools/grpck/13_grpck_unknown_user_gshadow/grpck.test
===================================================================
--- debian/trunk/tests/cktools/grpck/13_grpck_unknown_user_gshadow/grpck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/13_grpck_unknown_user_gshadow/grpck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -19,13 +19,13 @@
 ./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

Deleted: debian/trunk/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/data/group
===================================================================
--- debian/trunk/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/data/passwd
===================================================================
--- debian/trunk/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/data/shadow
===================================================================
--- debian/trunk/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/grpck.test
===================================================================
--- debian/trunk/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/grpck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/14_grpck_unknown_user_adm_gshadow/grpck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -19,13 +19,13 @@
 ./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

Deleted: debian/trunk/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/data/gshadow
===================================================================
--- debian/trunk/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/data/passwd
===================================================================
--- debian/trunk/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/data/shadow
===================================================================
--- debian/trunk/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/grpck.test
===================================================================
--- debian/trunk/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/grpck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/15_grpck_unknown_user_duplicate_group/grpck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -19,16 +19,16 @@
 ./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"

Deleted: debian/trunk/tests/cktools/grpck/16_grpck_duplicate_entry_group/data/gshadow
===================================================================
--- debian/trunk/tests/cktools/grpck/16_grpck_duplicate_entry_group/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/16_grpck_duplicate_entry_group/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/cktools/grpck/16_grpck_duplicate_entry_group/data/passwd
===================================================================
--- debian/trunk/tests/cktools/grpck/16_grpck_duplicate_entry_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/16_grpck_duplicate_entry_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/16_grpck_duplicate_entry_group/data/shadow
===================================================================
--- debian/trunk/tests/cktools/grpck/16_grpck_duplicate_entry_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/16_grpck_duplicate_entry_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/cktools/grpck/16_grpck_duplicate_entry_group/grpck.test
===================================================================
--- debian/trunk/tests/cktools/grpck/16_grpck_duplicate_entry_group/grpck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/16_grpck_duplicate_entry_group/grpck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -19,16 +19,16 @@
 ./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"

Deleted: debian/trunk/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/data/group
===================================================================
--- debian/trunk/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/data/passwd
===================================================================
--- debian/trunk/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/data/shadow
===================================================================
--- debian/trunk/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/grpck.test
===================================================================
--- debian/trunk/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/grpck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/17_grpck_duplicate_entry_gshadow/grpck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -19,13 +19,13 @@
 ./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

Deleted: debian/trunk/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/group
===================================================================
--- debian/trunk/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/gshadow
===================================================================
--- debian/trunk/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/passwd
===================================================================
--- debian/trunk/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/shadow
===================================================================
--- debian/trunk/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/grpck.test
===================================================================
--- debian/trunk/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/grpck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/18_grpck_duplicate_entry_group_no_changes/grpck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -19,16 +19,16 @@
 ./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"

Deleted: debian/trunk/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/group
===================================================================
--- debian/trunk/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/gshadow
===================================================================
--- debian/trunk/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/passwd
===================================================================
--- debian/trunk/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/shadow
===================================================================
--- debian/trunk/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/grpck.test
===================================================================
--- debian/trunk/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/grpck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/19_grpck_duplicate_entry_gshadow_no_changes/grpck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -19,16 +19,16 @@
 ./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"

Deleted: debian/trunk/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data/group
===================================================================
--- debian/trunk/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data/passwd
===================================================================
--- debian/trunk/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data/shadow
===================================================================
--- debian/trunk/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/grpck.test
===================================================================
--- debian/trunk/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/grpck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/20_grpck_duplicate_entry_gshadow_delete_second/grpck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -19,13 +19,13 @@
 ./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

Deleted: debian/trunk/tests/cktools/grpck/21_grpck_invalid_group_name/data/group
===================================================================
--- debian/trunk/tests/cktools/grpck/21_grpck_invalid_group_name/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/21_grpck_invalid_group_name/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/cktools/grpck/21_grpck_invalid_group_name/data/gshadow
===================================================================
--- debian/trunk/tests/cktools/grpck/21_grpck_invalid_group_name/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/21_grpck_invalid_group_name/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/cktools/grpck/21_grpck_invalid_group_name/data/passwd
===================================================================
--- debian/trunk/tests/cktools/grpck/21_grpck_invalid_group_name/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/21_grpck_invalid_group_name/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/21_grpck_invalid_group_name/data/shadow
===================================================================
--- debian/trunk/tests/cktools/grpck/21_grpck_invalid_group_name/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/21_grpck_invalid_group_name/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/cktools/grpck/21_grpck_invalid_group_name/grpck.test
===================================================================
--- debian/trunk/tests/cktools/grpck/21_grpck_invalid_group_name/grpck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/21_grpck_invalid_group_name/grpck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -19,16 +19,16 @@
 ./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"

Deleted: debian/trunk/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/data/passwd
===================================================================
--- debian/trunk/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/data/shadow
===================================================================
--- debian/trunk/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/grpck.test
===================================================================
--- debian/trunk/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/grpck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/22_grpck_invalid_group_ID_-1/grpck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -19,13 +19,13 @@
 ./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

Deleted: debian/trunk/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/group
===================================================================
--- debian/trunk/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/gshadow
===================================================================
--- debian/trunk/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/passwd
===================================================================
--- debian/trunk/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/shadow
===================================================================
--- debian/trunk/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/grpck.test
===================================================================
--- debian/trunk/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/grpck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/23_grpck_invalid_group_ID_4294967295/grpck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -19,16 +19,16 @@
 ./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"

Deleted: debian/trunk/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/data/passwd
===================================================================
--- debian/trunk/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/data/shadow
===================================================================
--- debian/trunk/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/grpck.test
===================================================================
--- debian/trunk/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/grpck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/24_grpck_invalid_group_ID_4294967296/grpck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -19,13 +19,13 @@
 ./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

Deleted: debian/trunk/tests/cktools/grpck/26_grpck_no_gshadow_file/data/group
===================================================================
--- debian/trunk/tests/cktools/grpck/26_grpck_no_gshadow_file/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/26_grpck_no_gshadow_file/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/26_grpck_no_gshadow_file/data/passwd
===================================================================
--- debian/trunk/tests/cktools/grpck/26_grpck_no_gshadow_file/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/26_grpck_no_gshadow_file/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/26_grpck_no_gshadow_file/data/shadow
===================================================================
--- debian/trunk/tests/cktools/grpck/26_grpck_no_gshadow_file/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/26_grpck_no_gshadow_file/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/cktools/grpck/26_grpck_no_gshadow_file/grpck.test
===================================================================
--- debian/trunk/tests/cktools/grpck/26_grpck_no_gshadow_file/grpck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/26_grpck_no_gshadow_file/grpck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -40,13 +40,13 @@
 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

Deleted: debian/trunk/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/data/passwd
===================================================================
--- debian/trunk/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/data/shadow
===================================================================
--- debian/trunk/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/grpck.test
===================================================================
--- debian/trunk/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/grpck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/27_grpck_sort_no_gshadow_file/grpck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -25,13 +25,13 @@
 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

Deleted: debian/trunk/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/data/gshadow
===================================================================
--- debian/trunk/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/data/passwd
===================================================================
--- debian/trunk/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/data/shadow
===================================================================
--- debian/trunk/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/grpck.test
===================================================================
--- debian/trunk/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/grpck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/grpck/35_grpck_duplicate_entry_group_NIS/grpck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -19,16 +19,16 @@
 ./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"

Deleted: debian/trunk/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/data/passwd
===================================================================
--- debian/trunk/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Modified: debian/trunk/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/pwck.test
===================================================================
--- debian/trunk/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/pwck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/pwck/05_pwck_missing_field_passwd_keep/pwck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -19,7 +19,7 @@
 ./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

Deleted: debian/trunk/tests/cktools/pwck/07_pwck_missing_field_shadow_add/data/passwd
===================================================================
--- debian/trunk/tests/cktools/pwck/07_pwck_missing_field_shadow_add/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/pwck/07_pwck_missing_field_shadow_add/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Modified: debian/trunk/tests/cktools/pwck/07_pwck_missing_field_shadow_add/pwck.test
===================================================================
--- debian/trunk/tests/cktools/pwck/07_pwck_missing_field_shadow_add/pwck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/pwck/07_pwck_missing_field_shadow_add/pwck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -19,7 +19,7 @@
 ./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

Deleted: debian/trunk/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/data/passwd
===================================================================
--- debian/trunk/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Modified: debian/trunk/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/pwck.test
===================================================================
--- debian/trunk/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/pwck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/pwck/08_pwck_missing_field_shadow_delete/pwck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -19,7 +19,7 @@
 ./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

Deleted: debian/trunk/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/data/shadow
===================================================================
--- debian/trunk/tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/data/shadow	2011-07-16 17:36:18 UTC (rev 3425)
+++ debian/trunk/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/pwck.test
===================================================================
--- debian/trunk/tests/cktools/pwck/13_pwpck_duplicate_entry_passwd/pwck.test	2011-07-16 17:36:18 UTC (rev 3425)
+++ debian/trunk/tests/cktools/pwck/13_pwck_duplicate_entry_passwd/pwck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -25,7 +25,7 @@
 ../../../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

Deleted: debian/trunk/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/data/passwd
===================================================================
--- debian/trunk/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Modified: debian/trunk/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/pwck.test
===================================================================
--- debian/trunk/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/pwck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/pwck/14_pwck_duplicate_entry_shadow/pwck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -19,7 +19,7 @@
 ./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

Deleted: debian/trunk/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/data/shadow
===================================================================
--- debian/trunk/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/pwck.test
===================================================================
--- debian/trunk/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/pwck.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/pwck/17_pwck_duplicate_entry_passwd_delete_second/pwck.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -25,7 +25,7 @@
 ../../../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

Deleted: debian/trunk/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/data/passwd
===================================================================
--- debian/trunk/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/data/shadow
===================================================================
--- debian/trunk/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/cktools/pwck/20_pwck_invalid_user_ID_4294967295/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Deleted: debian/trunk/tests/convtools/02_grpconv_remove_gshadow_only_entries/data/group
===================================================================
--- debian/trunk/tests/convtools/02_grpconv_remove_gshadow_only_entries/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/02_grpconv_remove_gshadow_only_entries/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/convtools/02_grpconv_remove_gshadow_only_entries/data/passwd
===================================================================
--- debian/trunk/tests/convtools/02_grpconv_remove_gshadow_only_entries/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/02_grpconv_remove_gshadow_only_entries/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/convtools/02_grpconv_remove_gshadow_only_entries/data/shadow
===================================================================
--- debian/trunk/tests/convtools/02_grpconv_remove_gshadow_only_entries/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/02_grpconv_remove_gshadow_only_entries/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/convtools/02_grpconv_remove_gshadow_only_entries/grpconv.test
===================================================================
--- debian/trunk/tests/convtools/02_grpconv_remove_gshadow_only_entries/grpconv.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/02_grpconv_remove_gshadow_only_entries/grpconv.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/convtools/03_grpconv_copy_passwd/data/passwd
===================================================================
--- debian/trunk/tests/convtools/03_grpconv_copy_passwd/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/03_grpconv_copy_passwd/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/convtools/03_grpconv_copy_passwd/data/shadow
===================================================================
--- debian/trunk/tests/convtools/03_grpconv_copy_passwd/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/03_grpconv_copy_passwd/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/convtools/03_grpconv_copy_passwd/grpconv.test
===================================================================
--- debian/trunk/tests/convtools/03_grpconv_copy_passwd/grpconv.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/03_grpconv_copy_passwd/grpconv.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/convtools/04_grpconv_no_password/data/passwd
===================================================================
--- debian/trunk/tests/convtools/04_grpconv_no_password/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/04_grpconv_no_password/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/convtools/04_grpconv_no_password/data/shadow
===================================================================
--- debian/trunk/tests/convtools/04_grpconv_no_password/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/04_grpconv_no_password/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/convtools/04_grpconv_no_password/grpconv.test
===================================================================
--- debian/trunk/tests/convtools/04_grpconv_no_password/grpconv.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/04_grpconv_no_password/grpconv.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/data/passwd
===================================================================
--- debian/trunk/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/data/shadow
===================================================================
--- debian/trunk/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/grpconv.test
===================================================================
--- debian/trunk/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/grpconv.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/05_grpconv_copy_passwd_existing_gshadow/grpconv.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/convtools/06_grpconv_error_group_locked/data/group
===================================================================
--- debian/trunk/tests/convtools/06_grpconv_error_group_locked/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/06_grpconv_error_group_locked/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/convtools/06_grpconv_error_group_locked/data/gshadow
===================================================================
--- debian/trunk/tests/convtools/06_grpconv_error_group_locked/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/06_grpconv_error_group_locked/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/convtools/06_grpconv_error_group_locked/data/passwd
===================================================================
--- debian/trunk/tests/convtools/06_grpconv_error_group_locked/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/06_grpconv_error_group_locked/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/convtools/06_grpconv_error_group_locked/data/shadow
===================================================================
--- debian/trunk/tests/convtools/06_grpconv_error_group_locked/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/06_grpconv_error_group_locked/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/convtools/06_grpconv_error_group_locked/grpconv.test
===================================================================
--- debian/trunk/tests/convtools/06_grpconv_error_group_locked/grpconv.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/06_grpconv_error_group_locked/grpconv.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -45,16 +45,16 @@
 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"

Deleted: debian/trunk/tests/convtools/07_grpconv_error_gshadow_locked/data/group
===================================================================
--- debian/trunk/tests/convtools/07_grpconv_error_gshadow_locked/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/07_grpconv_error_gshadow_locked/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/convtools/07_grpconv_error_gshadow_locked/data/gshadow
===================================================================
--- debian/trunk/tests/convtools/07_grpconv_error_gshadow_locked/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/07_grpconv_error_gshadow_locked/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/convtools/07_grpconv_error_gshadow_locked/data/passwd
===================================================================
--- debian/trunk/tests/convtools/07_grpconv_error_gshadow_locked/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/07_grpconv_error_gshadow_locked/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/convtools/07_grpconv_error_gshadow_locked/data/shadow
===================================================================
--- debian/trunk/tests/convtools/07_grpconv_error_gshadow_locked/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/07_grpconv_error_gshadow_locked/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/convtools/07_grpconv_error_gshadow_locked/grpconv.test
===================================================================
--- debian/trunk/tests/convtools/07_grpconv_error_gshadow_locked/grpconv.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/07_grpconv_error_gshadow_locked/grpconv.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -44,16 +44,16 @@
 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"

Deleted: debian/trunk/tests/convtools/08_grpunconv_no_gshadow_file/data/group
===================================================================
--- debian/trunk/tests/convtools/08_grpunconv_no_gshadow_file/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/08_grpunconv_no_gshadow_file/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/convtools/08_grpunconv_no_gshadow_file/data/passwd
===================================================================
--- debian/trunk/tests/convtools/08_grpunconv_no_gshadow_file/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/08_grpunconv_no_gshadow_file/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/convtools/08_grpunconv_no_gshadow_file/data/shadow
===================================================================
--- debian/trunk/tests/convtools/08_grpunconv_no_gshadow_file/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/08_grpunconv_no_gshadow_file/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/convtools/08_grpunconv_no_gshadow_file/grpunconv.test
===================================================================
--- debian/trunk/tests/convtools/08_grpunconv_no_gshadow_file/grpunconv.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/08_grpunconv_no_gshadow_file/grpunconv.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -25,13 +25,13 @@
 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

Deleted: debian/trunk/tests/convtools/09_grpunconv_error_group_locked/data/group
===================================================================
--- debian/trunk/tests/convtools/09_grpunconv_error_group_locked/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/09_grpunconv_error_group_locked/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/convtools/09_grpunconv_error_group_locked/data/gshadow
===================================================================
--- debian/trunk/tests/convtools/09_grpunconv_error_group_locked/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/09_grpunconv_error_group_locked/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/convtools/09_grpunconv_error_group_locked/data/passwd
===================================================================
--- debian/trunk/tests/convtools/09_grpunconv_error_group_locked/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/09_grpunconv_error_group_locked/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/convtools/09_grpunconv_error_group_locked/data/shadow
===================================================================
--- debian/trunk/tests/convtools/09_grpunconv_error_group_locked/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/09_grpunconv_error_group_locked/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/convtools/09_grpunconv_error_group_locked/grpunconv.test
===================================================================
--- debian/trunk/tests/convtools/09_grpunconv_error_group_locked/grpunconv.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/09_grpunconv_error_group_locked/grpunconv.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -44,16 +44,16 @@
 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"

Deleted: debian/trunk/tests/convtools/10_grpunconv_error_gshadow_locked/data/group
===================================================================
--- debian/trunk/tests/convtools/10_grpunconv_error_gshadow_locked/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/10_grpunconv_error_gshadow_locked/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/convtools/10_grpunconv_error_gshadow_locked/data/gshadow
===================================================================
--- debian/trunk/tests/convtools/10_grpunconv_error_gshadow_locked/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/10_grpunconv_error_gshadow_locked/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/convtools/10_grpunconv_error_gshadow_locked/data/passwd
===================================================================
--- debian/trunk/tests/convtools/10_grpunconv_error_gshadow_locked/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/10_grpunconv_error_gshadow_locked/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/convtools/10_grpunconv_error_gshadow_locked/data/shadow
===================================================================
--- debian/trunk/tests/convtools/10_grpunconv_error_gshadow_locked/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/10_grpunconv_error_gshadow_locked/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/convtools/10_grpunconv_error_gshadow_locked/grpunconv.test
===================================================================
--- debian/trunk/tests/convtools/10_grpunconv_error_gshadow_locked/grpunconv.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/10_grpunconv_error_gshadow_locked/grpunconv.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -44,16 +44,16 @@
 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"

Deleted: debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/group
===================================================================
--- debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/gshadow
===================================================================
--- debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/passwd
===================================================================
--- debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/shadow
===================================================================
--- debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/pwconv.test
===================================================================
--- debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/pwconv.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/pwconv.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -44,16 +44,16 @@
 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"

Deleted: debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/group
===================================================================
--- debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/gshadow
===================================================================
--- debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/passwd
===================================================================
--- debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/shadow
===================================================================
--- debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/pwconv.test
===================================================================
--- debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/pwconv.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/pwconv.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -44,16 +44,16 @@
 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"

Deleted: debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/group
===================================================================
--- debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/gshadow
===================================================================
--- debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/passwd
===================================================================
--- debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/shadow
===================================================================
--- debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/pwunconv.test
===================================================================
--- debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/pwunconv.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/pwunconv.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -44,16 +44,16 @@
 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"

Deleted: debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/group
===================================================================
--- debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/gshadow
===================================================================
--- debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/passwd
===================================================================
--- debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/shadow
===================================================================
--- debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/pwunconv.test
===================================================================
--- debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/pwunconv.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/pwunconv.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -44,16 +44,16 @@
 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"

Deleted: debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/group
===================================================================
--- debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/gshadow
===================================================================
--- debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/passwd
===================================================================
--- debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Modified: debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/pwconv.test
===================================================================
--- debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/pwconv.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/15_pwconv_remove_shadow_only_entries/pwconv.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,16 +21,16 @@
 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"

Deleted: debian/trunk/tests/convtools/16_pwconv_copy_passwd/data/group
===================================================================
--- debian/trunk/tests/convtools/16_pwconv_copy_passwd/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/16_pwconv_copy_passwd/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/convtools/16_pwconv_copy_passwd/data/gshadow
===================================================================
--- debian/trunk/tests/convtools/16_pwconv_copy_passwd/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/16_pwconv_copy_passwd/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Modified: debian/trunk/tests/convtools/16_pwconv_copy_passwd/pwconv.test
===================================================================
--- debian/trunk/tests/convtools/16_pwconv_copy_passwd/pwconv.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/16_pwconv_copy_passwd/pwconv.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 ../../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"

Deleted: debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/data/group
===================================================================
--- debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/data/gshadow
===================================================================
--- debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/data/passwd
===================================================================
--- debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Modified: debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/pwunconv.test
===================================================================
--- debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/pwunconv.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/17_pwunconv_no_shadow_file/pwunconv.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -25,16 +25,16 @@
 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"

Deleted: debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/data/group
===================================================================
--- debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/data/gshadow
===================================================================
--- debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Modified: debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/pwunconv.test
===================================================================
--- debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/pwunconv.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/convtools/18_pwunconv_user_not_in_shadow/pwunconv.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 ../../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"

Deleted: debian/trunk/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/data/shadow
===================================================================
--- debian/trunk/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/chpasswd-PAM/04_chpasswd-e_rename_shadow_failure/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Deleted: debian/trunk/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/gshadow
===================================================================
--- debian/trunk/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/passwd
===================================================================
--- debian/trunk/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/shadow
===================================================================
--- debian/trunk/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/groupadd.test
===================================================================
--- debian/trunk/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/groupadd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupadd/01_groupadd_gshadow_rename_failure/groupadd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/failures/groupadd/02_groupadd_group_rename_failure/data/group
===================================================================
--- debian/trunk/tests/failures/groupadd/02_groupadd_group_rename_failure/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupadd/02_groupadd_group_rename_failure/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/failures/groupadd/02_groupadd_group_rename_failure/data/gshadow
===================================================================
--- debian/trunk/tests/failures/groupadd/02_groupadd_group_rename_failure/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupadd/02_groupadd_group_rename_failure/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/failures/groupadd/02_groupadd_group_rename_failure/data/passwd
===================================================================
--- debian/trunk/tests/failures/groupadd/02_groupadd_group_rename_failure/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupadd/02_groupadd_group_rename_failure/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/failures/groupadd/02_groupadd_group_rename_failure/data/shadow
===================================================================
--- debian/trunk/tests/failures/groupadd/02_groupadd_group_rename_failure/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupadd/02_groupadd_group_rename_failure/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/failures/groupadd/02_groupadd_group_rename_failure/groupadd.test
===================================================================
--- debian/trunk/tests/failures/groupadd/02_groupadd_group_rename_failure/groupadd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupadd/02_groupadd_group_rename_failure/groupadd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/group
===================================================================
--- debian/trunk/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/gshadow
===================================================================
--- debian/trunk/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/passwd
===================================================================
--- debian/trunk/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/shadow
===================================================================
--- debian/trunk/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupadd/03_groupadd_gshadow_open_failure/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/failures/groupadd/03_groupadd_gshadow_open_failure/groupadd.test
===================================================================
--- debian/trunk/tests/failures/groupadd/03_groupadd_gshadow_open_failure/groupadd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupadd/03_groupadd_gshadow_open_failure/groupadd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/failures/groupadd/04_groupadd_group_open_failure/data/group
===================================================================
--- debian/trunk/tests/failures/groupadd/04_groupadd_group_open_failure/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupadd/04_groupadd_group_open_failure/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/failures/groupadd/04_groupadd_group_open_failure/data/gshadow
===================================================================
--- debian/trunk/tests/failures/groupadd/04_groupadd_group_open_failure/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupadd/04_groupadd_group_open_failure/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/failures/groupadd/04_groupadd_group_open_failure/data/passwd
===================================================================
--- debian/trunk/tests/failures/groupadd/04_groupadd_group_open_failure/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupadd/04_groupadd_group_open_failure/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/failures/groupadd/04_groupadd_group_open_failure/data/shadow
===================================================================
--- debian/trunk/tests/failures/groupadd/04_groupadd_group_open_failure/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupadd/04_groupadd_group_open_failure/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/failures/groupadd/04_groupadd_group_open_failure/groupadd.test
===================================================================
--- debian/trunk/tests/failures/groupadd/04_groupadd_group_open_failure/groupadd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupadd/04_groupadd_group_open_failure/groupadd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/gshadow
===================================================================
--- debian/trunk/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/passwd
===================================================================
--- debian/trunk/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/shadow
===================================================================
--- debian/trunk/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/groupdel.test
===================================================================
--- debian/trunk/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/groupdel.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupdel/01_groupdel_gshadow_rename_failure/groupdel.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/failures/groupdel/02_groupdel_group_rename_failure/data/group
===================================================================
--- debian/trunk/tests/failures/groupdel/02_groupdel_group_rename_failure/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupdel/02_groupdel_group_rename_failure/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/failures/groupdel/02_groupdel_group_rename_failure/data/gshadow
===================================================================
--- debian/trunk/tests/failures/groupdel/02_groupdel_group_rename_failure/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupdel/02_groupdel_group_rename_failure/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/failures/groupdel/02_groupdel_group_rename_failure/data/passwd
===================================================================
--- debian/trunk/tests/failures/groupdel/02_groupdel_group_rename_failure/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupdel/02_groupdel_group_rename_failure/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/failures/groupdel/02_groupdel_group_rename_failure/data/shadow
===================================================================
--- debian/trunk/tests/failures/groupdel/02_groupdel_group_rename_failure/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupdel/02_groupdel_group_rename_failure/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/failures/groupdel/02_groupdel_group_rename_failure/groupdel.test
===================================================================
--- debian/trunk/tests/failures/groupdel/02_groupdel_group_rename_failure/groupdel.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupdel/02_groupdel_group_rename_failure/groupdel.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/group
===================================================================
--- debian/trunk/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/gshadow
===================================================================
--- debian/trunk/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/passwd
===================================================================
--- debian/trunk/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/shadow
===================================================================
--- debian/trunk/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupdel/03_groupdel_gshadow_open_failure/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/failures/groupdel/03_groupdel_gshadow_open_failure/groupdel.test
===================================================================
--- debian/trunk/tests/failures/groupdel/03_groupdel_gshadow_open_failure/groupdel.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupdel/03_groupdel_gshadow_open_failure/groupdel.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/failures/groupdel/04_groupdel_group_open_failure/data/group
===================================================================
--- debian/trunk/tests/failures/groupdel/04_groupdel_group_open_failure/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupdel/04_groupdel_group_open_failure/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/failures/groupdel/04_groupdel_group_open_failure/data/gshadow
===================================================================
--- debian/trunk/tests/failures/groupdel/04_groupdel_group_open_failure/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupdel/04_groupdel_group_open_failure/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/failures/groupdel/04_groupdel_group_open_failure/data/passwd
===================================================================
--- debian/trunk/tests/failures/groupdel/04_groupdel_group_open_failure/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupdel/04_groupdel_group_open_failure/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/failures/groupdel/04_groupdel_group_open_failure/data/shadow
===================================================================
--- debian/trunk/tests/failures/groupdel/04_groupdel_group_open_failure/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupdel/04_groupdel_group_open_failure/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/failures/groupdel/04_groupdel_group_open_failure/groupdel.test
===================================================================
--- debian/trunk/tests/failures/groupdel/04_groupdel_group_open_failure/groupdel.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupdel/04_groupdel_group_open_failure/groupdel.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/gshadow
===================================================================
--- debian/trunk/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/passwd
===================================================================
--- debian/trunk/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/shadow
===================================================================
--- debian/trunk/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/groupmod.test
===================================================================
--- debian/trunk/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/01_groupmod_change_group_name_gshadow_rename_failure/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/gshadow
===================================================================
--- debian/trunk/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/passwd
===================================================================
--- debian/trunk/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/shadow
===================================================================
--- debian/trunk/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/groupmod.test
===================================================================
--- debian/trunk/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/02_groupmod_change_gid_change_primary_group_passwd_rename_failure/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/group
===================================================================
--- debian/trunk/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/gshadow
===================================================================
--- debian/trunk/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/passwd
===================================================================
--- debian/trunk/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/shadow
===================================================================
--- debian/trunk/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/groupmod.test
===================================================================
--- debian/trunk/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/03_groupmod_change_group_name_group_rename_failure/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/failures/groupmod/04_groupmod_group_open_failure/data/group
===================================================================
--- debian/trunk/tests/failures/groupmod/04_groupmod_group_open_failure/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/04_groupmod_group_open_failure/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/failures/groupmod/04_groupmod_group_open_failure/data/gshadow
===================================================================
--- debian/trunk/tests/failures/groupmod/04_groupmod_group_open_failure/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/04_groupmod_group_open_failure/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/failures/groupmod/04_groupmod_group_open_failure/data/passwd
===================================================================
--- debian/trunk/tests/failures/groupmod/04_groupmod_group_open_failure/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/04_groupmod_group_open_failure/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/failures/groupmod/04_groupmod_group_open_failure/data/shadow
===================================================================
--- debian/trunk/tests/failures/groupmod/04_groupmod_group_open_failure/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/04_groupmod_group_open_failure/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/failures/groupmod/04_groupmod_group_open_failure/groupmod.test
===================================================================
--- debian/trunk/tests/failures/groupmod/04_groupmod_group_open_failure/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/04_groupmod_group_open_failure/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/group
===================================================================
--- debian/trunk/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/gshadow
===================================================================
--- debian/trunk/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/passwd
===================================================================
--- debian/trunk/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/shadow
===================================================================
--- debian/trunk/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/05_groupmod_gshadow_open_failure/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/failures/groupmod/05_groupmod_gshadow_open_failure/groupmod.test
===================================================================
--- debian/trunk/tests/failures/groupmod/05_groupmod_gshadow_open_failure/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/05_groupmod_gshadow_open_failure/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/groupmod.err
===================================================================
--- debian/trunk/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/groupmod.err	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/groupmod.err	2011-07-17 12:00:16 UTC (rev 3428)
@@ -1,2 +0,0 @@
-open FAILURE /etc/group 8902 ...
-groupmod: cannot open /etc/group

Deleted: debian/trunk/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/gshadow
===================================================================
--- debian/trunk/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/passwd
===================================================================
--- debian/trunk/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/shadow
===================================================================
--- debian/trunk/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/groupmod.test
===================================================================
--- debian/trunk/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/06_groupmod_-g_no_gshadow_open_failure/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,16 +21,16 @@
 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"

Deleted: debian/trunk/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/group
===================================================================
--- debian/trunk/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/gshadow
===================================================================
--- debian/trunk/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/passwd
===================================================================
--- debian/trunk/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/shadow
===================================================================
--- debian/trunk/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/07_groupmod_passwd_open_failure/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/failures/groupmod/07_groupmod_passwd_open_failure/groupmod.test
===================================================================
--- debian/trunk/tests/failures/groupmod/07_groupmod_passwd_open_failure/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/07_groupmod_passwd_open_failure/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/group
===================================================================
--- debian/trunk/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/groupmod.err
===================================================================
--- debian/trunk/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/groupmod.err	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/groupmod.err	2011-07-17 12:00:16 UTC (rev 3428)
@@ -1,2 +0,0 @@
-open FAILURE /etc/passwd 8902 ...
-groupmod: cannot open /etc/passwd

Deleted: debian/trunk/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/gshadow
===================================================================
--- debian/trunk/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/passwd
===================================================================
--- debian/trunk/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/shadow
===================================================================
--- debian/trunk/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/groupmod.test
===================================================================
--- debian/trunk/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/08_groupmod_-g_same_gid_no_passwd_open_failure/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,16 +21,16 @@
 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"

Deleted: debian/trunk/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/groupmod.err
===================================================================
--- debian/trunk/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/groupmod.err	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/groupmod.err	2011-07-17 12:00:16 UTC (rev 3428)
@@ -1,2 +0,0 @@
-open FAILURE /etc/passwd 8902 ...
-groupmod: cannot open /etc/passwd

Deleted: debian/trunk/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/passwd
===================================================================
--- debian/trunk/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/shadow
===================================================================
--- debian/trunk/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/groupmod.test
===================================================================
--- debian/trunk/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/groupmod/09_groupmod_-n_no_passwd_open_failure/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/failures/grpck/02_grpck_group_open_failure/data/group
===================================================================
--- debian/trunk/tests/failures/grpck/02_grpck_group_open_failure/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/grpck/02_grpck_group_open_failure/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/failures/userdel/04_userdel_passwd_rename_failure/data/group
===================================================================
--- debian/trunk/tests/failures/userdel/04_userdel_passwd_rename_failure/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/userdel/04_userdel_passwd_rename_failure/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/failures/userdel/04_userdel_passwd_rename_failure/data/passwd
===================================================================
--- debian/trunk/tests/failures/userdel/04_userdel_passwd_rename_failure/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/userdel/04_userdel_passwd_rename_failure/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/failures/userdel/04_userdel_passwd_rename_failure/data/shadow
===================================================================
--- debian/trunk/tests/failures/userdel/04_userdel_passwd_rename_failure/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/userdel/04_userdel_passwd_rename_failure/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Deleted: debian/trunk/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/gshadow
===================================================================
--- debian/trunk/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Modified: debian/trunk/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/usermod.test
===================================================================
--- debian/trunk/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -45,7 +45,7 @@
 ../../../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"

Deleted: debian/trunk/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/group
===================================================================
--- debian/trunk/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/gshadow
===================================================================
--- debian/trunk/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/passwd
===================================================================
--- debian/trunk/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/shadow
===================================================================
--- debian/trunk/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/usermod.test
===================================================================
--- debian/trunk/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/usermod/02_usermod_change_uid_passwd_rename_failure/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/data/group
===================================================================
--- debian/trunk/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/data/gshadow
===================================================================
--- debian/trunk/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Modified: debian/trunk/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/usermod.test
===================================================================
--- debian/trunk/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/usermod/03_usermod_change_user_name_group_rename_failure/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -39,13 +39,13 @@
 ../../../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"

Deleted: debian/trunk/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/group
===================================================================
--- debian/trunk/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/gshadow
===================================================================
--- debian/trunk/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/usermod.err
===================================================================
--- debian/trunk/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/usermod.err	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/data/usermod.err	2011-07-17 12:00:16 UTC (rev 3428)
@@ -1,2 +0,0 @@
-rename FAILURE /etc/gshadow+ /etc/gshadow
-usermod: failure while writing changes to /etc/gshadow

Modified: debian/trunk/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/usermod.test
===================================================================
--- debian/trunk/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/usermod/04_usermod_change_user_name_gshadow_rename_no_failure/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 ../../../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"

Deleted: debian/trunk/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/group
===================================================================
--- debian/trunk/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/gshadow
===================================================================
--- debian/trunk/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/shadow
===================================================================
--- debian/trunk/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/usermod.test
===================================================================
--- debian/trunk/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/usermod/05_usermod_change_uid_shadow_rename_failure/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -39,13 +39,13 @@
 ../../../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"

Deleted: debian/trunk/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/group
===================================================================
--- debian/trunk/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/gshadow
===================================================================
--- debian/trunk/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/passwd
===================================================================
--- debian/trunk/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/shadow
===================================================================
--- debian/trunk/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/failures/usermod/12_usermod_change_uid_passwd_unlock_passwd_failure/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Deleted: debian/trunk/tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/01_gpasswd_change_member_list/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/01_gpasswd_change_member_list/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/01_gpasswd_change_member_list/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/01_gpasswd_change_member_list/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/02_gpasswd_change_member_list/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/02_gpasswd_change_member_list/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/02_gpasswd_change_member_list/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/02_gpasswd_change_member_list/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/03_gpasswd_change_member_list/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/03_gpasswd_change_member_list/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/03_gpasswd_change_member_list/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/03_gpasswd_change_member_list/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/03_gpasswd_change_member_list/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/03_gpasswd_change_member_list/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/03_gpasswd_change_member_list/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/03_gpasswd_change_member_list/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/03_gpasswd_change_member_list/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/04_gpasswd_change_member_list/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/04_gpasswd_change_member_list/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/04_gpasswd_change_member_list/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/04_gpasswd_change_member_list/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/04_gpasswd_change_member_list/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/04_gpasswd_change_member_list/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/04_gpasswd_change_member_list/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/04_gpasswd_change_member_list/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/04_gpasswd_change_member_list/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/05_gpasswd_change_member_list/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/05_gpasswd_change_member_list/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/05_gpasswd_change_member_list/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/05_gpasswd_change_member_list/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/05_gpasswd_change_member_list/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/05_gpasswd_change_member_list/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/05_gpasswd_change_member_list/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/05_gpasswd_change_member_list/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/05_gpasswd_change_member_list/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/06_gpasswd_change_member_list/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/06_gpasswd_change_member_list/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/06_gpasswd_change_member_list/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/06_gpasswd_change_member_list/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/06_gpasswd_change_member_list/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/06_gpasswd_change_member_list/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/06_gpasswd_change_member_list/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/06_gpasswd_change_member_list/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/06_gpasswd_change_member_list/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/07_gpasswd_change_member_list-no_shadow_group/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/08_gpasswd_change_member_list-no_shadow_group/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/09_gpasswd_change_member_list-no_shadow_group/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/10_gpasswd_change_member_list-no_shadow_group/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/11_gpasswd_change_member_list-no_shadow_group/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/12_gpasswd_change_member_list-no_shadow_group/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/13_gpasswd_change_member_list-no_gshadow_file/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/14_gpasswd_change_member_list-no_gshadow_file/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/15_gpasswd_change_member_list-no_gshadow_file/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/16_gpasswd_change_member_list-no_gshadow_file/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/17_gpasswd_change_member_list-no_gshadow_file/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -25,13 +25,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/18_gpasswd_change_member_list-no_gshadow_file/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/data/group
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/19_gpasswd_change_passwd-root/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 ./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

Deleted: debian/trunk/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data/group
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/20_gpasswd_change_passwd-root-no_shadow_group/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 ./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

Deleted: debian/trunk/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/21_gpasswd_change_passwd-root-no_gshadow_file/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -27,13 +27,13 @@
 ./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

Deleted: debian/trunk/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data/group
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/22_gpasswd_change_passwd-myuser/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 ./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

Deleted: debian/trunk/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/group
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/23_gpasswd_change_passwd-myuser-denied/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,16 +24,16 @@
 ./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"

Deleted: debian/trunk/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/data/group
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/24_gpasswd_change_passwd-myuser-denied-no_gshadow_file/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -27,13 +27,13 @@
 ./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

Deleted: debian/trunk/tests/grouptools/gpasswd/25_gpasswd_remove_password/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/25_gpasswd_remove_password/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/25_gpasswd_remove_password/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/25_gpasswd_remove_password/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/25_gpasswd_remove_password/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/25_gpasswd_remove_password/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/25_gpasswd_remove_password/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/25_gpasswd_remove_password/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/25_gpasswd_remove_password/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/26_gpasswd_remove_password-no_shadow_group/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/27_gpasswd_remove_password-no_gshadow_file/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/28_gpasswd_lock_password/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/28_gpasswd_lock_password/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/28_gpasswd_lock_password/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/28_gpasswd_lock_password/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/28_gpasswd_lock_password/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/28_gpasswd_lock_password/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/28_gpasswd_lock_password/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/28_gpasswd_lock_password/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/28_gpasswd_lock_password/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/29_gpasswd_lock_password-no_shadow_group/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/30_gpasswd_lock_password-no_gshadow_file/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/31_gpasswd_add_user_to_group/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/32_gpasswd_add_user_to_group-no_shadow_group/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/33_gpasswd_add_user_to_group-no_gshadow_file/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/34_gpasswd_remove_user_from_group/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/35_gpasswd_remove_user_from_group/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/36_gpasswd_remove_user_from_group/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -22,13 +22,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/37_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/38_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/39_gpasswd_remove_user_from_group-no_shadow_group/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/40_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/41_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/42_gpasswd_remove_user_from_group-no_gshadow_file/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/group
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/43_gpasswd_-r_locked_group/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -42,16 +42,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/group
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/44_gpasswd_-r_locked_gshadow/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -42,16 +42,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/group
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/45_gpasswd_-r_unknown_group/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/group
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/46_gpasswd_-a_unknown_user/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/group
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/47_gpasswd_-M_unknown_user/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/data/group
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/48_gpasswd_change_admin_list/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/group
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/49_gpasswd_change_admin_list/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/data/group
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/50_gpasswd_change_admin_list/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/data/group
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/51_gpasswd_change_admin_list/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/data/group
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/52_gpasswd_change_admin_list/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/data/group
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/53_gpasswd_change_admin_list/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data/group
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/54_gpasswd_change_admin_list-no_shadow_group/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/group
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/55_gpasswd_change_admin_list-no_gshadow_file/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -39,13 +39,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/group
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/56_gpasswd_add_user_to_group/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,16 +21,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/group
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/57_gpasswd_remove_user_from_group-not_member/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/58_gpasswd_remove_user_from_group-not_gshadow_member/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,16 +21,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data/group
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/59_gpasswd_remove_user_from_group-not_group_member/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/gpasswd.test
===================================================================
--- debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/gpasswd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/gpasswd/60_gpasswd_add_long_user_to_group/gpasswd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupadd/01_groupadd_add_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupadd/01_groupadd_add_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/01_groupadd_add_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupadd/01_groupadd_add_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/01_groupadd_add_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/01_groupadd_add_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupadd/01_groupadd_add_group/groupadd.test
===================================================================
--- debian/trunk/tests/grouptools/groupadd/01_groupadd_add_group/groupadd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/01_groupadd_add_group/groupadd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/groupadd.test
===================================================================
--- debian/trunk/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/groupadd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/02_groupadd_add_group_GID_MIN/groupadd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/groupadd.test
===================================================================
--- debian/trunk/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/groupadd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/03_groupadd_add_group_-K_GID_MIN/groupadd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupadd/04_groupadd_set_password/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupadd/04_groupadd_set_password/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/04_groupadd_set_password/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupadd/04_groupadd_set_password/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/04_groupadd_set_password/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/04_groupadd_set_password/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupadd/04_groupadd_set_password/groupadd.test
===================================================================
--- debian/trunk/tests/grouptools/groupadd/04_groupadd_set_password/groupadd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/04_groupadd_set_password/groupadd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupadd/05_groupadd_set_GID/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupadd/05_groupadd_set_GID/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/05_groupadd_set_GID/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupadd/05_groupadd_set_GID/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/05_groupadd_set_GID/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/05_groupadd_set_GID/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupadd/05_groupadd_set_GID/groupadd.test
===================================================================
--- debian/trunk/tests/grouptools/groupadd/05_groupadd_set_GID/groupadd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/05_groupadd_set_GID/groupadd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/groupadd.test
===================================================================
--- debian/trunk/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/groupadd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/06_groupadd_-f_add_existing_group/groupadd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,16 +21,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/groupadd.test
===================================================================
--- debian/trunk/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/groupadd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/07_groupadd_-f_add_existing_GID/groupadd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupadd/08_groupadd_locked_group/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupadd/08_groupadd_locked_group/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/08_groupadd_locked_group/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupadd/08_groupadd_locked_group/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/08_groupadd_locked_group/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/08_groupadd_locked_group/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/grouptools/groupadd/08_groupadd_locked_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupadd/08_groupadd_locked_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/08_groupadd_locked_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupadd/08_groupadd_locked_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/08_groupadd_locked_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/08_groupadd_locked_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupadd/08_groupadd_locked_group/groupadd.test
===================================================================
--- debian/trunk/tests/grouptools/groupadd/08_groupadd_locked_group/groupadd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/08_groupadd_locked_group/groupadd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -42,16 +42,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/09_groupadd_locked_gshadow/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupadd/09_groupadd_locked_gshadow/groupadd.test
===================================================================
--- debian/trunk/tests/grouptools/groupadd/09_groupadd_locked_gshadow/groupadd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/09_groupadd_locked_gshadow/groupadd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -42,16 +42,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/groupadd.test
===================================================================
--- debian/trunk/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/groupadd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/10_groupadd_-o_add_existing_GID/groupadd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/11_groupadd_invalid_GID/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupadd/11_groupadd_invalid_GID/groupadd.test
===================================================================
--- debian/trunk/tests/grouptools/groupadd/11_groupadd_invalid_GID/groupadd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/11_groupadd_invalid_GID/groupadd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupadd/12_groupadd_negativ_GID/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupadd/12_groupadd_negativ_GID/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/12_groupadd_negativ_GID/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupadd/12_groupadd_negativ_GID/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/12_groupadd_negativ_GID/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/12_groupadd_negativ_GID/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/grouptools/groupadd/12_groupadd_negativ_GID/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupadd/12_groupadd_negativ_GID/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/12_groupadd_negativ_GID/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupadd/12_groupadd_negativ_GID/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/12_groupadd_negativ_GID/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/12_groupadd_negativ_GID/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupadd/12_groupadd_negativ_GID/groupadd.test
===================================================================
--- debian/trunk/tests/grouptools/groupadd/12_groupadd_negativ_GID/groupadd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/12_groupadd_negativ_GID/groupadd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupadd/13_groupadd_invalid_name/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupadd/13_groupadd_invalid_name/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/13_groupadd_invalid_name/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupadd/13_groupadd_invalid_name/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/13_groupadd_invalid_name/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/13_groupadd_invalid_name/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/grouptools/groupadd/13_groupadd_invalid_name/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupadd/13_groupadd_invalid_name/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/13_groupadd_invalid_name/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupadd/13_groupadd_invalid_name/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/13_groupadd_invalid_name/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/13_groupadd_invalid_name/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupadd/13_groupadd_invalid_name/groupadd.test
===================================================================
--- debian/trunk/tests/grouptools/groupadd/13_groupadd_invalid_name/groupadd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/13_groupadd_invalid_name/groupadd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/groupadd.test
===================================================================
--- debian/trunk/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/groupadd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/14_groupadd_invalid_-K_option/groupadd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/groupadd.test
===================================================================
--- debian/trunk/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/groupadd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/15_groupadd_invalid_-K_no_=/groupadd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupadd/16_groupadd_existing_group/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupadd/16_groupadd_existing_group/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/16_groupadd_existing_group/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupadd/16_groupadd_existing_group/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/16_groupadd_existing_group/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/16_groupadd_existing_group/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupadd/16_groupadd_existing_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupadd/16_groupadd_existing_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/16_groupadd_existing_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupadd/16_groupadd_existing_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/16_groupadd_existing_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/16_groupadd_existing_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupadd/16_groupadd_existing_group/groupadd.test
===================================================================
--- debian/trunk/tests/grouptools/groupadd/16_groupadd_existing_group/groupadd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/16_groupadd_existing_group/groupadd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupadd/17_groupadd_add_systemgroup/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupadd/17_groupadd_add_systemgroup/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/17_groupadd_add_systemgroup/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupadd/17_groupadd_add_systemgroup/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/17_groupadd_add_systemgroup/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/17_groupadd_add_systemgroup/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupadd/17_groupadd_add_systemgroup/groupadd.test
===================================================================
--- debian/trunk/tests/grouptools/groupadd/17_groupadd_add_systemgroup/groupadd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/17_groupadd_add_systemgroup/groupadd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/18_groupadd_no_more_GID/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupadd/18_groupadd_no_more_GID/groupadd.test
===================================================================
--- debian/trunk/tests/grouptools/groupadd/18_groupadd_no_more_GID/groupadd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/18_groupadd_no_more_GID/groupadd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/groupadd.test
===================================================================
--- debian/trunk/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/groupadd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/19_groupadd_-r_no_more_system_GID/groupadd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/20_groupadd_add_existing_GID/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupadd/20_groupadd_add_existing_GID/groupadd.test
===================================================================
--- debian/trunk/tests/grouptools/groupadd/20_groupadd_add_existing_GID/groupadd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/20_groupadd_add_existing_GID/groupadd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupadd/25_groupadd_no_gshadow/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupadd/25_groupadd_no_gshadow/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/25_groupadd_no_gshadow/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupadd/25_groupadd_no_gshadow/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupadd/25_groupadd_no_gshadow/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/25_groupadd_no_gshadow/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupadd/25_groupadd_no_gshadow/groupadd.test
===================================================================
--- debian/trunk/tests/grouptools/groupadd/25_groupadd_no_gshadow/groupadd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupadd/25_groupadd_no_gshadow/groupadd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -25,13 +25,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupdel/01_groupdel_delete_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupdel/01_groupdel_delete_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/01_groupdel_delete_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupdel/01_groupdel_delete_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupdel/01_groupdel_delete_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/01_groupdel_delete_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupdel/01_groupdel_delete_group/groupdel.test
===================================================================
--- debian/trunk/tests/grouptools/groupdel/01_groupdel_delete_group/groupdel.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/01_groupdel_delete_group/groupdel.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/groupdel.test
===================================================================
--- debian/trunk/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/groupdel.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/02_groupdel_delete_group_no_gshadow_group/groupdel.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,16 +21,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/groupdel.test
===================================================================
--- debian/trunk/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/groupdel.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/03_groupdel_delete_group_no_gshadow_file/groupdel.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/groupdel.test
===================================================================
--- debian/trunk/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/groupdel.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/04_groupdel_delete_group_error_busy_group/groupdel.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/groupdel.test
===================================================================
--- debian/trunk/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/groupdel.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/05_groupdel_delete_group_error_unknown_group/groupdel.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/groupdel.test
===================================================================
--- debian/trunk/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/groupdel.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/06_groupdel_delete_group_error_locked_group/groupdel.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -42,16 +42,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/groupdel.test
===================================================================
--- debian/trunk/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/groupdel.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/07_groupdel_delete_group_error_locked_gshadow/groupdel.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -42,16 +42,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/groupdel.test
===================================================================
--- debian/trunk/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/groupdel.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/08_groupdel_delete_group_error_no_group_parameter/groupdel.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/groupdel.test
===================================================================
--- debian/trunk/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/groupdel.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupdel/09_groupdel_delete_group_error_two_group_parameter/groupdel.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmems/01_groupmems_root_add_user/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/01_groupmems_root_add_user/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/01_groupmems_root_add_user/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/01_groupmems_root_add_user/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/01_groupmems_root_add_user/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/01_groupmems_root_add_user/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/01_groupmems_root_add_user/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/01_groupmems_root_add_user/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/01_groupmems_root_add_user/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/02_groupmems_root_del_user/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/02_groupmems_root_del_user/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/02_groupmems_root_del_user/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/02_groupmems_root_del_user/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/02_groupmems_root_del_user/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/02_groupmems_root_del_user/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/02_groupmems_root_del_user/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/02_groupmems_root_del_user/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/02_groupmems_root_del_user/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/03_groupmems_root_del_user_admin/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/04_groupmems_root_del_user_admin_and_user/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/05_groupmems_root_add_user_with_other_users/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/06_groupmems_root_add_user_with_other_users_admin/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/07_groupmems_root_del_user_with_other_users/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/08_groupmems_root_del_user_with_other_users_admin/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/09_groupmems_root_purge_user/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/09_groupmems_root_purge_user/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/09_groupmems_root_purge_user/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/09_groupmems_root_purge_user/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/09_groupmems_root_purge_user/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/09_groupmems_root_purge_user/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/09_groupmems_root_purge_user/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/09_groupmems_root_purge_user/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/09_groupmems_root_purge_user/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/10_groupmems_root_purge_user_with_other_users/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/11_groupmems_root_purge_user_with_other_users_admin/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/12_groupmems_user_add_user/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/12_groupmems_user_add_user/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/12_groupmems_user_add_user/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/12_groupmems_user_add_user/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/12_groupmems_user_add_user/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/12_groupmems_user_add_user/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/12_groupmems_user_add_user/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/12_groupmems_user_add_user/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/12_groupmems_user_add_user/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/13_groupmems_user_del_user/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/13_groupmems_user_del_user/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/13_groupmems_user_del_user/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/13_groupmems_user_del_user/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/13_groupmems_user_del_user/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/13_groupmems_user_del_user/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/13_groupmems_user_del_user/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/13_groupmems_user_del_user/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/13_groupmems_user_del_user/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/14_groupmems_user_del_user_admin/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/15_groupmems_user_del_user_admin_and_user/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/16_groupmems_user_add_user_with_other_users/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/17_groupmems_user_add_user_with_other_users_admin/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/18_groupmems_user_del_user_with_other_users/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/19_groupmems_user_del_user_with_other_users_admin/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/20_groupmems_user_purge_user/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/20_groupmems_user_purge_user/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/20_groupmems_user_purge_user/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/20_groupmems_user_purge_user/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/20_groupmems_user_purge_user/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/20_groupmems_user_purge_user/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/20_groupmems_user_purge_user/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/20_groupmems_user_purge_user/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/20_groupmems_user_purge_user/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/21_groupmems_user_purge_user_with_other_users/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/22_groupmems_user_purge_user_with_other_users_admin/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/23_groupmems_user_add_user-not_in_groups/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,16 +21,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/24_groupmems_user_add_user-not_primary_group/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,16 +21,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/25_groupmems_user_add_user-not_user_group/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,16 +21,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/26_groupmems_user_add_user-already_member/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,16 +21,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/27_groupmems_user_add_user-already_member_in_group/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,16 +21,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/28_groupmems_user_add_user-already_member_in_gshadow/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,16 +21,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/29_groupmems_user_add_user-user_does_not_exist/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,16 +21,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/30_groupmems_user_add_user-no_gshadow_group/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/31_groupmems_user_add_user-no_gshadow_file/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/32_groupmems_user_del_user-not_member/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,16 +21,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/33_groupmems_user_del_user-not_member_in_gshadow/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,16 +21,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/34_groupmems_user_del_user-user_does_not_exist/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/35_groupmems_user_del_user-no_gshadow_group/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/36_groupmems_user_del_user-no_gshadow_file/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/37_groupmems_user_purge_user-empty_group/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/38_groupmems_user_purge_user-no_gshadow_group/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/39_groupmems_user_purge_user-no_gshadow_file/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/40_groupmems_user_del_user-not_primary_group/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,16 +21,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/41_groupmems_user_purge_user-not_primary_group/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,16 +21,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmems/42_groupmems_user_list_users/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmems/42_groupmems_user_list_users/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/42_groupmems_user_list_users/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/42_groupmems_user_list_users/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/42_groupmems_user_list_users/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/42_groupmems_user_list_users/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/42_groupmems_user_list_users/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/42_groupmems_user_list_users/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/42_groupmems_user_list_users/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/42_groupmems_user_list_users/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/42_groupmems_user_list_users/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/42_groupmems_user_list_users/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/42_groupmems_user_list_users/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/42_groupmems_user_list_users/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/42_groupmems_user_list_users/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,16 +21,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/43_groupmems_user_list_users-gshadow_ignored/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,16 +21,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/44_groupmems_user_list_users-another_group/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,16 +21,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/45_groupmems_user_list_users-group_locked/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -27,16 +27,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/46_groupmems_user_list_users-gshadow_locked/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -27,16 +27,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/47_groupmems_user_add_user-group_locked/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -27,16 +27,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/48_groupmems_user_add_user-gshadow_locked/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -27,16 +27,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/49_groupmems_user_del_user-group_locked/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -27,16 +27,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/50_groupmems_user_del_user-gshadow_locked/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -27,16 +27,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/51_groupmems_user_purge_user-group_locked/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -27,16 +27,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/groupmems.test
===================================================================
--- debian/trunk/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/groupmems.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmems/52_groupmems_user_purge_user-gshadow_locked/groupmems.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -27,16 +27,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmod/01_groupmod_change_gid/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/01_groupmod_change_gid/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/01_groupmod_change_gid/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupmod/01_groupmod_change_gid/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/01_groupmod_change_gid/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/01_groupmod_change_gid/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmod/01_groupmod_change_gid/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/01_groupmod_change_gid/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/01_groupmod_change_gid/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/01_groupmod_change_gid/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/01_groupmod_change_gid/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/01_groupmod_change_gid/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,16 +21,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/02_groupmod_change_gid_change_primary_group/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -27,10 +27,10 @@
 ../../../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"

Deleted: debian/trunk/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/03_groupmod_change_gid_no_gshadow_group/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,16 +21,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/04_groupmod_change_gid_no_gshadow_file/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/05_groupmod_change_gid_-o_override_used_GID/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,16 +21,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmod/06_groupmod_change_group_name/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/06_groupmod_change_group_name/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/06_groupmod_change_group_name/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmod/06_groupmod_change_group_name/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/06_groupmod_change_group_name/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/06_groupmod_change_group_name/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/06_groupmod_change_group_name/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/06_groupmod_change_group_name/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/06_groupmod_change_group_name/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/07_groupmod_change_group_name_no_gshadow_group/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,16 +21,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/08_groupmod_change_group_name_no_gshadow_file/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmod/09_groupmod_set_password/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmod/09_groupmod_set_password/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/09_groupmod_set_password/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupmod/09_groupmod_set_password/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/09_groupmod_set_password/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/09_groupmod_set_password/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmod/09_groupmod_set_password/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/09_groupmod_set_password/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/09_groupmod_set_password/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/09_groupmod_set_password/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/09_groupmod_set_password/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/09_groupmod_set_password/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/10_groupmod_set_password_no_gshadow_group/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/11_groupmod_set_password_no_gshadow_file/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/12_groupmod_change_gid_error_unknown_group/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/13_groupmod_change_gid_error_used_GID/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/14_groupmod_change_group_name_error_used_name/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/15_groupmod_change_group_name_error_invalid_name/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/16_groupmod_change_group_name_no_changes/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,16 +21,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/17_groupmod_change_gid_error_locked_group/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -42,16 +42,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -29,16 +29,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/19_groupmod_change_gid_error_invalid_GID/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/20_groupmod_change_gid_error_negativ_GID/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/21_groupmod_change_gid_error_no_group/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -42,16 +42,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/22_groupmod_change_gid_and_group_name/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/23_groupmod_change_gid_and_group_name_and_password/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -27,7 +27,7 @@
 ../../../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

Deleted: debian/trunk/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/24_groupmod_change_gid_and_name_error_locked_gshadow/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -42,16 +42,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/25_groupmod_change_gid_change_primary_group_error_locked_passwd/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -42,16 +42,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/26_groupmod_change_group_name_no_error_locked_passwd/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -29,13 +29,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/29_groupmod_-g_same_gid_new_name/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/30_groupmod_-g_same_gid_same_name/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,16 +21,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/gshadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/31_groupmod_-g_same_gid/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/31_groupmod_-g_same_gid/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/31_groupmod_-g_same_gid/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/31_groupmod_-g_same_gid/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,16 +21,16 @@
 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"

Deleted: debian/trunk/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/data/passwd
===================================================================
--- debian/trunk/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/data/shadow
===================================================================
--- debian/trunk/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/groupmod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/grouptools/groupmod/33_groupmod_set_password_no_gshadow_file_with_group_pwd_x/groupmod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 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

Deleted: debian/trunk/tests/newusers/02_update_password/data/group
===================================================================
--- debian/trunk/tests/newusers/02_update_password/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/02_update_password/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/newusers/02_update_password/data/gshadow
===================================================================
--- debian/trunk/tests/newusers/02_update_password/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/02_update_password/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/newusers/02_update_password/data/passwd
===================================================================
--- debian/trunk/tests/newusers/02_update_password/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/02_update_password/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Modified: debian/trunk/tests/newusers/02_update_password/newusers.test
===================================================================
--- debian/trunk/tests/newusers/02_update_password/newusers.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/02_update_password/newusers.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -19,16 +19,16 @@
 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"

Deleted: debian/trunk/tests/newusers/03_no_update_pid/data/group
===================================================================
--- debian/trunk/tests/newusers/03_no_update_pid/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/03_no_update_pid/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/newusers/03_no_update_pid/data/gshadow
===================================================================
--- debian/trunk/tests/newusers/03_no_update_pid/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/03_no_update_pid/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/newusers/03_no_update_pid/data/passwd
===================================================================
--- debian/trunk/tests/newusers/03_no_update_pid/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/03_no_update_pid/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Modified: debian/trunk/tests/newusers/03_no_update_pid/newusers.test
===================================================================
--- debian/trunk/tests/newusers/03_no_update_pid/newusers.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/03_no_update_pid/newusers.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -19,16 +19,16 @@
 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"

Deleted: debian/trunk/tests/newusers/04_no_update_gid/data/group
===================================================================
--- debian/trunk/tests/newusers/04_no_update_gid/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/04_no_update_gid/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/newusers/04_no_update_gid/data/gshadow
===================================================================
--- debian/trunk/tests/newusers/04_no_update_gid/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/04_no_update_gid/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/newusers/04_no_update_gid/data/passwd
===================================================================
--- debian/trunk/tests/newusers/04_no_update_gid/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/04_no_update_gid/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Modified: debian/trunk/tests/newusers/04_no_update_gid/newusers.test
===================================================================
--- debian/trunk/tests/newusers/04_no_update_gid/newusers.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/04_no_update_gid/newusers.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -19,16 +19,16 @@
 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"

Deleted: debian/trunk/tests/newusers/10_create_user_gid-as-group-bar/data/group
===================================================================
--- debian/trunk/tests/newusers/10_create_user_gid-as-group-bar/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/10_create_user_gid-as-group-bar/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/newusers/10_create_user_gid-as-group-bar/data/gshadow
===================================================================
--- debian/trunk/tests/newusers/10_create_user_gid-as-group-bar/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/10_create_user_gid-as-group-bar/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Modified: debian/trunk/tests/newusers/10_create_user_gid-as-group-bar/newusers.test
===================================================================
--- debian/trunk/tests/newusers/10_create_user_gid-as-group-bar/newusers.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/10_create_user_gid-as-group-bar/newusers.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -22,13 +22,13 @@
 ../../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"

Deleted: debian/trunk/tests/newusers/11_update_gecos/data/group
===================================================================
--- debian/trunk/tests/newusers/11_update_gecos/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/11_update_gecos/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/newusers/11_update_gecos/data/gshadow
===================================================================
--- debian/trunk/tests/newusers/11_update_gecos/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/11_update_gecos/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Modified: debian/trunk/tests/newusers/11_update_gecos/newusers.test
===================================================================
--- debian/trunk/tests/newusers/11_update_gecos/newusers.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/11_update_gecos/newusers.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -22,13 +22,13 @@
 ../../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"

Deleted: debian/trunk/tests/newusers/12_update_shell/data/group
===================================================================
--- debian/trunk/tests/newusers/12_update_shell/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/12_update_shell/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/newusers/12_update_shell/data/gshadow
===================================================================
--- debian/trunk/tests/newusers/12_update_shell/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/12_update_shell/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Modified: debian/trunk/tests/newusers/12_update_shell/newusers.test
===================================================================
--- debian/trunk/tests/newusers/12_update_shell/newusers.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/12_update_shell/newusers.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -22,13 +22,13 @@
 ../../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"

Deleted: debian/trunk/tests/newusers/15_update_new-home/data/group
===================================================================
--- debian/trunk/tests/newusers/15_update_new-home/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/15_update_new-home/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/newusers/15_update_new-home/data/gshadow
===================================================================
--- debian/trunk/tests/newusers/15_update_new-home/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/15_update_new-home/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Modified: debian/trunk/tests/newusers/15_update_new-home/newusers.test
===================================================================
--- debian/trunk/tests/newusers/15_update_new-home/newusers.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/15_update_new-home/newusers.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -29,13 +29,13 @@
 ../../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..."

Deleted: debian/trunk/tests/newusers/16_update_existing-home/data/group
===================================================================
--- debian/trunk/tests/newusers/16_update_existing-home/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/16_update_existing-home/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/newusers/16_update_existing-home/data/gshadow
===================================================================
--- debian/trunk/tests/newusers/16_update_existing-home/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/16_update_existing-home/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Modified: debian/trunk/tests/newusers/16_update_existing-home/newusers.test
===================================================================
--- debian/trunk/tests/newusers/16_update_existing-home/newusers.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/16_update_existing-home/newusers.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -29,13 +29,13 @@
 ../../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..."

Deleted: debian/trunk/tests/newusers/18_create_user_gid-already-used/data/group
===================================================================
--- debian/trunk/tests/newusers/18_create_user_gid-already-used/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/18_create_user_gid-already-used/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/newusers/18_create_user_gid-already-used/data/gshadow
===================================================================
--- debian/trunk/tests/newusers/18_create_user_gid-already-used/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/18_create_user_gid-already-used/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Modified: debian/trunk/tests/newusers/18_create_user_gid-already-used/newusers.test
===================================================================
--- debian/trunk/tests/newusers/18_create_user_gid-already-used/newusers.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/18_create_user_gid-already-used/newusers.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -22,13 +22,13 @@
 ../../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"

Deleted: debian/trunk/tests/newusers/19_update_keep-old-home/data/group
===================================================================
--- debian/trunk/tests/newusers/19_update_keep-old-home/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/19_update_keep-old-home/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/newusers/19_update_keep-old-home/data/gshadow
===================================================================
--- debian/trunk/tests/newusers/19_update_keep-old-home/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/19_update_keep-old-home/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Modified: debian/trunk/tests/newusers/19_update_keep-old-home/newusers.test
===================================================================
--- debian/trunk/tests/newusers/19_update_keep-old-home/newusers.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/19_update_keep-old-home/newusers.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -31,13 +31,13 @@
 ../../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..."

Deleted: debian/trunk/tests/newusers/23_create_user_error_negativ_UID/data/group
===================================================================
--- debian/trunk/tests/newusers/23_create_user_error_negativ_UID/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/23_create_user_error_negativ_UID/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/newusers/23_create_user_error_negativ_UID/data/gshadow
===================================================================
--- debian/trunk/tests/newusers/23_create_user_error_negativ_UID/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/23_create_user_error_negativ_UID/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/newusers/23_create_user_error_negativ_UID/data/passwd
===================================================================
--- debian/trunk/tests/newusers/23_create_user_error_negativ_UID/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/23_create_user_error_negativ_UID/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/newusers/23_create_user_error_negativ_UID/data/shadow
===================================================================
--- debian/trunk/tests/newusers/23_create_user_error_negativ_UID/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/23_create_user_error_negativ_UID/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/newusers/23_create_user_error_negativ_UID/newusers.test
===================================================================
--- debian/trunk/tests/newusers/23_create_user_error_negativ_UID/newusers.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/23_create_user_error_negativ_UID/newusers.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/newusers/24_create_user_error_invalid_UID/data/group
===================================================================
--- debian/trunk/tests/newusers/24_create_user_error_invalid_UID/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/24_create_user_error_invalid_UID/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/newusers/24_create_user_error_invalid_UID/data/gshadow
===================================================================
--- debian/trunk/tests/newusers/24_create_user_error_invalid_UID/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/24_create_user_error_invalid_UID/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/newusers/24_create_user_error_invalid_UID/data/passwd
===================================================================
--- debian/trunk/tests/newusers/24_create_user_error_invalid_UID/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/24_create_user_error_invalid_UID/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/newusers/24_create_user_error_invalid_UID/data/shadow
===================================================================
--- debian/trunk/tests/newusers/24_create_user_error_invalid_UID/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/24_create_user_error_invalid_UID/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/newusers/24_create_user_error_invalid_UID/newusers.test
===================================================================
--- debian/trunk/tests/newusers/24_create_user_error_invalid_UID/newusers.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/24_create_user_error_invalid_UID/newusers.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/newusers/25_create_user_error_no_remaining_UID/data/group
===================================================================
--- debian/trunk/tests/newusers/25_create_user_error_no_remaining_UID/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/25_create_user_error_no_remaining_UID/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/newusers/25_create_user_error_no_remaining_UID/data/gshadow
===================================================================
--- debian/trunk/tests/newusers/25_create_user_error_no_remaining_UID/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/25_create_user_error_no_remaining_UID/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/newusers/25_create_user_error_no_remaining_UID/data/passwd
===================================================================
--- debian/trunk/tests/newusers/25_create_user_error_no_remaining_UID/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/25_create_user_error_no_remaining_UID/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/newusers/25_create_user_error_no_remaining_UID/data/shadow
===================================================================
--- debian/trunk/tests/newusers/25_create_user_error_no_remaining_UID/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/25_create_user_error_no_remaining_UID/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/newusers/25_create_user_error_no_remaining_UID/newusers.test
===================================================================
--- debian/trunk/tests/newusers/25_create_user_error_no_remaining_UID/newusers.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/25_create_user_error_no_remaining_UID/newusers.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -37,16 +37,16 @@
 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"

Deleted: debian/trunk/tests/newusers/26_create_user_error_no_remaining_GID/data/group
===================================================================
--- debian/trunk/tests/newusers/26_create_user_error_no_remaining_GID/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/26_create_user_error_no_remaining_GID/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/newusers/26_create_user_error_no_remaining_GID/data/gshadow
===================================================================
--- debian/trunk/tests/newusers/26_create_user_error_no_remaining_GID/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/26_create_user_error_no_remaining_GID/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/newusers/26_create_user_error_no_remaining_GID/data/passwd
===================================================================
--- debian/trunk/tests/newusers/26_create_user_error_no_remaining_GID/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/26_create_user_error_no_remaining_GID/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/newusers/26_create_user_error_no_remaining_GID/data/shadow
===================================================================
--- debian/trunk/tests/newusers/26_create_user_error_no_remaining_GID/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/26_create_user_error_no_remaining_GID/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/newusers/26_create_user_error_no_remaining_GID/newusers.test
===================================================================
--- debian/trunk/tests/newusers/26_create_user_error_no_remaining_GID/newusers.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/26_create_user_error_no_remaining_GID/newusers.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -37,16 +37,16 @@
 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"

Deleted: debian/trunk/tests/newusers/27_create_user_error_invalid_username/data/group
===================================================================
--- debian/trunk/tests/newusers/27_create_user_error_invalid_username/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/27_create_user_error_invalid_username/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/newusers/27_create_user_error_invalid_username/data/gshadow
===================================================================
--- debian/trunk/tests/newusers/27_create_user_error_invalid_username/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/27_create_user_error_invalid_username/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/newusers/27_create_user_error_invalid_username/data/passwd
===================================================================
--- debian/trunk/tests/newusers/27_create_user_error_invalid_username/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/27_create_user_error_invalid_username/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/newusers/27_create_user_error_invalid_username/data/shadow
===================================================================
--- debian/trunk/tests/newusers/27_create_user_error_invalid_username/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/27_create_user_error_invalid_username/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/newusers/27_create_user_error_invalid_username/newusers.test
===================================================================
--- debian/trunk/tests/newusers/27_create_user_error_invalid_username/newusers.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/27_create_user_error_invalid_username/newusers.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/newusers/28_create_user_error_invalid_groupname/data/group
===================================================================
--- debian/trunk/tests/newusers/28_create_user_error_invalid_groupname/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/28_create_user_error_invalid_groupname/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/newusers/28_create_user_error_invalid_groupname/data/gshadow
===================================================================
--- debian/trunk/tests/newusers/28_create_user_error_invalid_groupname/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/28_create_user_error_invalid_groupname/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/newusers/28_create_user_error_invalid_groupname/data/passwd
===================================================================
--- debian/trunk/tests/newusers/28_create_user_error_invalid_groupname/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/28_create_user_error_invalid_groupname/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/newusers/28_create_user_error_invalid_groupname/data/shadow
===================================================================
--- debian/trunk/tests/newusers/28_create_user_error_invalid_groupname/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/28_create_user_error_invalid_groupname/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/newusers/28_create_user_error_invalid_groupname/newusers.test
===================================================================
--- debian/trunk/tests/newusers/28_create_user_error_invalid_groupname/newusers.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/28_create_user_error_invalid_groupname/newusers.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/group
===================================================================
--- debian/trunk/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/gshadow
===================================================================
--- debian/trunk/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/passwd
===================================================================
--- debian/trunk/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/shadow
===================================================================
--- debian/trunk/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/29_create_user_error_invalid_username_valid_groupname/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/newusers/29_create_user_error_invalid_username_valid_groupname/newusers.test
===================================================================
--- debian/trunk/tests/newusers/29_create_user_error_invalid_username_valid_groupname/newusers.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/29_create_user_error_invalid_username_valid_groupname/newusers.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/newusers/31_create_user_error_invalid_GID/data/group
===================================================================
--- debian/trunk/tests/newusers/31_create_user_error_invalid_GID/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/31_create_user_error_invalid_GID/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/newusers/31_create_user_error_invalid_GID/data/gshadow
===================================================================
--- debian/trunk/tests/newusers/31_create_user_error_invalid_GID/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/31_create_user_error_invalid_GID/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/newusers/31_create_user_error_invalid_GID/data/passwd
===================================================================
--- debian/trunk/tests/newusers/31_create_user_error_invalid_GID/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/31_create_user_error_invalid_GID/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/newusers/31_create_user_error_invalid_GID/data/shadow
===================================================================
--- debian/trunk/tests/newusers/31_create_user_error_invalid_GID/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/31_create_user_error_invalid_GID/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/newusers/31_create_user_error_invalid_GID/newusers.test
===================================================================
--- debian/trunk/tests/newusers/31_create_user_error_invalid_GID/newusers.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/31_create_user_error_invalid_GID/newusers.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/newusers/32_create_user_error_gshadow_group_exists/data/group
===================================================================
--- debian/trunk/tests/newusers/32_create_user_error_gshadow_group_exists/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/32_create_user_error_gshadow_group_exists/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/newusers/32_create_user_error_gshadow_group_exists/data/gshadow
===================================================================
--- debian/trunk/tests/newusers/32_create_user_error_gshadow_group_exists/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/32_create_user_error_gshadow_group_exists/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/newusers/32_create_user_error_gshadow_group_exists/data/passwd
===================================================================
--- debian/trunk/tests/newusers/32_create_user_error_gshadow_group_exists/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/32_create_user_error_gshadow_group_exists/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/newusers/32_create_user_error_gshadow_group_exists/data/shadow
===================================================================
--- debian/trunk/tests/newusers/32_create_user_error_gshadow_group_exists/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/32_create_user_error_gshadow_group_exists/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/newusers/32_create_user_error_gshadow_group_exists/newusers.test
===================================================================
--- debian/trunk/tests/newusers/32_create_user_error_gshadow_group_exists/newusers.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/32_create_user_error_gshadow_group_exists/newusers.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/newusers/33_update_password_no_shadow_password/data/group
===================================================================
--- debian/trunk/tests/newusers/33_update_password_no_shadow_password/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/33_update_password_no_shadow_password/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/newusers/33_update_password_no_shadow_password/data/gshadow
===================================================================
--- debian/trunk/tests/newusers/33_update_password_no_shadow_password/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/33_update_password_no_shadow_password/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/newusers/33_update_password_no_shadow_password/data/shadow
===================================================================
--- debian/trunk/tests/newusers/33_update_password_no_shadow_password/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/33_update_password_no_shadow_password/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/newusers/33_update_password_no_shadow_password/newusers.test
===================================================================
--- debian/trunk/tests/newusers/33_update_password_no_shadow_password/newusers.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/33_update_password_no_shadow_password/newusers.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -22,13 +22,13 @@
 ../../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"

Deleted: debian/trunk/tests/newusers/34_update_password_no_shadow/data/group
===================================================================
--- debian/trunk/tests/newusers/34_update_password_no_shadow/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/34_update_password_no_shadow/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/newusers/34_update_password_no_shadow/data/gshadow
===================================================================
--- debian/trunk/tests/newusers/34_update_password_no_shadow/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/34_update_password_no_shadow/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/newusers/34_update_password_no_shadow/data/shadow
===================================================================
--- debian/trunk/tests/newusers/34_update_password_no_shadow/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/34_update_password_no_shadow/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/newusers/34_update_password_no_shadow/newusers.test
===================================================================
--- debian/trunk/tests/newusers/34_update_password_no_shadow/newusers.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/34_update_password_no_shadow/newusers.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -23,7 +23,7 @@
 ../../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

Deleted: debian/trunk/tests/newusers/38_update_password_no_shadow_encrypted/data/group
===================================================================
--- debian/trunk/tests/newusers/38_update_password_no_shadow_encrypted/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/38_update_password_no_shadow_encrypted/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/newusers/38_update_password_no_shadow_encrypted/data/gshadow
===================================================================
--- debian/trunk/tests/newusers/38_update_password_no_shadow_encrypted/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/38_update_password_no_shadow_encrypted/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/newusers/38_update_password_no_shadow_encrypted/data/shadow
===================================================================
--- debian/trunk/tests/newusers/38_update_password_no_shadow_encrypted/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/38_update_password_no_shadow_encrypted/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Deleted: debian/trunk/tests/newusers/39_update_password_no_shadow_password_encrypted/data/group
===================================================================
--- debian/trunk/tests/newusers/39_update_password_no_shadow_password_encrypted/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/39_update_password_no_shadow_password_encrypted/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/newusers/39_update_password_no_shadow_password_encrypted/data/gshadow
===================================================================
--- debian/trunk/tests/newusers/39_update_password_no_shadow_password_encrypted/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/39_update_password_no_shadow_password_encrypted/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/newusers/39_update_password_no_shadow_password_encrypted/data/shadow
===================================================================
--- debian/trunk/tests/newusers/39_update_password_no_shadow_password_encrypted/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/39_update_password_no_shadow_password_encrypted/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Deleted: debian/trunk/tests/newusers/40_update_password_encrypted/data/group
===================================================================
--- debian/trunk/tests/newusers/40_update_password_encrypted/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/40_update_password_encrypted/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/newusers/40_update_password_encrypted/data/gshadow
===================================================================
--- debian/trunk/tests/newusers/40_update_password_encrypted/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/40_update_password_encrypted/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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::

Deleted: debian/trunk/tests/newusers/40_update_password_encrypted/data/passwd
===================================================================
--- debian/trunk/tests/newusers/40_update_password_encrypted/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/newusers/40_update_password_encrypted/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/group
===================================================================
--- debian/trunk/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/gshadow
===================================================================
--- debian/trunk/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:!::

Deleted: debian/trunk/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/passwd
===================================================================
--- debian/trunk/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/shadow
===================================================================
--- debian/trunk/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/useradd.test
===================================================================
--- debian/trunk/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/useradd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/split_groups/05_useradd_split_group_already_split_passwd_differ/useradd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/group
===================================================================
--- debian/trunk/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/gshadow
===================================================================
--- debian/trunk/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:!::

Deleted: debian/trunk/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/passwd
===================================================================
--- debian/trunk/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/shadow
===================================================================
--- debian/trunk/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/split_groups/06_useradd_split_group_already_split_GID_differ/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/split_groups/06_useradd_split_group_already_split_GID_differ/useradd.test
===================================================================
--- debian/trunk/tests/split_groups/06_useradd_split_group_already_split_GID_differ/useradd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/split_groups/06_useradd_split_group_already_split_GID_differ/useradd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/split_groups/08_useradd_no_split_group_already_split/data/group
===================================================================
--- debian/trunk/tests/split_groups/08_useradd_no_split_group_already_split/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/split_groups/08_useradd_no_split_group_already_split/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/split_groups/08_useradd_no_split_group_already_split/data/gshadow
===================================================================
--- debian/trunk/tests/split_groups/08_useradd_no_split_group_already_split/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/split_groups/08_useradd_no_split_group_already_split/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:!::

Deleted: debian/trunk/tests/split_groups/08_useradd_no_split_group_already_split/data/passwd
===================================================================
--- debian/trunk/tests/split_groups/08_useradd_no_split_group_already_split/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/split_groups/08_useradd_no_split_group_already_split/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/split_groups/08_useradd_no_split_group_already_split/data/shadow
===================================================================
--- debian/trunk/tests/split_groups/08_useradd_no_split_group_already_split/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/split_groups/08_useradd_no_split_group_already_split/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/split_groups/08_useradd_no_split_group_already_split/useradd.test
===================================================================
--- debian/trunk/tests/split_groups/08_useradd_no_split_group_already_split/useradd.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/split_groups/08_useradd_no_split_group_already_split/useradd.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/split_groups/09_groupdel_split_group_already_split/data/passwd
===================================================================
--- debian/trunk/tests/split_groups/09_groupdel_split_group_already_split/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/split_groups/09_groupdel_split_group_already_split/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/split_groups/09_groupdel_split_group_already_split/data/shadow
===================================================================
--- debian/trunk/tests/split_groups/09_groupdel_split_group_already_split/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/split_groups/09_groupdel_split_group_already_split/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/split_groups/09_groupdel_split_group_already_split/groupdel.test
===================================================================
--- debian/trunk/tests/split_groups/09_groupdel_split_group_already_split/groupdel.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/split_groups/09_groupdel_split_group_already_split/groupdel.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/split_groups/10_groupdel_no_split_group_already_split/data/group
===================================================================
--- debian/trunk/tests/split_groups/10_groupdel_no_split_group_already_split/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/split_groups/10_groupdel_no_split_group_already_split/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/split_groups/10_groupdel_no_split_group_already_split/data/gshadow
===================================================================
--- debian/trunk/tests/split_groups/10_groupdel_no_split_group_already_split/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/split_groups/10_groupdel_no_split_group_already_split/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:!::

Deleted: debian/trunk/tests/split_groups/10_groupdel_no_split_group_already_split/data/passwd
===================================================================
--- debian/trunk/tests/split_groups/10_groupdel_no_split_group_already_split/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/split_groups/10_groupdel_no_split_group_already_split/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/split_groups/10_groupdel_no_split_group_already_split/data/shadow
===================================================================
--- debian/trunk/tests/split_groups/10_groupdel_no_split_group_already_split/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/split_groups/10_groupdel_no_split_group_already_split/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Deleted: debian/trunk/tests/split_groups/10_groupdel_no_split_group_already_split/data/useradd.err
===================================================================
--- debian/trunk/tests/split_groups/10_groupdel_no_split_group_already_split/data/useradd.err	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/split_groups/10_groupdel_no_split_group_already_split/data/useradd.err	2011-07-17 12:00:16 UTC (rev 3428)
@@ -1,2 +0,0 @@
-Multiple entries named 'foo' in /etc/group. Please fix this with pwck or grpck.
-useradd: error adding new group entry

Modified: debian/trunk/tests/split_groups/10_groupdel_no_split_group_already_split/groupdel.test
===================================================================
--- debian/trunk/tests/split_groups/10_groupdel_no_split_group_already_split/groupdel.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/split_groups/10_groupdel_no_split_group_already_split/groupdel.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/usertools/11_usermod_move_homedir/data/group
===================================================================
--- debian/trunk/tests/usertools/11_usermod_move_homedir/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/11_usermod_move_homedir/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/usertools/11_usermod_move_homedir/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/11_usermod_move_homedir/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/11_usermod_move_homedir/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/usertools/11_usermod_move_homedir/data/shadow
===================================================================
--- debian/trunk/tests/usertools/11_usermod_move_homedir/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/11_usermod_move_homedir/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/usertools/11_usermod_move_homedir/usermod.test
===================================================================
--- debian/trunk/tests/usertools/11_usermod_move_homedir/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/11_usermod_move_homedir/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -28,13 +28,13 @@
 ../../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

Deleted: debian/trunk/tests/usertools/12_usermod_move_homedir_dev_null/data/group
===================================================================
--- debian/trunk/tests/usertools/12_usermod_move_homedir_dev_null/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/12_usermod_move_homedir_dev_null/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/usertools/12_usermod_move_homedir_dev_null/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/12_usermod_move_homedir_dev_null/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/12_usermod_move_homedir_dev_null/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/usertools/12_usermod_move_homedir_dev_null/data/shadow
===================================================================
--- debian/trunk/tests/usertools/12_usermod_move_homedir_dev_null/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/12_usermod_move_homedir_dev_null/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/usertools/12_usermod_move_homedir_dev_null/usermod.test
===================================================================
--- debian/trunk/tests/usertools/12_usermod_move_homedir_dev_null/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/12_usermod_move_homedir_dev_null/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -42,13 +42,13 @@
 ../../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

Deleted: debian/trunk/tests/usertools/13_usermod_move_homedir_file/data/group
===================================================================
--- debian/trunk/tests/usertools/13_usermod_move_homedir_file/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/13_usermod_move_homedir_file/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/usertools/13_usermod_move_homedir_file/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/13_usermod_move_homedir_file/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/13_usermod_move_homedir_file/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/usertools/13_usermod_move_homedir_file/data/shadow
===================================================================
--- debian/trunk/tests/usertools/13_usermod_move_homedir_file/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/13_usermod_move_homedir_file/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/usertools/13_usermod_move_homedir_file/usermod.test
===================================================================
--- debian/trunk/tests/usertools/13_usermod_move_homedir_file/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/13_usermod_move_homedir_file/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -44,13 +44,13 @@
 ../../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

Deleted: debian/trunk/tests/usertools/14_usermod_move_homedir_other_device/data/group
===================================================================
--- debian/trunk/tests/usertools/14_usermod_move_homedir_other_device/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/14_usermod_move_homedir_other_device/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/usertools/14_usermod_move_homedir_other_device/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/14_usermod_move_homedir_other_device/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/14_usermod_move_homedir_other_device/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/usertools/14_usermod_move_homedir_other_device/data/shadow
===================================================================
--- debian/trunk/tests/usertools/14_usermod_move_homedir_other_device/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/14_usermod_move_homedir_other_device/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/usertools/14_usermod_move_homedir_other_device/usermod.test
===================================================================
--- debian/trunk/tests/usertools/14_usermod_move_homedir_other_device/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/14_usermod_move_homedir_other_device/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -35,13 +35,13 @@
 ../../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

Deleted: debian/trunk/tests/usertools/15_usermod_change_supplementary_groups/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/15_usermod_change_supplementary_groups/data/home_ls-a	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/15_usermod_change_supplementary_groups/data/home_ls-a	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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/..'

Deleted: debian/trunk/tests/usertools/15_usermod_change_supplementary_groups/data/passwd
===================================================================
--- debian/trunk/tests/usertools/15_usermod_change_supplementary_groups/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/15_usermod_change_supplementary_groups/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/usertools/15_usermod_change_supplementary_groups/data/shadow
===================================================================
--- debian/trunk/tests/usertools/15_usermod_change_supplementary_groups/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/15_usermod_change_supplementary_groups/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/usertools/15_usermod_change_supplementary_groups/usermod.test
===================================================================
--- debian/trunk/tests/usertools/15_usermod_change_supplementary_groups/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/15_usermod_change_supplementary_groups/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/usertools/16_usermod_remove_supplementary_groups/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/16_usermod_remove_supplementary_groups/data/home_ls-a	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/16_usermod_remove_supplementary_groups/data/home_ls-a	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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/..'

Deleted: debian/trunk/tests/usertools/16_usermod_remove_supplementary_groups/data/passwd
===================================================================
--- debian/trunk/tests/usertools/16_usermod_remove_supplementary_groups/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/16_usermod_remove_supplementary_groups/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/usertools/16_usermod_remove_supplementary_groups/data/shadow
===================================================================
--- debian/trunk/tests/usertools/16_usermod_remove_supplementary_groups/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/16_usermod_remove_supplementary_groups/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/usertools/16_usermod_remove_supplementary_groups/usermod.test
===================================================================
--- debian/trunk/tests/usertools/16_usermod_remove_supplementary_groups/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/16_usermod_remove_supplementary_groups/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/usertools/17_usermod_change_supplementary_groups_numerical/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/17_usermod_change_supplementary_groups_numerical/data/home_ls-a	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/17_usermod_change_supplementary_groups_numerical/data/home_ls-a	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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/..'

Deleted: debian/trunk/tests/usertools/17_usermod_change_supplementary_groups_numerical/data/passwd
===================================================================
--- debian/trunk/tests/usertools/17_usermod_change_supplementary_groups_numerical/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/17_usermod_change_supplementary_groups_numerical/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/usertools/17_usermod_change_supplementary_groups_numerical/data/shadow
===================================================================
--- debian/trunk/tests/usertools/17_usermod_change_supplementary_groups_numerical/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/17_usermod_change_supplementary_groups_numerical/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/usertools/17_usermod_change_supplementary_groups_numerical/usermod.test
===================================================================
--- debian/trunk/tests/usertools/17_usermod_change_supplementary_groups_numerical/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/17_usermod_change_supplementary_groups_numerical/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/group
===================================================================
--- debian/trunk/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/home_ls-a	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/home_ls-a	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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/..'

Deleted: debian/trunk/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/passwd
===================================================================
--- debian/trunk/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/shadow
===================================================================
--- debian/trunk/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/usermod.test
===================================================================
--- debian/trunk/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/18_usermod_change_supplementary_groups-unknown_group/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/group
===================================================================
--- debian/trunk/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/home_ls-a	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/home_ls-a	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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/..'

Deleted: debian/trunk/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/passwd
===================================================================
--- debian/trunk/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/shadow
===================================================================
--- debian/trunk/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/usermod.test
===================================================================
--- debian/trunk/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/19_usermod_change_supplementary_groups-unknown_numerical_group/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/usertools/20_usermod_rename_user_in_member_lists/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/20_usermod_rename_user_in_member_lists/data/home_ls-a	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/20_usermod_rename_user_in_member_lists/data/home_ls-a	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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/..'

Deleted: debian/trunk/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/data/home_ls-a	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/21_usermod_rename_user_in_member_lists-and-add_supplementary_groups/data/home_ls-a	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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/..'

Deleted: debian/trunk/tests/usertools/22_usermod-a_existing_supplementary_group/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/22_usermod-a_existing_supplementary_group/data/home_ls-a	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/22_usermod-a_existing_supplementary_group/data/home_ls-a	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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/..'

Deleted: debian/trunk/tests/usertools/22_usermod-a_existing_supplementary_group/data/passwd
===================================================================
--- debian/trunk/tests/usertools/22_usermod-a_existing_supplementary_group/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/22_usermod-a_existing_supplementary_group/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/usertools/22_usermod-a_existing_supplementary_group/data/shadow
===================================================================
--- debian/trunk/tests/usertools/22_usermod-a_existing_supplementary_group/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/22_usermod-a_existing_supplementary_group/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/usertools/22_usermod-a_existing_supplementary_group/usermod.test
===================================================================
--- debian/trunk/tests/usertools/22_usermod-a_existing_supplementary_group/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/22_usermod-a_existing_supplementary_group/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -21,13 +21,13 @@
 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

Deleted: debian/trunk/tests/usertools/23_usermod-a_existing_supplementary_group+rename/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/23_usermod-a_existing_supplementary_group+rename/data/home_ls-a	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/23_usermod-a_existing_supplementary_group+rename/data/home_ls-a	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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/..'

Deleted: debian/trunk/tests/usertools/32_usermod-u_new_UID/data/group
===================================================================
--- debian/trunk/tests/usertools/32_usermod-u_new_UID/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/32_usermod-u_new_UID/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/usertools/32_usermod-u_new_UID/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/32_usermod-u_new_UID/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/32_usermod-u_new_UID/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/usertools/32_usermod-u_new_UID/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/32_usermod-u_new_UID/data/home_ls-a	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/32_usermod-u_new_UID/data/home_ls-a	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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/..'

Deleted: debian/trunk/tests/usertools/32_usermod-u_new_UID/data/shadow
===================================================================
--- debian/trunk/tests/usertools/32_usermod-u_new_UID/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/32_usermod-u_new_UID/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/usertools/32_usermod-u_new_UID/usermod.test
===================================================================
--- debian/trunk/tests/usertools/32_usermod-u_new_UID/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/32_usermod-u_new_UID/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 ../../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"

Deleted: debian/trunk/tests/usertools/33_usermod-u_existing_UID/data/group
===================================================================
--- debian/trunk/tests/usertools/33_usermod-u_existing_UID/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/33_usermod-u_existing_UID/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/usertools/33_usermod-u_existing_UID/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/33_usermod-u_existing_UID/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/33_usermod-u_existing_UID/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/usertools/33_usermod-u_existing_UID/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/33_usermod-u_existing_UID/data/home_ls-a	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/33_usermod-u_existing_UID/data/home_ls-a	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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/..'

Deleted: debian/trunk/tests/usertools/33_usermod-u_existing_UID/data/passwd
===================================================================
--- debian/trunk/tests/usertools/33_usermod-u_existing_UID/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/33_usermod-u_existing_UID/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/usertools/33_usermod-u_existing_UID/data/shadow
===================================================================
--- debian/trunk/tests/usertools/33_usermod-u_existing_UID/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/33_usermod-u_existing_UID/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/usertools/33_usermod-u_existing_UID/usermod.test
===================================================================
--- debian/trunk/tests/usertools/33_usermod-u_existing_UID/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/33_usermod-u_existing_UID/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/usertools/34_usermod-u-o_existing_UID/data/group
===================================================================
--- debian/trunk/tests/usertools/34_usermod-u-o_existing_UID/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/34_usermod-u-o_existing_UID/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/usertools/34_usermod-u-o_existing_UID/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/34_usermod-u-o_existing_UID/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/34_usermod-u-o_existing_UID/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/usertools/34_usermod-u-o_existing_UID/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/34_usermod-u-o_existing_UID/data/home_ls-a	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/34_usermod-u-o_existing_UID/data/home_ls-a	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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/..'

Deleted: debian/trunk/tests/usertools/34_usermod-u-o_existing_UID/data/shadow
===================================================================
--- debian/trunk/tests/usertools/34_usermod-u-o_existing_UID/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/34_usermod-u-o_existing_UID/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/usertools/34_usermod-u-o_existing_UID/usermod.test
===================================================================
--- debian/trunk/tests/usertools/34_usermod-u-o_existing_UID/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/34_usermod-u-o_existing_UID/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -24,13 +24,13 @@
 ../../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"

Deleted: debian/trunk/tests/usertools/35_usermod-u_invalid_UID/data/group
===================================================================
--- debian/trunk/tests/usertools/35_usermod-u_invalid_UID/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/35_usermod-u_invalid_UID/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/usertools/35_usermod-u_invalid_UID/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/35_usermod-u_invalid_UID/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/35_usermod-u_invalid_UID/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/usertools/35_usermod-u_invalid_UID/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/35_usermod-u_invalid_UID/data/home_ls-a	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/35_usermod-u_invalid_UID/data/home_ls-a	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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/..'

Deleted: debian/trunk/tests/usertools/35_usermod-u_invalid_UID/data/passwd
===================================================================
--- debian/trunk/tests/usertools/35_usermod-u_invalid_UID/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/35_usermod-u_invalid_UID/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/usertools/35_usermod-u_invalid_UID/data/shadow
===================================================================
--- debian/trunk/tests/usertools/35_usermod-u_invalid_UID/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/35_usermod-u_invalid_UID/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/usertools/35_usermod-u_invalid_UID/usermod.test
===================================================================
--- debian/trunk/tests/usertools/35_usermod-u_invalid_UID/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/35_usermod-u_invalid_UID/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/group
===================================================================
--- debian/trunk/tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/shadow
===================================================================
--- debian/trunk/tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/36_usermod_change_uid+move_homedir_other_device/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/usertools/36_usermod_change_uid+move_homedir_other_device/usermod.test
===================================================================
--- debian/trunk/tests/usertools/36_usermod_change_uid+move_homedir_other_device/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/36_usermod_change_uid+move_homedir_other_device/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,13 +36,13 @@
 ../../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

Deleted: debian/trunk/tests/usertools/37_Debian_Bug_470745/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/37_Debian_Bug_470745/data/home_ls-a	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/37_Debian_Bug_470745/data/home_ls-a	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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/..'

Deleted: debian/trunk/tests/usertools/38_usermod_invalid_user/data/group
===================================================================
--- debian/trunk/tests/usertools/38_usermod_invalid_user/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/38_usermod_invalid_user/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/usertools/38_usermod_invalid_user/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/38_usermod_invalid_user/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/38_usermod_invalid_user/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/usertools/38_usermod_invalid_user/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/38_usermod_invalid_user/data/home_ls-a	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/38_usermod_invalid_user/data/home_ls-a	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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/..'

Deleted: debian/trunk/tests/usertools/38_usermod_invalid_user/data/passwd
===================================================================
--- debian/trunk/tests/usertools/38_usermod_invalid_user/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/38_usermod_invalid_user/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/usertools/38_usermod_invalid_user/data/shadow
===================================================================
--- debian/trunk/tests/usertools/38_usermod_invalid_user/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/38_usermod_invalid_user/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/usertools/38_usermod_invalid_user/usermod.test
===================================================================
--- debian/trunk/tests/usertools/38_usermod_invalid_user/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/38_usermod_invalid_user/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/usertools/39_usermod_-c_invalid_comment/data/group
===================================================================
--- debian/trunk/tests/usertools/39_usermod_-c_invalid_comment/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/39_usermod_-c_invalid_comment/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/usertools/39_usermod_-c_invalid_comment/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/39_usermod_-c_invalid_comment/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/39_usermod_-c_invalid_comment/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/usertools/39_usermod_-c_invalid_comment/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/39_usermod_-c_invalid_comment/data/home_ls-a	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/39_usermod_-c_invalid_comment/data/home_ls-a	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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/..'

Deleted: debian/trunk/tests/usertools/39_usermod_-c_invalid_comment/data/passwd
===================================================================
--- debian/trunk/tests/usertools/39_usermod_-c_invalid_comment/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/39_usermod_-c_invalid_comment/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/usertools/39_usermod_-c_invalid_comment/data/shadow
===================================================================
--- debian/trunk/tests/usertools/39_usermod_-c_invalid_comment/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/39_usermod_-c_invalid_comment/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/usertools/39_usermod_-c_invalid_comment/usermod.test
===================================================================
--- debian/trunk/tests/usertools/39_usermod_-c_invalid_comment/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/39_usermod_-c_invalid_comment/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/usertools/40_usermod_-d_invalid_homedir/data/group
===================================================================
--- debian/trunk/tests/usertools/40_usermod_-d_invalid_homedir/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/40_usermod_-d_invalid_homedir/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/usertools/40_usermod_-d_invalid_homedir/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/40_usermod_-d_invalid_homedir/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/40_usermod_-d_invalid_homedir/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/usertools/40_usermod_-d_invalid_homedir/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/40_usermod_-d_invalid_homedir/data/home_ls-a	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/40_usermod_-d_invalid_homedir/data/home_ls-a	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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/..'

Deleted: debian/trunk/tests/usertools/40_usermod_-d_invalid_homedir/data/passwd
===================================================================
--- debian/trunk/tests/usertools/40_usermod_-d_invalid_homedir/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/40_usermod_-d_invalid_homedir/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/usertools/40_usermod_-d_invalid_homedir/data/shadow
===================================================================
--- debian/trunk/tests/usertools/40_usermod_-d_invalid_homedir/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/40_usermod_-d_invalid_homedir/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/usertools/40_usermod_-d_invalid_homedir/usermod.test
===================================================================
--- debian/trunk/tests/usertools/40_usermod_-d_invalid_homedir/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/40_usermod_-d_invalid_homedir/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -38,16 +38,16 @@
 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"

Deleted: debian/trunk/tests/usertools/41_usermod_-d_invalid_shell/data/group
===================================================================
--- debian/trunk/tests/usertools/41_usermod_-d_invalid_shell/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/41_usermod_-d_invalid_shell/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/usertools/41_usermod_-d_invalid_shell/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/41_usermod_-d_invalid_shell/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/41_usermod_-d_invalid_shell/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/usertools/41_usermod_-d_invalid_shell/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/41_usermod_-d_invalid_shell/data/home_ls-a	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/41_usermod_-d_invalid_shell/data/home_ls-a	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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/..'

Deleted: debian/trunk/tests/usertools/41_usermod_-d_invalid_shell/data/passwd
===================================================================
--- debian/trunk/tests/usertools/41_usermod_-d_invalid_shell/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/41_usermod_-d_invalid_shell/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/usertools/41_usermod_-d_invalid_shell/data/shadow
===================================================================
--- debian/trunk/tests/usertools/41_usermod_-d_invalid_shell/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/41_usermod_-d_invalid_shell/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/usertools/41_usermod_-d_invalid_shell/usermod.test
===================================================================
--- debian/trunk/tests/usertools/41_usermod_-d_invalid_shell/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/41_usermod_-d_invalid_shell/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/usertools/42_usermod_-g_invalid_group_name/data/group
===================================================================
--- debian/trunk/tests/usertools/42_usermod_-g_invalid_group_name/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/42_usermod_-g_invalid_group_name/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/usertools/42_usermod_-g_invalid_group_name/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/42_usermod_-g_invalid_group_name/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/42_usermod_-g_invalid_group_name/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/usertools/42_usermod_-g_invalid_group_name/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/42_usermod_-g_invalid_group_name/data/home_ls-a	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/42_usermod_-g_invalid_group_name/data/home_ls-a	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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/..'

Deleted: debian/trunk/tests/usertools/42_usermod_-g_invalid_group_name/data/passwd
===================================================================
--- debian/trunk/tests/usertools/42_usermod_-g_invalid_group_name/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/42_usermod_-g_invalid_group_name/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/usertools/42_usermod_-g_invalid_group_name/data/shadow
===================================================================
--- debian/trunk/tests/usertools/42_usermod_-g_invalid_group_name/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/42_usermod_-g_invalid_group_name/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/usertools/42_usermod_-g_invalid_group_name/usermod.test
===================================================================
--- debian/trunk/tests/usertools/42_usermod_-g_invalid_group_name/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/42_usermod_-g_invalid_group_name/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/usertools/43_usermod_-g_invalid_group_ID/data/group
===================================================================
--- debian/trunk/tests/usertools/43_usermod_-g_invalid_group_ID/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/43_usermod_-g_invalid_group_ID/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/usertools/43_usermod_-g_invalid_group_ID/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/43_usermod_-g_invalid_group_ID/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/43_usermod_-g_invalid_group_ID/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/usertools/43_usermod_-g_invalid_group_ID/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/43_usermod_-g_invalid_group_ID/data/home_ls-a	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/43_usermod_-g_invalid_group_ID/data/home_ls-a	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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/..'

Deleted: debian/trunk/tests/usertools/43_usermod_-g_invalid_group_ID/data/passwd
===================================================================
--- debian/trunk/tests/usertools/43_usermod_-g_invalid_group_ID/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/43_usermod_-g_invalid_group_ID/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/usertools/43_usermod_-g_invalid_group_ID/data/shadow
===================================================================
--- debian/trunk/tests/usertools/43_usermod_-g_invalid_group_ID/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/43_usermod_-g_invalid_group_ID/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/usertools/43_usermod_-g_invalid_group_ID/usermod.test
===================================================================
--- debian/trunk/tests/usertools/43_usermod_-g_invalid_group_ID/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/43_usermod_-g_invalid_group_ID/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/usertools/44_usermod-l_existing_username/data/group
===================================================================
--- debian/trunk/tests/usertools/44_usermod-l_existing_username/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/44_usermod-l_existing_username/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/usertools/44_usermod-l_existing_username/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/44_usermod-l_existing_username/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/44_usermod-l_existing_username/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/usertools/44_usermod-l_existing_username/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/44_usermod-l_existing_username/data/home_ls-a	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/44_usermod-l_existing_username/data/home_ls-a	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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/..'

Deleted: debian/trunk/tests/usertools/44_usermod-l_existing_username/data/passwd
===================================================================
--- debian/trunk/tests/usertools/44_usermod-l_existing_username/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/44_usermod-l_existing_username/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/usertools/44_usermod-l_existing_username/data/shadow
===================================================================
--- debian/trunk/tests/usertools/44_usermod-l_existing_username/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/44_usermod-l_existing_username/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/usertools/44_usermod-l_existing_username/usermod.test
===================================================================
--- debian/trunk/tests/usertools/44_usermod-l_existing_username/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/44_usermod-l_existing_username/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/usertools/45_usermod-l_existing_username_passwd/data/group
===================================================================
--- debian/trunk/tests/usertools/45_usermod-l_existing_username_passwd/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/45_usermod-l_existing_username_passwd/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/usertools/45_usermod-l_existing_username_passwd/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/45_usermod-l_existing_username_passwd/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/45_usermod-l_existing_username_passwd/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/usertools/45_usermod-l_existing_username_passwd/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/45_usermod-l_existing_username_passwd/data/home_ls-a	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/45_usermod-l_existing_username_passwd/data/home_ls-a	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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/..'

Deleted: debian/trunk/tests/usertools/45_usermod-l_existing_username_passwd/data/passwd
===================================================================
--- debian/trunk/tests/usertools/45_usermod-l_existing_username_passwd/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/45_usermod-l_existing_username_passwd/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/usertools/45_usermod-l_existing_username_passwd/data/shadow
===================================================================
--- debian/trunk/tests/usertools/45_usermod-l_existing_username_passwd/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/45_usermod-l_existing_username_passwd/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/usertools/45_usermod-l_existing_username_passwd/usermod.test
===================================================================
--- debian/trunk/tests/usertools/45_usermod-l_existing_username_passwd/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/45_usermod-l_existing_username_passwd/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/usertools/46_usermod-l_existing_username_shadow/data/group
===================================================================
--- debian/trunk/tests/usertools/46_usermod-l_existing_username_shadow/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/46_usermod-l_existing_username_shadow/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/usertools/46_usermod-l_existing_username_shadow/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/46_usermod-l_existing_username_shadow/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/46_usermod-l_existing_username_shadow/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/usertools/46_usermod-l_existing_username_shadow/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/46_usermod-l_existing_username_shadow/data/home_ls-a	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/46_usermod-l_existing_username_shadow/data/home_ls-a	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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/..'

Deleted: debian/trunk/tests/usertools/46_usermod-l_existing_username_shadow/data/passwd
===================================================================
--- debian/trunk/tests/usertools/46_usermod-l_existing_username_shadow/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/46_usermod-l_existing_username_shadow/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/usertools/46_usermod-l_existing_username_shadow/data/shadow
===================================================================
--- debian/trunk/tests/usertools/46_usermod-l_existing_username_shadow/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/46_usermod-l_existing_username_shadow/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/usertools/46_usermod-l_existing_username_shadow/usermod.test
===================================================================
--- debian/trunk/tests/usertools/46_usermod-l_existing_username_shadow/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/46_usermod-l_existing_username_shadow/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -36,16 +36,16 @@
 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"

Deleted: debian/trunk/tests/usertools/47_usermod-l_no_shadow_file/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/47_usermod-l_no_shadow_file/data/home_ls-a	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/47_usermod-l_no_shadow_file/data/home_ls-a	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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/..'

Deleted: debian/trunk/tests/usertools/48_userdel_keep_group_if_primary_other_user/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/48_userdel_keep_group_if_primary_other_user/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/48_userdel_keep_group_if_primary_other_user/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Modified: debian/trunk/tests/usertools/48_userdel_keep_group_if_primary_other_user/userdel.test
===================================================================
--- debian/trunk/tests/usertools/48_userdel_keep_group_if_primary_other_user/userdel.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/48_userdel_keep_group_if_primary_other_user/userdel.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -39,7 +39,7 @@
 ../../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"

Deleted: debian/trunk/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Modified: debian/trunk/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/userdel.test
===================================================================
--- debian/trunk/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/userdel.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/50_userdel_delete_users_group_no_gshadow_group/userdel.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -30,7 +30,7 @@
 ../../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"

Deleted: debian/trunk/tests/usertools/52_userdel_delete_user_no_shadow_entry/data/shadow
===================================================================
--- debian/trunk/tests/usertools/52_userdel_delete_user_no_shadow_entry/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/52_userdel_delete_user_no_shadow_entry/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Modified: debian/trunk/tests/usertools/52_userdel_delete_user_no_shadow_entry/userdel.test
===================================================================
--- debian/trunk/tests/usertools/52_userdel_delete_user_no_shadow_entry/userdel.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/52_userdel_delete_user_no_shadow_entry/userdel.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -27,7 +27,7 @@
 ../../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

Deleted: debian/trunk/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/data/chpasswd.err
===================================================================
--- debian/trunk/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/data/chpasswd.err	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/chpasswd-PAM/03_chpasswd_no_shadow_file/data/chpasswd.err	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/data/passwd
===================================================================
--- debian/trunk/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/chpasswd-PAM/26_chpasswd_no_shadow_file_invalid_passwd/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/data/passwd
===================================================================
--- debian/trunk/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/usermod/03_usermod-p_no_shadow_entry_but_shadow_enabled/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/usertools/usermod/06_usermod_lock_already_locked_password3/data/passwd
===================================================================
--- debian/trunk/tests/usertools/usermod/06_usermod_lock_already_locked_password3/data/passwd	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/usermod/06_usermod_lock_already_locked_password3/data/passwd	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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

Deleted: debian/trunk/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Modified: debian/trunk/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/usermod.test
===================================================================
--- debian/trunk/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/usermod/40_usermod-u_reset_new_lastlog_entry/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -52,7 +52,7 @@
 ../../../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

Deleted: debian/trunk/tests/usertools/usermod/41_usermod-u_faillog_not_created/data/group
===================================================================
--- debian/trunk/tests/usertools/usermod/41_usermod-u_faillog_not_created/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/usermod/41_usermod-u_faillog_not_created/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/usertools/usermod/41_usermod-u_faillog_not_created/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/usermod/41_usermod-u_faillog_not_created/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/usermod/41_usermod-u_faillog_not_created/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/usertools/usermod/41_usermod-u_faillog_not_created/data/shadow
===================================================================
--- debian/trunk/tests/usertools/usermod/41_usermod-u_faillog_not_created/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/usermod/41_usermod-u_faillog_not_created/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Deleted: debian/trunk/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/data/group
===================================================================
--- debian/trunk/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/data/group	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/data/group	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:

Deleted: debian/trunk/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Deleted: debian/trunk/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/data/shadow
===================================================================
--- debian/trunk/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/data/shadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/usermod/42_usermod-u_copy_faillog_entry/data/shadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:::

Deleted: debian/trunk/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/data/gshadow	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/data/gshadow	2011-07-17 12:00:16 UTC (rev 3428)
@@ -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:*::

Modified: debian/trunk/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/usermod.test
===================================================================
--- debian/trunk/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/usermod.test	2011-07-16 18:13:27 UTC (rev 3427)
+++ debian/trunk/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry/usermod.test	2011-07-17 12:00:16 UTC (rev 3428)
@@ -53,7 +53,7 @@
 ../../../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

• Previous message: [Pkg-shadow-commits] r3427 - debian/trunk/tests/usertools/usermod/43_usermod-u_reset_new_faillog_entry
• Next message: [Pkg-shadow-commits] r3429 - debian/trunk/debian
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]