Submodule libraries/cmake/source/libaudit/src contains modified content diff --git a/libraries/cmake/source/libaudit/src/lib/libaudit.h b/libraries/cmake/source/libaudit/src/lib/libaudit.h index 05ee91e..2ee3842 100644 --- a/libraries/cmake/source/libaudit/src/lib/libaudit.h +++ b/libraries/cmake/source/libaudit/src/lib/libaudit.h @@ -260,7 +260,6 @@ extern "C" { #define AUDIT_KEY_SEPARATOR 0x01 /* These are used in filter control */ -#define AUDIT_FILTER_EXCLUDE AUDIT_FILTER_TYPE #define AUDIT_FILTER_MASK 0x07 /* Mask to get actual filter */ #define AUDIT_FILTER_UNSET 0x80 /* This value means filter is unset */ diff --git a/libraries/cmake/source/libmagic/config/linux/config.h b/libraries/cmake/source/libmagic/config/linux/config.h index 42be099c8..baa707b89 100644 --- a/libraries/cmake/source/libmagic/config/linux/config.h +++ b/libraries/cmake/source/libmagic/config/linux/config.h @@ -248,7 +248,7 @@ #define HAVE_WORKING_VFORK 1 /* Define to 1 if you have the header file. */ -#define HAVE_XLOCALE_H 1 +/* #define HAVE_XLOCALE_H 1 */ /* Define to 1 if you have the header file. */ #define HAVE_ZLIB_H 1 Submodule libevent contains modified content diff --git a/libraries/cmake/source/lldpd/src/libevent/arc4random.c b/libraries/cmake/source/lldpd/src/libevent/arc4random.c index 39773399..5a4ca15e 100644 --- a/libraries/cmake/source/lldpd/src/libevent/arc4random.c +++ b/libraries/cmake/source/lldpd/src/libevent/arc4random.c @@ -59,7 +59,7 @@ #include #include #ifdef _EVENT_HAVE_SYS_SYSCTL_H -#include +#include #endif #endif #include diff --git a/osquery/tables/networking/CMakeLists.txt b/osquery/tables/networking/CMakeLists.txt index 70b7079ee..8106cab9b 100644 --- a/osquery/tables/networking/CMakeLists.txt +++ b/osquery/tables/networking/CMakeLists.txt @@ -87,6 +87,7 @@ function(generateOsqueryTablesNetworking) if(DEFINED PLATFORM_LINUX) list(APPEND platform_deps thirdparty_libiptables + resolv ) endif() diff --git a/osquery/tables/system/linux/sysctl_utils.cpp b/osquery/tables/system/linux/sysctl_utils.cpp index 1ff3e0b00..796da4561 100644 --- a/osquery/tables/system/linux/sysctl_utils.cpp +++ b/osquery/tables/system/linux/sysctl_utils.cpp @@ -7,7 +7,8 @@ * SPDX-License-Identifier: (Apache-2.0 OR GPL-2.0-only) */ -#include +#include +#include #include @@ -70,20 +71,8 @@ void genControlInfo(int* oid, size_t oid_size, QueryData& results, const std::map& config) { - // Get control size - size_t response_size = CTL_MAX_VALUE; - char response[CTL_MAX_VALUE + 1] = {0}; - if (sysctl(oid, oid_size, response, &response_size, 0, 0) != 0) { - // Cannot request MIB data. - return; - } - - // Data is output, but no way to determine type (long, int, string, struct). - Row r; - r["oid"] = stringFromMIB(oid, oid_size); - r["current_value"] = std::string(response); - r["type"] = "string"; - results.push_back(r); + // sysctl got removed from glibc https://sourceware.org/pipermail/glibc-cvs/2020q2/069366.html + return; } void genAllControls(QueryData& results, diff --git a/osquery/tables/system/posix/sysctl_utils.h b/osquery/tables/system/posix/sysctl_utils.h index e119f8a9e..f2f776307 100644 --- a/osquery/tables/system/posix/sysctl_utils.h +++ b/osquery/tables/system/posix/sysctl_utils.h @@ -9,7 +9,7 @@ #pragma once -#include +#include #include