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/auth | |
| 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/auth')
| -rw-r--r-- | source3/auth/auth_util.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c index 9db358d965..de552cf57e 100644 --- a/source3/auth/auth_util.c +++ b/source3/auth/auth_util.c @@ -1274,8 +1274,7 @@ static NTSTATUS make_new_server_info_guest(struct auth_serversupplied_info **ser return NT_STATUS_NO_MEMORY; } - sid_copy(&guest_sid, get_global_sam_sid()); - sid_append_rid(&guest_sid, DOMAIN_USER_RID_GUEST); + sid_compose(&guest_sid, get_global_sam_sid(), DOMAIN_USER_RID_GUEST); become_root(); ret = pdb_getsampwsid(sampass, &guest_sid); @@ -1645,13 +1644,12 @@ NTSTATUS make_server_info_info3(TALLOC_CTX *mem_ctx, matches. */ - sid_copy(&user_sid, info3->base.domain_sid); - if (!sid_append_rid(&user_sid, info3->base.rid)) { + if (!sid_compose(&user_sid, info3->base.domain_sid, info3->base.rid)) { return NT_STATUS_INVALID_PARAMETER; } - sid_copy(&group_sid, info3->base.domain_sid); - if (!sid_append_rid(&group_sid, info3->base.primary_gid)) { + if (!sid_compose(&group_sid, info3->base.domain_sid, + info3->base.primary_gid)) { return NT_STATUS_INVALID_PARAMETER; } |