Author: jerry Date: 2007-03-21 17:59:29 +0000 (Wed, 21 Mar 2007) New Revision: 21915
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21915 Log: grab the sid_peek_check_rid() fix from 3.0.25 and the release notes Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_util.c Changeset: Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt =================================================================== --- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2007-03-21 17:54:49 UTC (rev 21914) +++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2007-03-21 17:59:29 UTC (rev 21915) @@ -82,6 +82,8 @@ Parameter Name Description Default -------------- ----------- ------- debug prefix timestamp New No + idmap cache time Renamed 900 + idmap negative cache time Renamed 120 lock spin count Removed n/a Modified: branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_util.c =================================================================== --- branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_util.c 2007-03-21 17:54:49 UTC (rev 21914) +++ branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_util.c 2007-03-21 17:59:29 UTC (rev 21915) @@ -603,8 +603,13 @@ /* Search through list */ for (domain = domain_list(); domain != NULL; domain = domain->next) { - if (sid_compare_domain(sid, &domain->sid) == 0) + /* We need to use sid_peek_check_rid, because we want + * to make sure that the SIDs we send to the backends are + * as specific as possible. + */ + if (sid_peek_check_rid(&domain->sid, sid, &discard)) { return domain; + } } /* Not found */
