summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-02-05 15:40:12 +0100
committerVolker Lendecke <vl@samba.org>2010-02-05 21:11:17 +0100
commit004e3e400d0f404ffd9515c1f502c5287a4bff1c (patch)
tree69a8072361fed9b65aa832c3811ae856bb9027bf /source3
parent1cd7223b8e380813b5324eb903e980c6eeefda5f (diff)
downloadsamba-004e3e400d0f404ffd9515c1f502c5287a4bff1c.tar.gz
samba-004e3e400d0f404ffd9515c1f502c5287a4bff1c.tar.bz2
samba-004e3e400d0f404ffd9515c1f502c5287a4bff1c.zip
s3: Hide some uses of pdb_get_init_flags (which I would love to remove...)
Diffstat (limited to 'source3')
-rw-r--r--source3/passdb/pdb_get_set.c2
-rw-r--r--source3/passdb/pdb_ldap.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/passdb/pdb_get_set.c b/source3/passdb/pdb_get_set.c
index 555b20730c..becd87fe8d 100644
--- a/source3/passdb/pdb_get_set.c
+++ b/source3/passdb/pdb_get_set.c
@@ -85,7 +85,7 @@ time_t pdb_get_pass_can_change_time(const struct samu *sampass)
to indicate that the user cannot change their password. jmcd
*/
if (sampass->pass_can_change_time == get_time_t_max() &&
- pdb_get_init_flags(sampass, PDB_CANCHANGETIME) == PDB_CHANGED)
+ IS_SAM_CHANGED(sampass, PDB_CANCHANGETIME))
return sampass->pass_can_change_time;
if (!pdb_get_account_policy(PDB_POLICY_MIN_PASSWORD_AGE, &allow))
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 68e0c22050..6e5f9acd9a 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -609,7 +609,7 @@ static bool init_sam_from_ldap(struct ldapsam_privates *ldap_state,
}
}
- if (pdb_get_init_flags(sampass,PDB_USERSID) == PDB_DEFAULT) {
+ if (IS_SAM_DEFAULT(sampass, PDB_USERSID)) {
DEBUG(1, ("init_sam_from_ldap: no %s or %s attribute found for this user %s\n",
get_userattr_key2string(ldap_state->schema_ver,
LDAP_ATTR_USER_SID),