diff options
| author | Gerald Carter <jerry@samba.org> | 2007-04-22 09:32:14 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:19:34 -0500 |
| commit | 026852b47ad99ef507739269a81909d9dfdd3f3e (patch) | |
| tree | 0c5ab4b0386be77f8f37678da195539e18b22cc3 | |
| parent | 821bf2bd7278da4e71fcdcfc03348a712cd0fc90 (diff) | |
| download | samba-026852b47ad99ef507739269a81909d9dfdd3f3e.tar.gz samba-026852b47ad99ef507739269a81909d9dfdd3f3e.tar.bz2 samba-026852b47ad99ef507739269a81909d9dfdd3f3e.zip | |
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)
| -rw-r--r-- | packaging/RHEL/samba.spec.tmpl | 1 | ||||
| -rw-r--r-- | source3/nsswitch/winbindd_sid.c | 6 |
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", |