]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge remote-tracking branch 'systemd-security/coredump-d'
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 29 May 2025 15:22:19 +0000 (17:22 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 29 May 2025 15:22:19 +0000 (17:22 +0200)
1  2 
src/shared/coredump-util.h
src/shared/elf-util.c
src/shared/tests.c

Simple merge
index 73a910575de7f38ff9690f6bab4bd7d14d113d9b,fd06b55ab1dc3e1a0a6b774d0fac95a3fa4f1b56..a21167980d0f946c422f6d012a5bd9550f7a9ff8
@@@ -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"
index bc80d153ac752fead09dba12304f2a84c3f0981b,7284d00e23e9d75e6653c66f37ffd3e87b08f199..5820c0d13f4fb2ebb966ebeb9261c92658fac000
  #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"