From 076eb409a032cbd689f1d5e298c1009e80168e34 Mon Sep 17 00:00:00 2001 From: Timo Aaltonen Date: Apr 12 2017 14:17:51 +0000 Subject: ipa-otpd.socket.in: Use a platform specific value for KDC service file https://pagure.io/freeipa/issue/6845 Reviewed-By: Christian Heimes Reviewed-By: Tomas Krizek --- diff --git a/configure.ac b/configure.ac index 8f8751a..129d817 100644 --- a/configure.ac +++ b/configure.ac @@ -330,16 +330,20 @@ AC_SUBST([IPAPLATFORM]) AC_MSG_RESULT([${IPAPLATFORM}]) if test "x${IPAPLATFORM}" == "xdebian"; then + KRB5KDC_SERVICE="krb5-kdc.service" NAMED_GROUP="bind" ODS_USER="opendnssec" # see https://www.debian.org/doc/packaging-manuals/python-policy/ap-packaging_tools.html PYTHON_INSTALL_EXTRA_OPTIONS="--install-layout=deb" else + KRB5KDC_SERVICE="krb5kdc.service" NAMED_GROUP="named" ODS_USER="ods" PYTHON_INSTALL_EXTRA_OPTIONS="" fi +AC_SUBST([KRB5KDC_SERVICE]) + AC_MSG_CHECKING([NAMED_GROUP]) AC_SUBST([NAMED_GROUP]) AC_MSG_RESULT([${NAMED_GROUP}]) diff --git a/daemons/ipa-otpd/Makefile.am b/daemons/ipa-otpd/Makefile.am index 9ba6237..923e16e 100644 --- a/daemons/ipa-otpd/Makefile.am +++ b/daemons/ipa-otpd/Makefile.am @@ -11,6 +11,7 @@ ipa_otpd_SOURCES = bind.c forward.c main.c parse.c query.c queue.c stdio.c %.socket: %.socket.in @sed -e 's|@krb5rundir[@]|$(krb5rundir)|g' \ + -e 's|@KRB5KDC_SERVICE[@]|$(KRB5KDC_SERVICE)|g' \ -e 's|@UNLINK[@]|@UNLINK@|g' \ $< > $@ diff --git a/daemons/ipa-otpd/ipa-otpd.socket.in b/daemons/ipa-otpd/ipa-otpd.socket.in index e98a73f..b27530c 100644 --- a/daemons/ipa-otpd/ipa-otpd.socket.in +++ b/daemons/ipa-otpd/ipa-otpd.socket.in @@ -8,4 +8,4 @@ SocketMode=0600 Accept=true [Install] -WantedBy=krb5kdc.service +WantedBy=@KRB5KDC_SERVICE@