Author: jerry Date: 2007-04-22 09:32:14 +0000 (Sun, 22 Apr 2007) New Revision: 22444
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22444 Log: * 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 Modified: branches/SAMBA_3_0/packaging/RHEL/samba.spec.tmpl branches/SAMBA_3_0/source/nsswitch/winbindd_sid.c branches/SAMBA_3_0_25/packaging/RHEL/samba.spec.tmpl branches/SAMBA_3_0_25/source/nsswitch/winbindd_sid.c branches/SAMBA_3_0_RELEASE/packaging/RHEL/samba.spec.tmpl branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_sid.c Changeset: Modified: branches/SAMBA_3_0/packaging/RHEL/samba.spec.tmpl =================================================================== --- branches/SAMBA_3_0/packaging/RHEL/samba.spec.tmpl 2007-04-22 09:17:25 UTC (rev 22443) +++ branches/SAMBA_3_0/packaging/RHEL/samba.spec.tmpl 2007-04-22 09:32:14 UTC (rev 22444) @@ -372,6 +372,7 @@ %{_bindir}/eventlogadm %{_libdir}/samba/idmap/*.so +%{_libdir}/samba/nss_info/*.so %{_libdir}/samba/vfs/*.so %{_libdir}/samba/auth/*.so Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_sid.c =================================================================== --- branches/SAMBA_3_0/source/nsswitch/winbindd_sid.c 2007-04-22 09:17:25 UTC (rev 22443) +++ branches/SAMBA_3_0/source/nsswitch/winbindd_sid.c 2007-04-22 09:32:14 UTC (rev 22444) @@ -199,7 +199,7 @@ 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 @@ 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", Modified: branches/SAMBA_3_0_25/packaging/RHEL/samba.spec.tmpl =================================================================== --- branches/SAMBA_3_0_25/packaging/RHEL/samba.spec.tmpl 2007-04-22 09:17:25 UTC (rev 22443) +++ branches/SAMBA_3_0_25/packaging/RHEL/samba.spec.tmpl 2007-04-22 09:32:14 UTC (rev 22444) @@ -372,6 +372,7 @@ %{_bindir}/eventlogadm %{_libdir}/samba/idmap/*.so +%{_libdir}/samba/nss_info/*.so %{_libdir}/samba/vfs/*.so %{_libdir}/samba/auth/*.so Modified: branches/SAMBA_3_0_25/source/nsswitch/winbindd_sid.c =================================================================== --- branches/SAMBA_3_0_25/source/nsswitch/winbindd_sid.c 2007-04-22 09:17:25 UTC (rev 22443) +++ branches/SAMBA_3_0_25/source/nsswitch/winbindd_sid.c 2007-04-22 09:32:14 UTC (rev 22444) @@ -199,7 +199,7 @@ 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 @@ 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", Modified: branches/SAMBA_3_0_RELEASE/packaging/RHEL/samba.spec.tmpl =================================================================== --- branches/SAMBA_3_0_RELEASE/packaging/RHEL/samba.spec.tmpl 2007-04-22 09:17:25 UTC (rev 22443) +++ branches/SAMBA_3_0_RELEASE/packaging/RHEL/samba.spec.tmpl 2007-04-22 09:32:14 UTC (rev 22444) @@ -372,6 +372,7 @@ %{_bindir}/eventlogadm %{_libdir}/samba/idmap/*.so +%{_libdir}/samba/nss_info/*.so %{_libdir}/samba/vfs/*.so %{_libdir}/samba/auth/*.so Modified: branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_sid.c =================================================================== --- branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_sid.c 2007-04-22 09:17:25 UTC (rev 22443) +++ branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_sid.c 2007-04-22 09:32:14 UTC (rev 22444) @@ -199,7 +199,7 @@ 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 @@ 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",
