sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-05 21:57:51 +03:00
Code

Don't pass DOM_SIDs around when pointers are enough.

Browse Source 
Volker
(This used to be commit 27b27c28cd0421be3121e7f03c237df381c7ecb3)
This commit is contained in:
Volker Lendecke 2004-03-10 16:17:46 +00:00
parent c3d851fc74
commit faab4f3c27
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source3/groupdb/mapping.c
View File

@ -575,7 +575,7 @@ static NTSTATUS enum_aliasmem(const DOM_SID *alias, DOM_SID **sids, int *num)
if (!string_to_sid(&sid, string_sid))
continue;
add_sid_to_array(sid, sids, num);
add_sid_to_array(&sid, sids, num);
if (sids == NULL)
return NT_STATUS_NO_MEMORY;
@ -694,7 +694,7 @@ static NTSTATUS alias_memberships(const DOM_SID *sid, DOM_SID **sids, int *num)
if (is_foreign_alias_member(sid, &maps[i].sid)) {
add_sid_to_array(maps[i].sid, sids, num);
add_sid_to_array(&maps[i].sid, sids, num);
if (sids == NULL) {
SAFE_FREE(maps);
@ -710,7 +710,7 @@ static NTSTATUS alias_memberships(const DOM_SID *sid, DOM_SID **sids, int *num)
for (i=0; i<num_maps; i++) {
if (is_foreign_alias_member(sid, &maps[i].sid)) {
add_sid_to_array(maps[i].sid, sids, num);
add_sid_to_array(&maps[i].sid, sids, num);
if (sids == NULL) {
SAFE_FREE(maps);
@ -1046,7 +1046,7 @@ BOOL get_sid_list_of_group(gid_t gid, DOM_SID **sids, int *num_sids)
NT_STATUS_IS_OK(enum_aliasmem(&sid, &members, &num_members)) ) {
for (i=0; i<num_members; i++) {
add_sid_to_array(members[i], sids, num_sids);
add_sid_to_array(&members[i], sids, num_sids);
if (sids == NULL)
return False;

4
source3/passdb/util_sam_sid.c
View File

@ -306,14 +306,14 @@ BOOL map_name_to_wellknown_sid(DOM_SID *sid, enum SID_NAME_USE *use, const char
return False;
}
void add_sid_to_array(DOM_SID sid, DOM_SID **sids, int *num)
void add_sid_to_array(const DOM_SID *sid, DOM_SID **sids, int *num)
{
*sids = Realloc(*sids, ((*num)+1) * sizeof(DOM_SID));
if (*sids == NULL)
return;
sid_copy(&((*sids)[*num]), &sid);
sid_copy(&((*sids)[*num]), sid);
*num += 1;
return;