Merge pull request #1114 from theopolis/rhel_centos_tables

RHEL table parity with CENTOS

CMake/CMakeLibs.cmake

@@ -146,7 +146,7 @@ macro(GENERATE_TABLES TABLES_PATH)
     file(GLOB TABLE_FILES_PLATFORM "${TABLES_PATH}/specs/freebsd/*.table")
   else(LINUX)
     file(GLOB TABLE_FILES_PLATFORM "${TABLES_PATH}/specs/linux/*.table")
-    if(CENTOS)
+    if(CENTOS OR RHEL)
       file(GLOB TABLE_FILES_PLATFORM_FLAVOR "${TABLES_PATH}/specs/centos/*.table")
     elseif(UBUNTU)
       file(GLOB TABLE_FILES_PLATFORM_FLAVOR "${TABLES_PATH}/specs/ubuntu/*.table")

osquery/tables/CMakeLists.txt

@@ -33,7 +33,7 @@ else()
   file(GLOB OSQUERY_LINUX_TABLES_TESTS "*/linux/tests/*.cpp")
   ADD_OSQUERY_TABLE_TEST(${OSQUERY_LINUX_TABLES_TESTS})
 
-  if(CENTOS)
+  if(CENTOS OR RHEL)
     # CentOS specific tables
     file(GLOB OSQUERY_REDHAT_TABLES "*/centos/*.cpp")
     ADD_OSQUERY_LIBRARY(FALSE osquery_tables_redhat

osquery/tables/system/centos/rpm_packages.cpp

@@ -147,7 +147,7 @@ QueryData genRpmPackageFiles(QueryContext& context) {
       r["mode"] = lsperms(rpmfiFMode(fi));
       r["size"] = BIGINT(rpmfiFSize(fi));
 
-#ifdef CENTOS_CENTOS6
+#if defined(CENTOS_CENTOS6) || defined(RHEL_RHEL6)
       // Older versions of rpmlib/rpmip use a hash algorithm enum.
       pgpHashAlgo digest_algo;
 #else

osquery/tables/system/linux/os_version.cpp

@@ -22,7 +22,7 @@ namespace xp = boost::xpressive;
 namespace osquery {
 namespace tables {
 
-#ifdef CENTOS
+#if defined(CENTOS) || defined(RHEL)
 const std::string kLinuxOSRelease = "/etc/redhat-release";
 const std::string kLinuxOSRegex =
     "(?P<name>\\w+) .* "