summaryrefslogtreecommitdiff
path: root/source3/passdb
diff options
context:
space:
mode:
Diffstat (limited to 'source3/passdb')
-rw-r--r--source3/passdb/lookup_sid.c16
-rw-r--r--source3/passdb/secrets.c6
2 files changed, 11 insertions, 11 deletions
diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c
index 4181f2b293..ff8777493a 100644
--- a/source3/passdb/lookup_sid.c
+++ b/source3/passdb/lookup_sid.c
@@ -1024,7 +1024,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, NULL, 0));
+ SMB_ASSERT(cache_value.length == ndr_size_dom_sid(psid, 0));
return true;
}
@@ -1038,7 +1038,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, NULL, 0)),
+ data_blob_const(psid, ndr_size_dom_sid(psid, 0)),
&cache_value)) {
return false;
}
@@ -1056,11 +1056,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, NULL, 0)),
+ 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, ndr_size_dom_sid(psid, NULL, 0)));
+ data_blob_const(psid, ndr_size_dom_sid(psid, 0)));
}
/*****************************************************************
@@ -1079,7 +1079,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, NULL, 0));
+ SMB_ASSERT(cache_value.length == ndr_size_dom_sid(psid, 0));
return true;
}
@@ -1093,7 +1093,7 @@ static bool fetch_gid_from_cache(gid_t *pgid, const DOM_SID *psid)
DATA_BLOB cache_value;
if (!memcache_lookup(NULL, SID_GID_CACHE,
- data_blob_const(psid, ndr_size_dom_sid(psid, NULL, 0)),
+ data_blob_const(psid, ndr_size_dom_sid(psid, 0)),
&cache_value)) {
return false;
}
@@ -1111,11 +1111,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, NULL, 0)),
+ 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, ndr_size_dom_sid(psid, NULL, 0)));
+ data_blob_const(psid, ndr_size_dom_sid(psid, 0)));
}
/*****************************************************************
diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c
index 74411017c4..6d4fd2a41d 100644
--- a/source3/passdb/secrets.c
+++ b/source3/passdb/secrets.c
@@ -498,7 +498,7 @@ bool secrets_fetch_trusted_domain_password(const char *domain, char** pwd,
}
/* unpack trusted domain password */
- ndr_err = ndr_pull_struct_blob(&blob, talloc_tos(), NULL, &pass,
+ ndr_err = ndr_pull_struct_blob(&blob, talloc_tos(), &pass,
(ndr_pull_flags_fn_t)ndr_pull_TRUSTED_DOM_PASS);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
return false;
@@ -557,7 +557,7 @@ bool secrets_store_trusted_domain_password(const char* domain, const char* pwd,
/* domain sid */
sid_copy(&pass.domain_sid, sid);
- ndr_err = ndr_push_struct_blob(&blob, talloc_tos(), NULL, &pass,
+ ndr_err = ndr_push_struct_blob(&blob, talloc_tos(), &pass,
(ndr_push_flags_fn_t)ndr_push_TRUSTED_DOM_PASS);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
return false;
@@ -789,7 +789,7 @@ static int list_trusted_domain(struct db_record *rec, void *private_data)
blob = data_blob_const(rec->value.dptr, rec->value.dsize);
- ndr_err = ndr_pull_struct_blob(&blob, talloc_tos(), NULL, &pass,
+ ndr_err = ndr_pull_struct_blob(&blob, talloc_tos(), &pass,
(ndr_pull_flags_fn_t)ndr_pull_TRUSTED_DOM_PASS);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
return false;