diff options
| author | Volker Lendecke <vl@samba.org> | 2010-01-10 17:39:27 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-01-10 20:56:16 +0100 |
| commit | 3ea64e0ad86c35e5f0018ac60571e7a31a968543 (patch) | |
| tree | 466ba7bc27e51491a9f64339e988a5468e5bd733 /source3/passdb/lookup_sid.c | |
| parent | 50b7a3233f1edc184acb0b65870fff1db1226ef4 (diff) | |
| download | samba-3ea64e0ad86c35e5f0018ac60571e7a31a968543.tar.gz samba-3ea64e0ad86c35e5f0018ac60571e7a31a968543.tar.bz2 samba-3ea64e0ad86c35e5f0018ac60571e7a31a968543.zip | |
s3: Replace most calls to sid_append_rid() by sid_compose()
Diffstat (limited to 'source3/passdb/lookup_sid.c')
| -rw-r--r-- | source3/passdb/lookup_sid.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c index a197c51ac8..4421d89c3a 100644 --- a/source3/passdb/lookup_sid.c +++ b/source3/passdb/lookup_sid.c @@ -75,8 +75,7 @@ bool lookup_name(TALLOC_CTX *mem_ctx, /* It's our own domain, lookup the name in passdb */ if (lookup_global_sam_name(name, flags, &rid, &type)) { - sid_copy(&sid, get_global_sam_sid()); - sid_append_rid(&sid, rid); + sid_compose(&sid, get_global_sam_sid(), rid); goto ok; } TALLOC_FREE(tmp_ctx); @@ -96,8 +95,7 @@ bool lookup_name(TALLOC_CTX *mem_ctx, /* Explicit request for a name in BUILTIN */ if (lookup_builtin_name(name, &rid)) { - sid_copy(&sid, &global_sid_Builtin); - sid_append_rid(&sid, rid); + sid_compose(&sid, &global_sid_Builtin, rid); type = SID_NAME_ALIAS; goto ok; } @@ -215,8 +213,7 @@ bool lookup_name(TALLOC_CTX *mem_ctx, lookup_builtin_name(name, &rid)) { domain = talloc_strdup(tmp_ctx, builtin_domain_name()); - sid_copy(&sid, &global_sid_Builtin); - sid_append_rid(&sid, rid); + sid_compose(&sid, &global_sid_Builtin, rid); type = SID_NAME_ALIAS; goto ok; } @@ -230,8 +227,7 @@ bool lookup_name(TALLOC_CTX *mem_ctx, lookup_global_sam_name(name, flags, &rid, &type)) { domain = talloc_strdup(tmp_ctx, get_global_sam_name()); - sid_copy(&sid, get_global_sam_sid()); - sid_append_rid(&sid, rid); + sid_compose(&sid, get_global_sam_sid(), rid); goto ok; } @@ -544,8 +540,7 @@ static bool lookup_rids(TALLOC_CTX *mem_ctx, const DOM_SID *domain_sid, if (sid_check_is_wellknown_domain(domain_sid, NULL)) { for (i=0; i<num_rids; i++) { DOM_SID sid; - sid_copy(&sid, domain_sid); - sid_append_rid(&sid, rids[i]); + sid_compose(&sid, domain_sid, rids[i]); if (lookup_wellknown_sid(mem_ctx, &sid, domain_name, &(*names)[i])) { if ((*names)[i] == NULL) { |