s3: Hide some uses of pdb_get_init_flags (which I would love to remove...)
authorVolker Lendecke <vl@samba.org>
Fri, 5 Feb 2010 14:40:12 +0000 (15:40 +0100)
committerVolker Lendecke <vl@samba.org>
Fri, 5 Feb 2010 20:11:17 +0000 (21:11 +0100)
source3/passdb/pdb_get_set.c
source3/passdb/pdb_ldap.c

index 555b20730c22ba7da566304ef5fff62f8d33e4c5..becd87fe8d5fe7100f1e6f1cb276794b869517b3 100644 (file)
@@ -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() &&
           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))
                return sampass->pass_can_change_time;
 
        if (!pdb_get_account_policy(PDB_POLICY_MIN_PASSWORD_AGE, &allow))
index 68e0c220508d759b5c2a4a10e225502a92ff990a..6e5f9acd9af5f76a7898f268bd0539d30c3bdd4d 100644 (file)
@@ -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),
                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),