[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2274-g7fa2f4f

[Volker Lendecke]

The branch, v3-2-test has been updated
       via  7fa2f4f9b2a17eb5a3ba787cc90b22afbe6c3c5c (commit)
      from  90c37a7c2cdac3de0b75f889d63f5fe1b87a48e3 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 7fa2f4f9b2a17eb5a3ba787cc90b22afbe6c3c5c
Author: Volker Lendecke <vl at samba.org>
Date:   Tue May 6 13:53:45 2008 +0200

    Fix a panic in the [ug]id2sid valgrind bug fix
    
    Always, always run "make test" before pushing stuff :-)

-----------------------------------------------------------------------

Summary of changes:
 source/passdb/lookup_sid.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/passdb/lookup_sid.c b/source/passdb/lookup_sid.c
index debd67b..a7175b9 100644
--- a/source/passdb/lookup_sid.c
+++ b/source/passdb/lookup_sid.c
@@ -1012,8 +1012,9 @@ static bool fetch_sid_from_uid_cache(DOM_SID *psid, uid_t uid)
 		return false;
 	}
 
-	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;
 }
@@ -1066,8 +1067,9 @@ static bool fetch_sid_from_gid_cache(DOM_SID *psid, gid_t gid)
 		return false;
 	}
 
-	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;
 }


-- 
Samba Shared Repository