From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 29 May 2025 15:22:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'systemd-security/coredump-d'
X-Git-Tag: v258-rc1~448
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=505a5d2bcd0ddda2ed50e8a6d85d645994fc407c;p=thirdparty%2Fsystemd.git

Merge remote-tracking branch 'systemd-security/coredump-d'
---

505a5d2bcd0ddda2ed50e8a6d85d645994fc407c
diff --cc src/shared/elf-util.c
index 73a910575de,fd06b55ab1d..a21167980d0
--- a/src/shared/elf-util.c
+++ b/src/shared/elf-util.c
@@@ -5,13 -6,12 +5,13 @@@
  #include <elfutils/libdwelf.h>
  #include <elfutils/libdwfl.h>
  #include <libelf.h>
 -#include <sys/resource.h>
 -#include <sys/types.h>
 +#endif
- #include <sys/prctl.h>
  #include <unistd.h>
  
 +#include "sd-json.h"
 +
  #include "alloc-util.h"
+ #include "coredump-util.h"
  #include "dlfcn-util.h"
  #include "elf-util.h"
  #include "errno-util.h"
diff --cc src/shared/tests.c
index bc80d153ac7,7284d00e23e..5820c0d13f4
--- a/src/shared/tests.c
+++ b/src/shared/tests.c
@@@ -17,10 -16,9 +17,11 @@@
  #include "bus-wait-for-jobs.h"
  #include "cgroup-setup.h"
  #include "cgroup-util.h"
+ #include "coredump-util.h"
  #include "env-file.h"
  #include "env-util.h"
 +#include "errno-util.h"
 +#include "extract-word.h"
  #include "fd-util.h"
  #include "fs-util.h"
  #include "hexdecoct.h"