r22444: * Validate a SID before trying to convert it to a uid/gid via the public

  winbindd interface

* Add nss_info/*so files to the RHEL/Fedora packaging
(This used to be commit 1787fcb8c1199215fcec74472c727b8c8fbf5473)

diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index 627d40eade2a45357e9199cdcf547df0ee31d4ac..d71e5b07668fd70b55b0f411262a4b61973dd23a 100644 (file)
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -372,6 +372,7 @@ fi
 %{_bindir}/eventlogadm
 
 %{_libdir}/samba/idmap/*.so
+%{_libdir}/samba/nss_info/*.so
 %{_libdir}/samba/vfs/*.so
 %{_libdir}/samba/auth/*.so
 

diff --git a/source3/nsswitch/winbindd_sid.c b/source3/nsswitch/winbindd_sid.c
index a40d35c582068795842e13f0a2eaf7b63e8a9a90..648d71f2d5da32e1eb5780a20edad47ea77085d1 100644 (file)
--- a/source3/nsswitch/winbindd_sid.c
+++ b/source3/nsswitch/winbindd_sid.c
@@ -199,7 +199,7 @@ static void sid2uid_lookupsid_recv( void *private_data, BOOL success,
                return;
        }
 
-       if ( (type!=SID_NAME_USER) || (type!=SID_NAME_COMPUTER) ) {
+       if ( (type!=SID_NAME_USER) && (type!=SID_NAME_COMPUTER) ) {
                DEBUG(5,("sid2uid_lookupsid_recv: Sid %s is not a user or a computer.\n", 
                         state->request.data.sid));
                request_error(state);
@@ -276,8 +276,8 @@ static void sid2gid_lookupsid_recv( void *private_data, BOOL success,
                return;
        }
 
-       if ( (type!=SID_NAME_DOM_GRP) || 
-            (type!=SID_NAME_ALIAS) ||
+       if ( (type!=SID_NAME_DOM_GRP) &&
+            (type!=SID_NAME_ALIAS) && 
             (type!=SID_NAME_WKN_GRP) ) 
        {
                DEBUG(5,("sid2gid_lookupsid_recv: Sid %s is not a group.\n",