Attachment 624869 Details for Bug 864950 – patch to introduce alternatives for winbind_krb5_locator.so

[patch] patch to introduce alternatives for winbind_krb5_locator.so

0001-Fix-864950-provide-alternative-for-winbind_krb5_loca.patch (text/plain), 3.49 KB, created by Alexander Bokovoy on 2012-10-10 13:20:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Bokovoy

Created: 2012-10-10 13:20:09 UTC

Size: 3.49 KB

patch

obsolete

>From 29be3b43e7ad1994aab85c3785fb03a6a1d5a5b1 Mon Sep 17 00:00:00 2001
>From: Alexander Bokovoy <abokovoy@redhat.com>
>Date: Wed, 10 Oct 2012 16:18:49 +0300
>Subject: [PATCH] Fix 864950 -- provide alternative for
> winbind_krb5_locator.so
>
>---
> samba.spec | 39 ++++++++++++++++++++++++++++++++++++---
> 1 file changed, 36 insertions(+), 3 deletions(-)
>
>diff --git a/samba.spec b/samba.spec
>index ead480de9034973afe468f1d160b932531ca79a2..d49d951da1f2ea57ddf464f1c9f4d871eae23823 100644
>--- a/samba.spec
>+++ b/samba.spec
>@@ -1,4 +1,4 @@
>-%define main_release 136
>+%define main_release 137
> 
> %define samba_version 3.6.8
> 
>@@ -162,6 +162,16 @@ The samba-winbind package provides developer tools for the wbclient library.
> Summary: Samba winbind krb5 locator
> Requires: samba-winbind-clients = %{epoch}:%{samba_version}-%{release}
> Group: Applications/System
>+Requires: samba-winbind = %{epoch}:{%samba_version}-%{release}
>+# Handle winbind_krb5_locator.so as alternatives to allow
>+# IPA AD trusts case where it should not be used by libkrb5
>+# The plugin will be diverted to /dev/null by the FreeIPA
>+# freeipa-server-trust-ad subpackage due to higher priority
>+# and restored to the proper one on uninstall
>+Requires(post): %{_sbindir}/update-alternatives
>+Requires(postun): %{_sbindir}/update-alternatives
>+Requires(preun): %{_sbindir}/update-alternatives
>+
> 
> %description winbind-krb5-locator
> The winbind krb5 locator is a plugin for the system kerberos library to allow
>@@ -400,7 +410,8 @@ ln -sf /%{_lib}/libnss_wins.so.2  %{buildroot}%{_libdir}/libnss_wins.so
> # winbind krb5 locator
> #install -d -m0755 %{buildroot}%{_libdir}/krb5/plugins/libkrb5
> install -d -m 0755 %{buildroot}%{_libdir}/krb5/plugins/libkrb5
>-install -m 755 source3/bin/winbind_krb5_locator.so %{buildroot}/%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
>+install -m 755 source3/bin/winbind_krb5_locator.so %{buildroot}/%{_libdir}/winbind_krb5_locator.so
>+touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
> 
> # libraries {
> build_libdir="%{buildroot}%{_libdir}"
>@@ -508,6 +519,23 @@ exit 0
> %postun -n libsmbclient
> /sbin/ldconfig
> 
>+%postun winbind-krb5-locator 
>+if [ "$1" -ge "1" ]; then
>+        if [ "`readlink %{_sysconfdir}/alternatives/winbind_krb5_locator.so`" == "%{_libdir}/winbind_krb5_locator.so" ]; then
>+                %{_sbindir}/alternatives --set winbind_krb5_locator %{_libdir}/winbind_krb5_locator.so
>+        fi
>+fi
>+
>+%post winbind-krb5-locator
>+%{_sbindir}/update-alternatives --install %{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so \
>+                                winbind_krb5_locator.so %{_libdir}/winbind_krb5_locator.so 10
>+
>+%preun winbind-krb5-locator
>+if [ $1 -eq 0 ]; then
>+        %{_sbindir}/update-alternatives --remove winbind_krb5_locator.so %{_libdir}/winbind_krb5_locator.so
>+fi
>+
>+
> %files
> %defattr(-,root,root)
> %{_sbindir}/smbd
>@@ -650,7 +678,8 @@ exit 0
> %files winbind-krb5-locator
> %defattr(-,root,root)
> %{_mandir}/man7/winbind_krb5_locator.7*
>-%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
>+%ghost %{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
>+%{_libdir}/winbind_krb5_locator.so
> 
> %files doc
> %defattr(-,root,root)
>@@ -682,6 +711,10 @@ exit 0
> %{_datadir}/pixmaps/samba/logo-small.png
> 
> %changelog
>+* Wed Oct 10 2012 - Alexander Bokovoy <abokovoy@redhat.com> - 3.6.8-137
>+- Use alternatives to configure winbind_krb5_locator.so
>+- resolves: #864950
>+
> * Mon Oct 08 2012 - Andreas Schneider <asn@redhat.com> - 3.6.8-136
> - Fix loading the imap hash module.
> - resolves: #864045
>-- 
>1.7.12
>

Actions: View | Diff

Attachments on bug 864950: 624869