diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-01 04:45:33 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-01 04:45:33 +0100 |
| commit | 08259c1c52a9921de6fba08939130698b474f382 (patch) | |
| tree | 2e563ba2d2dd10d34965f0de5b2c56118065d0f1 /source3/passdb/lookup_sid.c | |
| parent | 2dc045007ef68bc42822471a3a08c8f094e29980 (diff) | |
| download | samba-08259c1c52a9921de6fba08939130698b474f382.tar.gz samba-08259c1c52a9921de6fba08939130698b474f382.tar.bz2 samba-08259c1c52a9921de6fba08939130698b474f382.zip | |
Add iconv_convenience argument to size functions.
Diffstat (limited to 'source3/passdb/lookup_sid.c')
| -rw-r--r-- | source3/passdb/lookup_sid.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c index b9a67f208e..53845117e2 100644 --- a/source3/passdb/lookup_sid.c +++ b/source3/passdb/lookup_sid.c @@ -1014,7 +1014,7 @@ static bool fetch_sid_from_uid_cache(DOM_SID *psid, uid_t uid) 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)); + SMB_ASSERT(cache_value.length == ndr_size_dom_sid(psid, NULL, 0)); return true; } @@ -1028,7 +1028,7 @@ static bool fetch_uid_from_cache( uid_t *puid, const DOM_SID *psid ) DATA_BLOB cache_value; if (!memcache_lookup(NULL, SID_UID_CACHE, - data_blob_const(psid, ndr_size_dom_sid(psid, 0)), + data_blob_const(psid, ndr_size_dom_sid(psid, NULL, 0)), &cache_value)) { return false; } @@ -1046,11 +1046,11 @@ static bool fetch_uid_from_cache( uid_t *puid, const DOM_SID *psid ) void store_uid_sid_cache(const DOM_SID *psid, uid_t uid) { memcache_add(NULL, SID_UID_CACHE, - data_blob_const(psid, ndr_size_dom_sid(psid, 0)), + data_blob_const(psid, ndr_size_dom_sid(psid, NULL, 0)), data_blob_const(&uid, sizeof(uid))); memcache_add(NULL, UID_SID_CACHE, data_blob_const(&uid, sizeof(uid)), - data_blob_const(psid, ndr_size_dom_sid(psid, 0))); + data_blob_const(psid, ndr_size_dom_sid(psid, NULL, 0))); } /***************************************************************** @@ -1069,7 +1069,7 @@ static bool fetch_sid_from_gid_cache(DOM_SID *psid, gid_t gid) 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)); + SMB_ASSERT(cache_value.length == ndr_size_dom_sid(psid, NULL, 0)); return true; } @@ -1083,7 +1083,7 @@ static bool fetch_gid_from_cache(gid_t *pgid, const DOM_SID *psid) DATA_BLOB cache_value; if (!memcache_lookup(NULL, SID_UID_CACHE, - data_blob_const(psid, ndr_size_dom_sid(psid, 0)), + data_blob_const(psid, ndr_size_dom_sid(psid, NULL, 0)), &cache_value)) { return false; } @@ -1101,11 +1101,11 @@ static bool fetch_gid_from_cache(gid_t *pgid, const DOM_SID *psid) void store_gid_sid_cache(const DOM_SID *psid, gid_t gid) { memcache_add(NULL, SID_GID_CACHE, - data_blob_const(psid, ndr_size_dom_sid(psid, 0)), + data_blob_const(psid, ndr_size_dom_sid(psid, NULL, 0)), data_blob_const(&gid, sizeof(gid))); memcache_add(NULL, GID_SID_CACHE, data_blob_const(&gid, sizeof(gid)), - data_blob_const(psid, ndr_size_dom_sid(psid, 0))); + data_blob_const(psid, ndr_size_dom_sid(psid, NULL, 0))); } /***************************************************************** |