diff options
| author | Volker Lendecke <vl@samba.org> | 2011-08-17 12:18:14 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2011-08-17 12:30:08 +0200 |
| commit | 8fd5e0ff2e08288d499556b5b48dcc7a9a3fc85f (patch) | |
| tree | 1413c297fb202de35eedb1f5a6bef7bce3563d50 /source3 | |
| parent | 102f39ae3e7df26faf81595c8e0120b2e2a45bbd (diff) | |
| download | samba-8fd5e0ff2e08288d499556b5b48dcc7a9a3fc85f.tar.gz samba-8fd5e0ff2e08288d499556b5b48dcc7a9a3fc85f.tar.bz2 samba-8fd5e0ff2e08288d499556b5b48dcc7a9a3fc85f.zip | |
Replace calls to sid_equal with calls to dom_sid_equal
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/modules/onefs_acl.c | 10 | ||||
| -rw-r--r-- | source3/torture/pdbtest.c | 3 | ||||
| -rw-r--r-- | source3/winbindd/wb_lookupsids.c | 2 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_cache.c | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/source3/modules/onefs_acl.c b/source3/modules/onefs_acl.c index f78d1f0e2e..749ddec3da 100644 --- a/source3/modules/onefs_acl.c +++ b/source3/modules/onefs_acl.c @@ -46,13 +46,13 @@ onefs_sid_to_identity(const struct dom_sid *sid, struct ifs_identity *id, uid_t uid = 0; gid_t gid = 0; - if (!sid || sid_equal(sid, &global_sid_NULL)) + if (!sid || dom_sid_equal(sid, &global_sid_NULL)) type = IFS_ID_TYPE_NULL; - else if (sid_equal(sid, &global_sid_World)) + else if (dom_sid_equal(sid, &global_sid_World)) type = IFS_ID_TYPE_EVERYONE; - else if (sid_equal(sid, &global_sid_Creator_Owner)) + else if (dom_sid_equal(sid, &global_sid_Creator_Owner)) type = IFS_ID_TYPE_CREATOR_OWNER; - else if (sid_equal(sid, &global_sid_Creator_Group)) + else if (dom_sid_equal(sid, &global_sid_Creator_Group)) type = IFS_ID_TYPE_CREATOR_GROUP; else if (is_group) { if (!sid_to_gid(sid, &gid)) @@ -156,7 +156,7 @@ sid_in_ignore_list(struct dom_sid * sid, int snum) while (*sid_list) { if (string_to_sid(&match, *sid_list)) - if (sid_equal(sid, &match)) + if (dom_sid_equal(sid, &match)) return true; sid_list++; } diff --git a/source3/torture/pdbtest.c b/source3/torture/pdbtest.c index 65f5188cc0..2f4909a68b 100644 --- a/source3/torture/pdbtest.c +++ b/source3/torture/pdbtest.c @@ -438,7 +438,8 @@ int main(int argc, char **argv) if (!strequal(td->domain_name, new_td->domain_name) || !strequal(td->netbios_name, new_td->netbios_name) || - !sid_equal(&td->security_identifier, &new_td->security_identifier) || + !dom_sid_equal(&td->security_identifier, + &new_td->security_identifier) || td->trust_direction != new_td->trust_direction || td->trust_type != new_td->trust_type || td->trust_attributes != new_td->trust_attributes || diff --git a/source3/winbindd/wb_lookupsids.c b/source3/winbindd/wb_lookupsids.c index b4b7b9c8cb..e896860e01 100644 --- a/source3/winbindd/wb_lookupsids.c +++ b/source3/winbindd/wb_lookupsids.c @@ -367,7 +367,7 @@ static bool wb_lookupsids_find_dom_idx(struct lsa_DomainInfo *domain, struct lsa_DomainInfo *new_domain; for (i=0; i<list->count; i++) { - if (sid_equal(domain->sid, list->domains[i].sid)) { + if (dom_sid_equal(domain->sid, list->domains[i].sid)) { *idx = i; return true; } diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c index 58a8e710f6..ec5f9e74ba 100644 --- a/source3/winbindd/winbindd_cache.c +++ b/source3/winbindd/winbindd_cache.c @@ -4571,7 +4571,7 @@ struct winbindd_tdc_domain* wcache_tdc_fetch_list(&dom_list, &num_domains); for (i = 0; i<num_domains; i++) { - if (sid_equal(sid, &(dom_list[i].sid))) { + if (dom_sid_equal(sid, &(dom_list[i].sid))) { DEBUG(10, ("wcache_tdc_fetch_domainbysid: " "Found domain %s for SID %s\n", dom_list[i].domain_name, |