[cifs-utils] Allow setcifsacl to work without functioning plugin

[Jeff Layton]

commit fb38774a7f96a6507abbed59a30eb916ab501da7
Author: Jeff Layton <jlayton at redhat.com>
Date:   Mon Jul 15 11:33:58 2013 -0400

    Allow setcifsacl to work without functioning plugin
    
    We can allow setcifsacl to continue to work with numeric SIDs, even if
    the plugin can't be loaded for some reason.
    
    Signed-off-by: Jeff Layton <jlayton at redhat.com>

 cifs-utils.spec |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/cifs-utils.spec b/cifs-utils.spec
index 3cea5cf..fe3c80c 100644
--- a/cifs-utils.spec
+++ b/cifs-utils.spec
@@ -3,7 +3,7 @@
 
 Name:            cifs-utils
 Version:         6.1
-Release:         2%{pre_release}%{?dist}
+Release:         3%{pre_release}%{?dist}
 Summary:         Utilities for mounting and managing CIFS mounts
 
 Group:           System Environment/Daemons
@@ -18,6 +18,7 @@ Requires(post):  /usr/sbin/alternatives
 Requires(preun): /usr/sbin/alternatives
 
 Source0:         ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/%{name}-%{version}%{pre_release}.tar.bz2
+Patch1:          0001-setcifsacl-add-fallback-for-when-plugin-can-t-be-loa.patch
 
 %description
 The SMB/CIFS protocol is a standard file sharing protocol widely deployed
@@ -38,6 +39,7 @@ necessary for building ID mapping plugins for cifs-utils.
 
 %prep
 %setup -q -n %{name}-%{version}%{pre_release}
+%patch1 -p1
 
 %build
 %configure --prefix=/usr ROOTSBINDIR=%{_sbindir}
@@ -87,8 +89,11 @@ fi
 %{_includedir}/cifsidmap.h
 
 %changelog
+* Mon Jul 15 2013 Jeff Layton <jlayton at redhat.com> 6.1-3
+- allow setcifsacl to work if plugin can't be loaded (bz#984087)
+
 * Mon Jul 15 2013 Jeff Layton <jlayton at redhat.com> 6.1-2
-- Convert idmapping plugin symlink to use alternatives system
+- Convert idmapping plugin symlink to use alternatives system (bz#984088)
 
 * Tue Jul 02 2013 Jeff Layton <jlayton at redhat.com> 6.1-1
 - update to 6.1 release