>From de705e93da802262053a2ae4b96913aac4ecd9b1 Mon Sep 17 00:00:00 2001 From: Shawn Wells Date: Sun, 12 May 2013 23:09:39 -0400 Subject: [PATCH 00/21] Fixed "Duplicate ID, which will not be added" errors" Went through OVAL checks, updated so all objects and variables have unique names. Shawn Wells (21): Updated rpm_verify_hashes for OVAL 5.10 compliance The old rpmverify_* is now depricated, updated check to rpmverifyfile_ Updated state_uid_0 names within OVAL Multiple OVAL checks were using "state_uid_0" causing build errors. Updated so everyone uses their own, thus removing the following build error/notice: Duplicate ID, which will not be added: state_uid_0 Updated state_gid_0 to reflect per check naming Updated template_permissions to place FILEID into strings Updated mount_option_* OVAL variable var_removable_partition These OVAL files were using duplicate 'var_remove_partition', updated checks to have unique IDs Removed duplicate object_lib_dir references Created unique names in the OVAL templates Removed duplicate object_lib_files Updated OVAL checks for unique names Removed duplicate object_lib64_dir Updated OVAL checks to have unique names Removed duplicates of object_lib64_files Updated OVAL to have unique names Removed duplicate object_usr_lib_dir Updated OVAL to have unique names Removed duplicate object_usr_lib_files references Assigned unique identifiers to OVAL checks Removed duplicate object_usr_lib64_dir references Assigned unique identifiers in OVAL Removed duplicate object_usr_lib64_files references Assigned unique identifiers within OVAL Removed duplicate references to object_lib_modules_files Assigned unique identifiers Removed duplicate references to var_accounts_user_umask Assigned unique identifiers Modified template_OVAL_package_installed and template_package_removed These files were causing build errors regarding obj_package_$package, updated template to create unique names Removed duplicate state_uid_root Updated OVAL to have unique names Removed duplicate var_ssh_config_directory references Updated OVAL to have unique names Removed duplicate references object_etc_skel_files Updated OVAL to have unique names Removed duplicate references to var_samba_private_directory Updated OVAL to have unique IDs Updated service_tftpd_disabled As reflected from update to template file RHEL6/input/checks/accounts_umask_bashrc.xml | 4 +- RHEL6/input/checks/accounts_umask_cshrc.xml | 4 +- RHEL6/input/checks/accounts_umask_etc_profile.xml | 4 +- RHEL6/input/checks/accounts_umask_login_defs.xml | 4 +- RHEL6/input/checks/file_owner_etc_shadow.xml | 4 +- RHEL6/input/checks/file_owner_ldap_server_bdb.xml | 4 +- RHEL6/input/checks/file_ownership_etc_skel.xml | 4 +- RHEL6/input/checks/file_ownership_library_dirs.xml | 40 ++++---- .../input/checks/file_ownership_samba_password.xml | 4 +- .../file_permissions_boot_grub_grub_conf.xml | 12 +- .../input/checks/file_permissions_etc_gshadow.xml | 12 +- RHEL6/input/checks/file_permissions_etc_passwd.xml | 12 +- RHEL6/input/checks/file_permissions_etc_shadow.xml | 12 +- RHEL6/input/checks/file_permissions_etc_skel.xml | 4 +- .../input/checks/file_permissions_library_dirs.xml | 40 ++++---- .../checks/file_permissions_samba_password.xml | 4 +- .../file_ssh_host_keys_private_permissions.xml | 4 +- .../file_ssh_host_keys_public_permissions.xml | 4 +- .../mount_option_nodev_removable_partitions.xml | 6 +- .../mount_option_noexec_removable_partitions.xml | 6 +- .../mount_option_nosuid_removable_partitions.xml | 6 +- RHEL6/input/checks/package_abrt_removed.xml | 4 +- RHEL6/input/checks/package_acpid_removed.xml | 4 +- RHEL6/input/checks/package_aide_installed.xml | 4 +- RHEL6/input/checks/package_at_removed.xml | 4 +- RHEL6/input/checks/package_audit_installed.xml | 4 +- RHEL6/input/checks/package_autofs_removed.xml | 4 +- RHEL6/input/checks/package_bind_removed.xml | 4 +- RHEL6/input/checks/package_certmonger_removed.xml | 4 +- RHEL6/input/checks/package_cpuspeed_removed.xml | 4 +- .../checks/package_cronie-anacron_removed.xml | 4 +- RHEL6/input/checks/package_cronie_installed.xml | 4 +- RHEL6/input/checks/package_cups_removed.xml | 4 +- RHEL6/input/checks/package_cyrus-sasl_removed.xml | 4 +- RHEL6/input/checks/package_dbus_removed.xml | 4 +- RHEL6/input/checks/package_dhcp_removed.xml | 4 +- RHEL6/input/checks/package_dhcpd_removed.xml | 4 +- RHEL6/input/checks/package_dovecot_removed.xml | 4 +- RHEL6/input/checks/package_hal_removed.xml | 4 +- RHEL6/input/checks/package_httpd_removed.xml | 4 +- .../input/checks/package_ipsec-tools_installed.xml | 4 +- .../checks/package_iptables-ipv6_installed.xml | 4 +- RHEL6/input/checks/package_iptables_installed.xml | 4 +- RHEL6/input/checks/package_iputils_removed.xml | 4 +- RHEL6/input/checks/package_irda-utils_removed.xml | 4 +- .../input/checks/package_irqbalance_installed.xml | 4 +- .../input/checks/package_isdn4k-utils_removed.xml | 4 +- RHEL6/input/checks/package_kexec-tools_removed.xml | 4 +- RHEL6/input/checks/package_libcgroup_removed.xml | 4 +- RHEL6/input/checks/package_lvm2_installed.xml | 4 +- RHEL6/input/checks/package_mdadm_removed.xml | 4 +- RHEL6/input/checks/package_net-snmp_removed.xml | 4 +- RHEL6/input/checks/package_nfs-utils_removed.xml | 4 +- RHEL6/input/checks/package_ntp_installed.xml | 4 +- RHEL6/input/checks/package_ntpdate_installed.xml | 4 +- RHEL6/input/checks/package_oddjob_removed.xml | 4 +- .../checks/package_openldap-servers_installed.xml | 4 +- .../checks/package_openldap-servers_removed.xml | 4 +- RHEL6/input/checks/package_openldap_removed.xml | 4 +- .../checks/package_openssh-server_removed.xml | 4 +- RHEL6/input/checks/package_openswan_installed.xml | 4 +- RHEL6/input/checks/package_pam_ldap_removed.xml | 4 +- .../checks/package_policycoreutils_installed.xml | 4 +- RHEL6/input/checks/package_portreserve_removed.xml | 4 +- RHEL6/input/checks/package_postfix_installed.xml | 4 +- RHEL6/input/checks/package_psacct_installed.xml | 4 +- .../checks/package_qpid-cpp-server_removed.xml | 4 +- RHEL6/input/checks/package_quota_removed.xml | 4 +- RHEL6/input/checks/package_rhnsd_removed.xml | 4 +- RHEL6/input/checks/package_rpcbind_removed.xml | 4 +- RHEL6/input/checks/package_rsh-server_removed.xml | 4 +- RHEL6/input/checks/package_rsh_removed.xml | 4 +- RHEL6/input/checks/package_rsyslog_installed.xml | 4 +- .../input/checks/package_samba-common_removed.xml | 4 +- RHEL6/input/checks/package_samba_removed.xml | 4 +- RHEL6/input/checks/package_screen_installed.xml | 4 +- RHEL6/input/checks/package_sendmail_removed.xml | 4 +- .../input/checks/package_smartmontools_removed.xml | 4 +- RHEL6/input/checks/package_squid_removed.xml | 4 +- RHEL6/input/checks/package_sssd_removed.xml | 4 +- .../package_subscription-manager_removed.xml | 4 +- RHEL6/input/checks/package_sysstat_removed.xml | 4 +- RHEL6/input/checks/package_talk-server_removed.xml | 4 +- RHEL6/input/checks/package_talk_removed.xml | 4 +- .../input/checks/package_telnet-server_removed.xml | 4 +- RHEL6/input/checks/package_tftp-server_removed.xml | 4 +- RHEL6/input/checks/package_vlock_installed.xml | 4 +- RHEL6/input/checks/package_vlock_removed.xml | 4 +- RHEL6/input/checks/package_vsftpd_installed.xml | 4 +- RHEL6/input/checks/package_vsftpd_removed.xml | 4 +- RHEL6/input/checks/package_xinetd_removed.xml | 4 +- .../package_xorg-x11-server-common_removed.xml | 4 +- RHEL6/input/checks/package_ypbind_removed.xml | 4 +- RHEL6/input/checks/package_ypserv_removed.xml | 4 +- RHEL6/input/checks/rpm_verify_hashes.xml | 14 ++-- RHEL6/input/checks/service_tftp_disabled.xml | 109 ++++++++++++++++---- .../templates/template_OVAL_package_installed | 4 +- .../checks/templates/template_package_removed | 4 +- RHEL6/input/checks/templates/template_permissions | 12 +- 99 files changed, 350 insertions(+), 279 deletions(-)