diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-08-08 08:26:40 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:38:34 -0500 |
| commit | ff7c0a7c357ab8a0ff9de6d18988933e0b398780 (patch) | |
| tree | 2382be5d0e35e3ae184413a1668a53e56fb6738d /source3/utils/net_rpc_samsync.c | |
| parent | 175aa92e9e2fa4aa9d0c2fc9d7001ce4fae61a14 (diff) | |
| download | samba-ff7c0a7c357ab8a0ff9de6d18988933e0b398780.tar.gz samba-ff7c0a7c357ab8a0ff9de6d18988933e0b398780.tar.bz2 samba-ff7c0a7c357ab8a0ff9de6d18988933e0b398780.zip | |
r17451: Change pdb_getgrsid not to take a DOM_SID but a const DOM_SID * as an
argument.
Volker
(This used to be commit 873a5a1211d185fd50e7167d88cbc869f70dfd3f)
Diffstat (limited to 'source3/utils/net_rpc_samsync.c')
| -rw-r--r-- | source3/utils/net_rpc_samsync.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c index bbe09a3b35..fe3c919d9a 100644 --- a/source3/utils/net_rpc_samsync.c +++ b/source3/utils/net_rpc_samsync.c @@ -588,7 +588,7 @@ static NTSTATUS fetch_account_info(uint32 rid, SAM_ACCOUNT_INFO *delta) group_sid = *pdb_get_group_sid(sam_account); - if (!pdb_getgrsid(&map, group_sid)) { + if (!pdb_getgrsid(&map, &group_sid)) { DEBUG(0, ("Primary group of %s has no mapping!\n", pdb_get_username(sam_account))); } else { @@ -630,7 +630,7 @@ static NTSTATUS fetch_group_info(uint32 rid, SAM_GROUP_INFO *delta) sid_append_rid(&group_sid, rid); sid_to_string(sid_string, &group_sid); - if (pdb_getgrsid(&map, group_sid)) { + if (pdb_getgrsid(&map, &group_sid)) { if ( map.gid != -1 ) grp = getgrgid(map.gid); insert = False; @@ -689,7 +689,7 @@ static NTSTATUS fetch_group_mem_info(uint32 rid, SAM_GROUP_MEM_INFO *delta) sid_copy(&group_sid, get_global_sam_sid()); sid_append_rid(&group_sid, rid); - if (!get_domain_group_from_sid(group_sid, &map)) { + if (!get_domain_group_from_sid(&group_sid, &map)) { DEBUG(0, ("Could not find global group %d\n", rid)); return NT_STATUS_NO_SUCH_GROUP; } @@ -805,7 +805,6 @@ static NTSTATUS fetch_alias_info(uint32 rid, SAM_ALIAS_INFO *delta, fstring comment; struct group *grp = NULL; DOM_SID alias_sid; - fstring sid_string; GROUP_MAP map; BOOL insert = True; @@ -815,9 +814,8 @@ static NTSTATUS fetch_alias_info(uint32 rid, SAM_ALIAS_INFO *delta, /* Find out whether the group is already mapped */ sid_copy(&alias_sid, &dom_sid); sid_append_rid(&alias_sid, rid); - sid_to_string(sid_string, &alias_sid); - if (pdb_getgrsid(&map, alias_sid)) { + if (pdb_getgrsid(&map, &alias_sid)) { grp = getgrgid(map.gid); insert = False; } |