Changeset 136 for trunk/samba/source/passdb/lookup_sid.c

Timestamp:

May 29, 2008, 12:22:03 PM (17 years ago)

Author:

Paul Smedley

Message:

Update trunk to 3.2.0rc1

File:

• trunk/samba/source/passdb/lookup_sid.c (modified) (6 diffs)

trunk/samba/source/passdb/lookup_sid.c

@@ -1013 +1013 @@
         }
 
-        SMB_ASSERT(cache_value.length == sizeof(*psid));
-        memcpy(psid, cache_value.data, sizeof(*psid));
+        memcpy(psid, cache_value.data, MIN(sizeof(*psid), cache_value.length));
+        SMB_ASSERT(cache_value.length >= offsetof(struct dom_sid, id_auth));
+        SMB_ASSERT(cache_value.length == ndr_size_dom_sid(psid, 0));
 
         return true;
@@ -1028 +1029 @@
 
         if (!memcache_lookup(NULL, SID_UID_CACHE,
-                             data_blob_const(psid, sizeof(*psid)),
+                             data_blob_const(psid, ndr_size_dom_sid(psid, 0)),
                              &cache_value)) {
                 return false;
@@ -1046 +1047 @@
 {
         memcache_add(NULL, SID_UID_CACHE,
-                     data_blob_const(psid, sizeof(*psid)),
+                     data_blob_const(psid, ndr_size_dom_sid(psid, 0)),
                      data_blob_const(&uid, sizeof(uid)));
         memcache_add(NULL, UID_SID_CACHE,
                      data_blob_const(&uid, sizeof(uid)),
-                     data_blob_const(psid, sizeof(*psid)));
+                     data_blob_const(psid, ndr_size_dom_sid(psid, 0)));
 }
 
@@ -1067 +1068 @@
         }
 
-        SMB_ASSERT(cache_value.length == sizeof(*psid));
-        memcpy(psid, cache_value.data, sizeof(*psid));
+        memcpy(psid, cache_value.data, MIN(sizeof(*psid), cache_value.length));
+        SMB_ASSERT(cache_value.length >= offsetof(struct dom_sid, id_auth));
+        SMB_ASSERT(cache_value.length == ndr_size_dom_sid(psid, 0));
 
         return true;
@@ -1082 +1084 @@
 
         if (!memcache_lookup(NULL, SID_UID_CACHE,
-                             data_blob_const(psid, sizeof(*psid)),
+                             data_blob_const(psid, ndr_size_dom_sid(psid, 0)),
                              &cache_value)) {
                 return false;
@@ -1100 +1102 @@
 {
         memcache_add(NULL, SID_GID_CACHE,
-                     data_blob_const(psid, sizeof(*psid)),
+                     data_blob_const(psid, ndr_size_dom_sid(psid, 0)),
                      data_blob_const(&gid, sizeof(gid)));
         memcache_add(NULL, GID_SID_CACHE,
                      data_blob_const(&gid, sizeof(gid)),
-                     data_blob_const(psid, sizeof(*psid)));
+                     data_blob_const(psid, ndr_size_dom_sid(psid, 0)));
 }