r21915: grab the sid_peek_check_rid() fix from 3.0.25 and the release notes

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 9c6bccc33d7f77da5bac3e3f4dc604d7c36ca511..a7f02cbf7f09e43485152eddcc87370aece86f09 100644 (file)
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -82,6 +82,8 @@ smb.conf changes
     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
 
 

diff --git a/source/nsswitch/winbindd_util.c b/source/nsswitch/winbindd_util.c
index 72c85a9c6a4d3d666f73767a9a902c4333ae8f3f..cbd76754bbdd18be3b3cb175e7c517aa2a155ec8 100644 (file)
--- a/source/nsswitch/winbindd_util.c
+++ b/source/nsswitch/winbindd_util.c
@@ -603,8 +603,13 @@ struct winbindd_domain *find_domain_from_sid_noinit(const DOM_SID *sid)
        /* 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 */