|
 |
9991ea |
From e7d5a0c79e780fddb97bcbf2763a19a2c0b244c7 Mon Sep 17 00:00:00 2001
|
|
|
9991ea |
From: Nathaniel McCallum <npmccallum@redhat.com>
|
|
|
9991ea |
Date: Fri, 7 Feb 2014 11:56:33 -0500
|
|
|
9991ea |
Subject: [PATCH 46/46] Move ipa-otpd socket directory
|
|
|
9991ea |
|
|
|
9991ea |
https://fedorahosted.org/freeipa/ticket/4167
|
|
|
9991ea |
Reviewed-By: Martin Kosek <mkosek@redhat.com>
|
|
|
9991ea |
---
|
|
|
9991ea |
daemons/configure.ac | 6 +++---
|
|
|
9991ea |
daemons/ipa-otpd/Makefile.am | 2 +-
|
|
|
9991ea |
daemons/ipa-otpd/ipa-otpd.socket.in | 4 ++--
|
|
|
9991ea |
freeipa.spec.in | 2 +-
|
|
|
9991ea |
4 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
9991ea |
|
|
|
9991ea |
diff --git a/daemons/configure.ac b/daemons/configure.ac
|
|
|
9991ea |
index e57dad27614f268d3e5bbafc99b739a5cfa2589b..5646c3873beee996999e4f1d87aea653f4b5dd1b 100644
|
|
|
9991ea |
--- a/daemons/configure.ac
|
|
|
9991ea |
+++ b/daemons/configure.ac
|
|
|
9991ea |
@@ -60,10 +60,10 @@ AC_CHECK_LIB(k5crypto, main, [krb5crypto=k5crypto], [krb5crypto=crypto])
|
|
|
9991ea |
AC_CHECK_LIB(krad, main, [], [AC_MSG_ERROR([libkrad not found])])
|
|
|
9991ea |
KRB5_LIBS="-lkrb5 -l$krb5crypto -lcom_err"
|
|
|
9991ea |
KRAD_LIBS="-lkrad"
|
|
|
9991ea |
-krb5kdcdir="${localstatedir}/kerberos/krb5kdc"
|
|
|
9991ea |
+krb5rundir="${localstatedir}/run/krb5kdc"
|
|
|
9991ea |
AC_SUBST(KRB5_LIBS)
|
|
|
9991ea |
AC_SUBST(KRAD_LIBS)
|
|
|
9991ea |
-AC_SUBST(krb5kdcdir)
|
|
|
9991ea |
+AC_SUBST(krb5rundir)
|
|
|
9991ea |
|
|
|
9991ea |
dnl ---------------------------------------------------------------------------
|
|
|
9991ea |
dnl - Check for Mozilla LDAP and OpenLDAP SDK
|
|
|
9991ea |
@@ -337,7 +337,7 @@ echo "
|
|
|
9991ea |
sysconfdir: ${sysconfdir}
|
|
|
9991ea |
localstatedir: ${localstatedir}
|
|
|
9991ea |
datadir: ${datadir}
|
|
|
9991ea |
- krb5kdcdir: ${krb5kdcdir}
|
|
|
9991ea |
+ krb5rundir: ${krb5rundir}
|
|
|
9991ea |
systemdsystemunitdir: ${systemdsystemunitdir}
|
|
|
9991ea |
source code location: ${srcdir}
|
|
|
9991ea |
compiler: ${CC}
|
|
|
9991ea |
diff --git a/daemons/ipa-otpd/Makefile.am b/daemons/ipa-otpd/Makefile.am
|
|
|
9991ea |
index af82a5fe08856573d2d245608ba1dbaad171c7fe..83921748426d801e1edeec23f956689be5fe98b5 100644
|
|
|
9991ea |
--- a/daemons/ipa-otpd/Makefile.am
|
|
|
9991ea |
+++ b/daemons/ipa-otpd/Makefile.am
|
|
|
9991ea |
@@ -9,7 +9,7 @@ systemdsystemunit_DATA = ipa-otpd.socket ipa-otpd@.service
|
|
|
9991ea |
ipa_otpd_SOURCES = bind.c forward.c main.c parse.c query.c queue.c stdio.c
|
|
|
9991ea |
|
|
|
9991ea |
%.socket: %.socket.in
|
|
|
9991ea |
- @sed -e 's|@krb5kdcdir[@]|$(krb5kdcdir)|g' \
|
|
|
9991ea |
+ @sed -e 's|@krb5rundir[@]|$(krb5rundir)|g' \
|
|
|
9991ea |
-e 's|@UNLINK[@]|@UNLINK@|g' \
|
|
|
9991ea |
$< > $@
|
|
|
9991ea |
|
|
|
9991ea |
diff --git a/daemons/ipa-otpd/ipa-otpd.socket.in b/daemons/ipa-otpd/ipa-otpd.socket.in
|
|
|
9991ea |
index b968beaa7b9e68c43b2c5386b62c096fa8b97764..ce3596d9f01b26e3e8bd63f447f85a486c8e0dff 100644
|
|
|
9991ea |
--- a/daemons/ipa-otpd/ipa-otpd.socket.in
|
|
|
9991ea |
+++ b/daemons/ipa-otpd/ipa-otpd.socket.in
|
|
|
9991ea |
@@ -2,8 +2,8 @@
|
|
|
9991ea |
Description=ipa-otpd socket
|
|
|
9991ea |
|
|
|
9991ea |
[Socket]
|
|
|
9991ea |
-ListenStream=@krb5kdcdir@/DEFAULT.socket
|
|
|
9991ea |
-ExecStopPre=@UNLINK@ @krb5kdcdir@/DEFAULT.socket
|
|
|
9991ea |
+ListenStream=@krb5rundir@/DEFAULT.socket
|
|
|
9991ea |
+ExecStopPre=@UNLINK@ @krb5rundir@/DEFAULT.socket
|
|
|
9991ea |
SocketMode=0600
|
|
|
9991ea |
Accept=true
|
|
|
9991ea |
|
|
|
9991ea |
diff --git a/freeipa.spec.in b/freeipa.spec.in
|
|
|
9991ea |
index ae8ee57f3ba2c0746bb0f7a1e65dab1da83cca22..cff79843d76a7251ae6065dba7341465733bb7cc 100644
|
|
|
9991ea |
--- a/freeipa.spec.in
|
|
|
9991ea |
+++ b/freeipa.spec.in
|
|
|
9991ea |
@@ -105,7 +105,7 @@ Requires: nss >= 3.14.3-12.0
|
|
|
9991ea |
Requires: nss-tools >= 3.14.3-12.0
|
|
|
9991ea |
%endif
|
|
|
9991ea |
%if 0%{?krb5_dal_version} >= 4
|
|
|
9991ea |
-Requires: krb5-server >= 1.11.2-1
|
|
|
9991ea |
+Requires: krb5-server >= 1.11.5-3
|
|
|
9991ea |
%else
|
|
|
9991ea |
%if 0%{krb5_dal_version} == 3
|
|
|
9991ea |
# krb5 1.11 bumped DAL interface major version, a rebuild is needed
|
|
|
9991ea |
--
|
|
|
9991ea |
1.8.5.3
|
|
|
9991ea |
|