diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2002-11-02 03:47:48 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2002-11-02 03:47:48 +0000 |
| commit | 6d7195d1d79c43f5ccc8dc4a9215c02177d5fa89 (patch) | |
| tree | bd5e6a9c83f8fa55c98750ce555c66f0c109f569 /source3/passdb/pdb_compat.c | |
| parent | aea57af3e38873e808afc3c742ba46527f686f6f (diff) | |
| download | samba-6d7195d1d79c43f5ccc8dc4a9215c02177d5fa89.tar.gz samba-6d7195d1d79c43f5ccc8dc4a9215c02177d5fa89.tar.bz2 samba-6d7195d1d79c43f5ccc8dc4a9215c02177d5fa89.zip | |
Merge passdb from HEAD -> 3.0
The work here includes:
- metze' set/changed patch, which avoids making changes to ldap on unmodified
attributes.
- volker's group mapping in passdb patch
- volker's samsync stuff
- volkers SAMR changes.
- mezte's connection caching patch
- my recent changes (fix magic root check, ldap ssl)
Andrew Bartlett
(This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
Diffstat (limited to 'source3/passdb/pdb_compat.c')
| -rw-r--r-- | source3/passdb/pdb_compat.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/passdb/pdb_compat.c b/source3/passdb/pdb_compat.c index 713c92e3ac..abd572a7c1 100644 --- a/source3/passdb/pdb_compat.c +++ b/source3/passdb/pdb_compat.c @@ -48,7 +48,7 @@ uint32 pdb_get_group_rid (const SAM_ACCOUNT *sampass) return (0); } -BOOL pdb_set_user_sid_from_rid (SAM_ACCOUNT *sampass, uint32 rid) +BOOL pdb_set_user_sid_from_rid (SAM_ACCOUNT *sampass, uint32 rid, enum pdb_value_state flag) { DOM_SID u_sid; const DOM_SID *global_sam_sid; @@ -66,7 +66,7 @@ BOOL pdb_set_user_sid_from_rid (SAM_ACCOUNT *sampass, uint32 rid) if (!sid_append_rid(&u_sid, rid)) return False; - if (!pdb_set_user_sid(sampass, &u_sid)) + if (!pdb_set_user_sid(sampass, &u_sid, flag)) return False; DEBUG(10, ("pdb_set_user_sid_from_rid:\n\tsetting user sid %s from rid %d\n", @@ -75,7 +75,7 @@ BOOL pdb_set_user_sid_from_rid (SAM_ACCOUNT *sampass, uint32 rid) return True; } -BOOL pdb_set_group_sid_from_rid (SAM_ACCOUNT *sampass, uint32 grid) +BOOL pdb_set_group_sid_from_rid (SAM_ACCOUNT *sampass, uint32 grid, enum pdb_value_state flag) { DOM_SID g_sid; const DOM_SID *global_sam_sid; @@ -93,7 +93,7 @@ BOOL pdb_set_group_sid_from_rid (SAM_ACCOUNT *sampass, uint32 grid) if (!sid_append_rid(&g_sid, grid)) return False; - if (!pdb_set_group_sid(sampass, &g_sid)) + if (!pdb_set_group_sid(sampass, &g_sid, flag)) return False; DEBUG(10, ("pdb_set_group_sid_from_rid:\n\tsetting group sid %s from rid %d\n", |