diff options
| author | Nadezhda Ivanova <nadezhda.ivanova@postpath.com> | 2010-01-13 12:02:31 +0200 |
|---|---|---|
| committer | Nadezhda Ivanova <nadezhda.ivanova@postpath.com> | 2010-01-13 12:02:31 +0200 |
| commit | 9b3871ed293f76e770e572cd6b59f59670f1f6f8 (patch) | |
| tree | 2b79286e3a6f7af9e26466393a0b26075a238be8 /source3/passdb/pdb_compat.c | |
| parent | 309473f938d18b9993c2c4f120eeff7b4641985a (diff) | |
| parent | ca847952054f5bbde1d40ad4260589b6fcc9721d (diff) | |
| download | samba-9b3871ed293f76e770e572cd6b59f59670f1f6f8.tar.gz samba-9b3871ed293f76e770e572cd6b59f59670f1f6f8.tar.bz2 samba-9b3871ed293f76e770e572cd6b59f59670f1f6f8.zip | |
Merge branch 'master' of git://git.samba.org/samba
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; |