diff options
| author | Günther Deschner <gd@samba.org> | 2009-06-12 15:20:48 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2009-07-13 15:36:07 +0200 |
| commit | 05fbe0c7f763fbe8c1c48eb82ebdfe04bfa034ea (patch) | |
| tree | 78154513ca730597fd302220e49a4b79c5606274 /source3/passdb | |
| parent | 8db45607f8d19781d33ebff0d0b13c473f34009b (diff) | |
| download | samba-05fbe0c7f763fbe8c1c48eb82ebdfe04bfa034ea.tar.gz samba-05fbe0c7f763fbe8c1c48eb82ebdfe04bfa034ea.tar.bz2 samba-05fbe0c7f763fbe8c1c48eb82ebdfe04bfa034ea.zip | |
libds: merge the UF<->ACB flag mapping functions.
Guenther
Diffstat (limited to 'source3/passdb')
| -rw-r--r-- | source3/passdb/pdb_ads.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/passdb/pdb_ads.c b/source3/passdb/pdb_ads.c index ddfeb8ed80..4f7c210915 100644 --- a/source3/passdb/pdb_ads.c +++ b/source3/passdb/pdb_ads.c @@ -250,7 +250,7 @@ static NTSTATUS pdb_ads_init_sam_from_priv(struct pdb_methods *m, DEBUG(10, ("Could not pull userAccountControl\n")); goto fail; } - pdb_set_acct_ctrl(sam, ads_uf2acb(n), PDB_SET); + pdb_set_acct_ctrl(sam, ds_uf2acb(n), PDB_SET); if (tldap_get_single_valueblob(entry, "unicodePwd", &blob)) { if (blob.length != NT_HASH_LEN) { @@ -310,7 +310,7 @@ static bool pdb_ads_init_ads_from_sam(struct pdb_ads_state *state, ret &= tldap_make_mod_fmt( existing, mem_ctx, pnum_mods, pmods, "userAccountControl", - "%d", ads_acb2uf(pdb_get_acct_ctrl(sam))); + "%d", ds_acb2uf(pdb_get_acct_ctrl(sam))); ret &= tldap_make_mod_fmt( existing, mem_ctx, pnum_mods, pmods, "homeDirectory", @@ -1682,7 +1682,7 @@ static NTSTATUS pdb_ads_lookup_rids(struct pdb_methods *m, DEBUG(10, ("no samAccountType")); continue; } - lsa_attrs[i] = ads_atype_map(attr); + lsa_attrs[i] = ds_atype_map(attr); num_mapped += 1; } |