]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge pull request #7820 from pieterlexis/systemd-no-setuid
authorRemi Gacogne <remi.gacogne@powerdns.com>
Fri, 7 Feb 2020 11:15:36 +0000 (12:15 +0100)
committerGitHub <noreply@github.com>
Fri, 7 Feb 2020 11:15:36 +0000 (12:15 +0100)
dnsdist: don't start as root within a systemd environment

1  2 
pdns/dnsdist.cc
pdns/dnsdistdist/Makefile.am
pdns/dnsdistdist/configure.ac
pdns/dnsdistdist/dnsdist.service.in

diff --cc pdns/dnsdist.cc
Simple merge
Simple merge
index e0109dc2843772162d6e92a1ea583852460ffdc9,4daf7291f954e29fb5dc781f1f98dd36bc9cc4be..89bb865e19c3ad0126eb4d1a4addd1b7275fae98
@@@ -47,10 -47,8 +47,11 @@@ PDNS_WITH_LIBCA
  AX_AVAILABLE_SYSTEMD
  AX_CHECK_SYSTEMD_FEATURES
  AM_CONDITIONAL([HAVE_SYSTEMD], [ test x"$systemd" = "xy" ])
+ PDNS_WITH_SERVICE_USER([dnsdist])
  
 +dnl the *_r functions are in posix so we can use them unconditionally, but the ext/yahttp code is
 +dnl using the defines.
 +AC_CHECK_FUNCS_ONCE([localtime_r gmtime_r])
  AC_SUBST([YAHTTP_CFLAGS], ['-I$(top_srcdir)/ext/yahttp'])
  AC_SUBST([YAHTTP_LIBS], ['$(top_builddir)/ext/yahttp/yahttp/libyahttp.la'])
  AC_SUBST([IPCRYPT_CFLAGS], ['-I$(top_srcdir)/ext/ipcrypt'])
Simple merge