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/pdb_compat.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/pdb_compat.c')
-rw-r--r-- | source3/passdb/pdb_compat.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source3/passdb/pdb_compat.c b/source3/passdb/pdb_compat.c index 9967eb53ad..b65be70758 100644 --- a/source3/passdb/pdb_compat.c +++ b/source3/passdb/pdb_compat.c @@ -60,10 +60,9 @@ bool pdb_set_user_sid_from_rid (struct samu *sampass, uint32 rid, enum pdb_value return False; } - sid_copy(&u_sid, global_sam_sid); - - if (!sid_append_rid(&u_sid, rid)) + if (!sid_compose(&u_sid, global_sam_sid, rid)) { return False; + } if (!pdb_set_user_sid(sampass, &u_sid, flag)) return False; @@ -87,10 +86,9 @@ bool pdb_set_group_sid_from_rid (struct samu *sampass, uint32 grid, enum pdb_val return False; } - sid_copy(&g_sid, global_sam_sid); - - if (!sid_append_rid(&g_sid, grid)) + if (!sid_compose(&g_sid, global_sam_sid, grid)) { return False; + } if (!pdb_set_group_sid(sampass, &g_sid, flag)) return False; |