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