diff options
author | Sumit Bose <sbose@redhat.com> | 2012-06-21 22:12:55 +0200 |
---|---|---|
committer | Stephen Gallagher <sgallagh@redhat.com> | 2012-06-21 17:03:01 -0400 |
commit | 3b1386e5ad510eb29d826a53113324af2c096e26 (patch) | |
tree | 2782abae467e8eac5b92a2e4eabbab73cdcde1ae | |
parent | e13baa8dab9741d9221d3794fd8abf3d461f8d6d (diff) | |
download | sssd-3b1386e5ad510eb29d826a53113324af2c096e26.tar.gz sssd-3b1386e5ad510eb29d826a53113324af2c096e26.tar.bz2 sssd-3b1386e5ad510eb29d826a53113324af2c096e26.zip |
Try to build PAC responder only if all dependencies are available
-rw-r--r-- | contrib/sssd.spec.in | 10 | ||||
-rw-r--r-- | src/external/pac_responder.m4 | 13 |
2 files changed, 18 insertions, 5 deletions
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in index 8aa25827..777de90f 100644 --- a/contrib/sssd.spec.in +++ b/contrib/sssd.spec.in @@ -112,8 +112,11 @@ BuildRequires: gettext-devel BuildRequires: pkgconfig BuildRequires: findutils %if (0%{?enable_experimental} == 1) +# RHEL 5 is too old to support samba4 and the PAC responder +%if !0%{?is_rhel5} BuildRequires: samba4-devel %endif +%endif %if 0%{?is_rhel5} > 0 BuildRequires: glib2-devel @@ -329,9 +332,14 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/%{servicename}/sssd_autofs %{_libexecdir}/%{servicename}/sssd_ssh %{_libexecdir}/%{servicename}/sssd_sudo + +# RHEL 5 is too old to support the PAC responder +%if !0%{?is_rhel5} %{_libexecdir}/%{servicename}/sssd_pac %endif +%endif + %{_libdir}/%{name}/libsss_ipa.so %{_libdir}/%{name}/libsss_krb5.so %{_libdir}/%{name}/libsss_ldap.so @@ -377,8 +385,10 @@ rm -rf $RPM_BUILD_ROOT /%{_lib}/security/pam_sss.so %{_libdir}/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so %if (0%{?enable_experimental} == 1) +%if !0%{?is_rhel5} %{_libdir}/krb5/plugins/authdata/sssd_pac_plugin.so %endif +%endif %{_mandir}/man8/pam_sss.8* %{_mandir}/man8/sssd_krb5_locator_plugin.8* diff --git a/src/external/pac_responder.m4 b/src/external/pac_responder.m4 index f2841924..8c960f71 100644 --- a/src/external/pac_responder.m4 +++ b/src/external/pac_responder.m4 @@ -12,10 +12,12 @@ then build_pac_responder=yes fi +ndr_krb5pac_ok=no +krb5_version_ok=no if test x$build_pac_responder == xyes then - PKG_CHECK_MODULES(NDR_KRB5PAC, ndr_krb5pac,, - AC_MSG_ERROR([Cannot build pac responder without libndr_krb5pac])) + PKG_CHECK_MODULES(NDR_KRB5PAC, ndr_krb5pac, ndr_krb5pac_ok=yes, + AC_MSG_WARN([Cannot build pac responder without libndr_krb5pac])) AC_PATH_PROG(KRB5_CONFIG, krb5-config) AC_MSG_CHECKING(for supported MIT krb5 version) @@ -23,12 +25,13 @@ then case $KRB5_VERSION in Kerberos\ 5\ release\ 1.9* | \ Kerberos\ 5\ release\ 1.10*) + krb5_version_ok=yes AC_MSG_RESULT(yes) ;; *) - AC_MSG_ERROR([Cannot build authdata plugin with this version of - MIT Kerberos, please use 1.9.x or 1.10.x]) + AC_MSG_WARN([Cannot build authdata plugin with this version of + MIT Kerberos, please use 1.9.x or 1.10.x]) esac fi -AM_CONDITIONAL([BUILD_PAC_RESPONDER], [test x$build_pac_responder = xyes ]) +AM_CONDITIONAL([BUILD_PAC_RESPONDER], [test x$build_pac_responder = xyes -a x$ndr_krb5pac_ok = xyes -a x$krb5_version_ok = xyes ]) |