From: Matthias Runge <mrunge@redhat.com>
Date: Mon, 22 Jul 2019 13:58:17 +0000 (+0200)
Subject: Merge pull request #3217 from rpv-tomsk/issue-3215
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=fda9988b164bac1a2fb13edb87b292bd0900facc;hp=d0e2590eec07925abdc656cadca205738e3471ed

Merge pull request #3217 from rpv-tomsk/issue-3215

daemon: Check if plugin actually loaded before reporting configuration issues
---

diff --git a/CODEOWNERS b/CODEOWNERS
index 55fbd049..5a2fe301 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -4,7 +4,6 @@
 # These owners will be the default owners for everything in the repo. Unless a
 # later match takes precedence, # @trusted-contributors will be requested for
 # review when someone opens a pull request.
-*       @trusted-contributors
 
 /src/intel_pmu.c	@kwiatrox @sunkuranganath
 /src/intel_rdt.c	@kwiatrox @sunkuranganath
@@ -13,3 +12,7 @@
 /src/virt.c		@anaudx @rjablonx
 # TODO(#2926): Add the following owners:
 #/src/redfish.c		@kkepka @mkobyli
+
+# Order is important; the last matching pattern takes the most
+# precedence.
+*       @trusted-contributors
diff --git a/configure.ac b/configure.ac
index 2289aa43..a2fb6be8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -165,6 +165,7 @@ AC_CHECK_HEADERS_ONCE([ \
   kstat.h \
   kvm.h \
   libgen.h \
+  locale.h \
   mntent.h \
   mnttab.h \
   netdb.h \
@@ -742,26 +743,12 @@ test_cxx_flags() {
 #
 AC_CHECK_FUNCS_ONCE([ \
     asprintf \
-    closelog \
-    getaddrinfo \
-    getgrnam_r \
-    getnameinfo \
     getpwnam \
     getpwnam_r \
-    gettimeofday \
     if_indextoname \
-    openlog \
-    regcomp \
-    regerror \
-    regexec \
-    regfree \
-    select \
     setenv \
     setgroups \
-    strcasecmp \
-    strdup \
-    strncasecmp \
-    sysconf
+    setlocale
   ]
 )
 
diff --git a/src/disk.c b/src/disk.c
index 3faef9dc..c02b6aba 100644
--- a/src/disk.c
+++ b/src/disk.c
@@ -59,9 +59,6 @@
 #include <libgeom.h>
 #endif
 
-#if HAVE_LIMITS_H
-#include <limits.h>
-#endif
 #ifndef UINT_MAX
 #define UINT_MAX 4294967295U
 #endif