URL: https://github.com/freeipa/freeipa/pull/680 Author: tjaalton Title: #680: ipa-otpd.socket.in: Use a platform specific value for KDC service file Action: opened
PR body: """ https://pagure.io/freeipa/issue/6845 """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/680/head:pr680 git checkout pr680
From d76c38b16f4b18bbbc554867f0bdc15f757dd483 Mon Sep 17 00:00:00 2001 From: Timo Aaltonen <tjaal...@debian.org> Date: Sat, 1 Apr 2017 02:18:15 +0300 Subject: [PATCH] ipa-otpd.socket.in: Use a platform specific value for KDC service file https://pagure.io/freeipa/issue/6845 --- configure.ac | 2 ++ daemons/ipa-otpd/Makefile.am | 1 + daemons/ipa-otpd/ipa-otpd.socket.in | 2 +- server.m4 | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b006ccc..22faf43 100644 --- a/configure.ac +++ b/configure.ac @@ -330,11 +330,13 @@ 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="" 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@ diff --git a/server.m4 b/server.m4 index 346d73e..40f85a6 100644 --- a/server.m4 +++ b/server.m4 @@ -53,6 +53,7 @@ KRAD_LIBS="-lkrad" krb5rundir="${localstatedir}/run/krb5kdc" AC_SUBST(KRAD_LIBS) AC_SUBST(krb5rundir) +AC_SUBST([KRB5KDC_SERVICE]) dnl --------------------------------------------------------------------------- dnl - Check for UUID library
-- Manage your subscription for the Freeipa-devel mailing list: https://www.redhat.com/mailman/listinfo/freeipa-devel Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
