diff options
| author | Nathaniel McCallum <npmccallum@redhat.com> | 2014-02-07 11:56:33 -0500 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2014-02-11 17:36:19 +0100 |
| commit | 6c500ccf05103566ca888bc8d67187ab81621328 (patch) | |
| tree | 99246ac2b6df2c32f800524ec737501fe1042243 | |
| parent | 5d65856588c247b984e8b88d9d461b5a35aae4a4 (diff) | |
| download | freeipa.git-6c500ccf05103566ca888bc8d67187ab81621328.tar.gz freeipa.git-6c500ccf05103566ca888bc8d67187ab81621328.tar.xz freeipa.git-6c500ccf05103566ca888bc8d67187ab81621328.zip | |
Move ipa-otpd socket directory
https://fedorahosted.org/freeipa/ticket/4167
Reviewed-By: Martin Kosek <mkosek@redhat.com>
| -rw-r--r-- | daemons/configure.ac | 6 | ||||
| -rw-r--r-- | daemons/ipa-otpd/Makefile.am | 2 | ||||
| -rw-r--r-- | daemons/ipa-otpd/ipa-otpd.socket.in | 4 | ||||
| -rw-r--r-- | freeipa.spec.in | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/daemons/configure.ac b/daemons/configure.ac index e57dad27..5646c387 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 af82a5fe..83921748 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 b968beaa..ce3596d9 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 c28928c1..a908adfc 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 |