Install mechanism configuration in mech.d

This will automatically enable the mechanism upon install.

diff --git a/contrib/gssntlmssp.spec.in b/contrib/gssntlmssp.spec.in
index bbc0b07e92f249cc6aa1840f64ab39d580f5aa3d..8490590d3efb4231d86b11eb5b31405a06641180 100644 (file)
--- a/contrib/gssntlmssp.spec.in
+++ b/contrib/gssntlmssp.spec.in
@@ -8,7 +8,7 @@ License:        LGPLv3+
 URL:           https://fedorahosted.org/gss-ntlmssp
 Source0:       https://fedorahosted.org/released/gss-ntlmssp/%{name}-%{version}.tar.gz
 
-Requires: krb5-libs%{?_isa} >= 1.11.2
+Requires: krb5-libs%{?_isa} >= 1.11.5
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -20,7 +20,7 @@ BuildRequires: docbook-style-xsl
 BuildRequires: doxygen
 BuildRequires: gettext-devel
 BuildRequires: pkgconfig
-BuildRequires: krb5-devel >= 1.11.2
+BuildRequires: krb5-devel >= 1.11.5
 BuildRequires: libunistring-devel
 BuildRequires: openssl-devel
 
@@ -50,14 +50,13 @@ make %{?_smp_mflags} all
 %install
 %make_install
 rm -f %{buildroot}%{_libdir}/gssntlmssp/gssntlmssp.la
-install -d -m755 %{buildroot}%{_sysconfdir}/gss
-install -pm644 examples/mech.ntlmssp %{buildroot}%{_sysconfdir}/gss/mech.ntlmssp
+install -pm644 examples/mech.ntlmssp %{buildroot}%{_sysconfdir}/gss/mech.d/ntlmssp.conf
 
 %check
 make test_gssntlmssp
 
 %files
-%config(noreplace) %{_sysconfdir}/gss/mech.ntlmssp
+%config(noreplace) %{_sysconfdir}/gss/mech.d/ntlmssp.conf
 %{_libdir}/gssntlmssp/
 %{_mandir}/man8/gssntlmssp.8*
 %doc COPYING

diff --git a/examples/mech.ntlmssp.in b/examples/mech.ntlmssp.in
index a16f5bfd3ab5bb152b6f3e51ec3f06bda9a93b7f..d562e8059bac37bc296f856fbc7ac6f42693dd1a 100644 (file)
--- a/examples/mech.ntlmssp.in
+++ b/examples/mech.ntlmssp.in
@@ -1,7 +1,8 @@
-# GSS-API mechanism plugins
+# NTLMSSP mechanism plugin
 #
-# NOTE: copy the content of this file in /etc/gss/mech to activate the NTLM SSP
-# mechanism
+# NOTE: to activate the NTLM SSP mechanism do the following
+#     * FOR krb5 < 1.12: copy the content of this file in /etc/gss/mech
+#     * FOR krb5 >= 1.12: copy this file in /etc/gss/mech.d
 #
 # Mechanism Name       Object Identifier               Shared Library Path                     Other Options
 gssntlmssp_v1          1.3.6.1.4.1.311.2.2.10          @libdir@/gssntlmssp/gssntlmssp.so