summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packaging/RHEL/samba.spec.tmpl1
-rw-r--r--source3/nsswitch/winbindd_sid.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index 627d40eade..d71e5b0766 100644
--- 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 a40d35c582..648d71f2d5 100644
--- 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",