merge 6.1p1

1 files changed, 6 insertions, 0 deletions

diff --git a/config.h.in b/config.h.in
index e51117b81..6c4f2272a 100644
--- a/config.h.in
+++ b/config.h.in
@@ -822,6 +822,9 @@
 /* Define to 1 if you have the `setgroups' function. */
 #undef HAVE_SETGROUPS
 
+/* Define to 1 if you have the `setlinebuf' function. */
+#undef HAVE_SETLINEBUF
+
 /* Define to 1 if you have the `setlogin' function. */
 #undef HAVE_SETLOGIN
 
@@ -1374,6 +1377,9 @@
 /* Sandbox using seccomp filter */
 #undef SANDBOX_SECCOMP_FILTER
 
+/* setrlimit RLIMIT_FSIZE works */
+#undef SANDBOX_SKIP_RLIMIT_FSIZE
+
 /* Sandbox using systrace(4) */
 #undef SANDBOX_SYSTRACE