IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move ipa-otpd socket directory

Browse Source 
https://fedorahosted.org/freeipa/ticket/4167
Reviewed-By: Martin Kosek <mkosek@redhat.com>
This commit is contained in:
Nathaniel McCallum
2014-02-07 11:56:33 -05:00
committed by Martin Kosek
parent 5d65856588
commit 6c500ccf05
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
daemons/configure.ac
View File

@@ -60,10 +60,10 @@ AC_CHECK_LIB(k5crypto, main, [krb5crypto=k5crypto], [krb5crypto=crypto])
AC_CHECK_LIB(krad, main, [], [AC_MSG_ERROR([libkrad not found])]) AC_CHECK_LIB(krad, main, [], [AC_MSG_ERROR([libkrad not found])])
KRB5_LIBS="-lkrb5 -l$krb5crypto -lcom_err" KRB5_LIBS="-lkrb5 -l$krb5crypto -lcom_err"
KRAD_LIBS="-lkrad" KRAD_LIBS="-lkrad"
krb5kdcdir="${localstatedir}/kerberos/krb5kdc" krb5rundir="${localstatedir}/run/krb5kdc"
AC_SUBST(KRB5_LIBS) AC_SUBST(KRB5_LIBS)
AC_SUBST(KRAD_LIBS) AC_SUBST(KRAD_LIBS)
AC_SUBST(krb5kdcdir) AC_SUBST(krb5rundir)
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl - Check for Mozilla LDAP and OpenLDAP SDK dnl - Check for Mozilla LDAP and OpenLDAP SDK
@@ -337,7 +337,7 @@ echo "
sysconfdir: ${sysconfdir} sysconfdir: ${sysconfdir}
localstatedir: ${localstatedir} localstatedir: ${localstatedir}
datadir: ${datadir} datadir: ${datadir}
krb5kdcdir: ${krb5kdcdir} krb5rundir: ${krb5rundir}
systemdsystemunitdir: ${systemdsystemunitdir} systemdsystemunitdir: ${systemdsystemunitdir}
source code location: ${srcdir} source code location: ${srcdir}
compiler: ${CC} compiler: ${CC}

2
daemons/ipa-otpd/Makefile.am
View File

@@ -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 ipa_otpd_SOURCES = bind.c forward.c main.c parse.c query.c queue.c stdio.c
%.socket: %.socket.in %.socket: %.socket.in
@sed -e 's|@krb5kdcdir[@]|$(krb5kdcdir)|g' \ @sed -e 's|@krb5rundir[@]|$(krb5rundir)|g' \
-e 's|@UNLINK[@]|@UNLINK@|g' \ -e 's|@UNLINK[@]|@UNLINK@|g' \
$< > $@ $< > $@

4
daemons/ipa-otpd/ipa-otpd.socket.in
View File

@@ -2,8 +2,8 @@
Description=ipa-otpd socket Description=ipa-otpd socket
[Socket] [Socket]
ListenStream=@krb5kdcdir@/DEFAULT.socket ListenStream=@krb5rundir@/DEFAULT.socket
ExecStopPre=@UNLINK@ @krb5kdcdir@/DEFAULT.socket ExecStopPre=@UNLINK@ @krb5rundir@/DEFAULT.socket
SocketMode=0600 SocketMode=0600
Accept=true Accept=true

2
freeipa.spec.in
View File

@@ -107,7 +107,7 @@ Requires: nss >= 3.14.3-12.0
Requires: nss-tools >= 3.14.3-12.0 Requires: nss-tools >= 3.14.3-12.0
%endif %endif
%if 0%{?krb5_dal_version} >= 4 %if 0%{?krb5_dal_version} >= 4
Requires: krb5-server >= 1.11.2-1 Requires: krb5-server >= 1.11.5-3
%else %else
%if 0%{krb5_dal_version} == 3 %if 0%{krb5_dal_version} == 3
# krb5 1.11 bumped DAL interface major version, a rebuild is needed # krb5 1.11 bumped DAL interface major version, a rebuild is needed