diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-04-11 17:21:33 +1000 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2013-05-16 19:02:02 +0200 |
| commit | 1165776d861e8e4f2fe26dcaf1e9dabdcc0a4179 (patch) | |
| tree | 12f9061f4f75290e523b3cfe5dfbcf28e331acb9 /source3 | |
| parent | 2c047198caccea30e8583dda869d513913fe1702 (diff) | |
| download | samba-1165776d861e8e4f2fe26dcaf1e9dabdcc0a4179.tar.gz samba-1165776d861e8e4f2fe26dcaf1e9dabdcc0a4179.tar.bz2 samba-1165776d861e8e4f2fe26dcaf1e9dabdcc0a4179.zip | |
pdb_ldap: Do not skip accounts without a sambaAcctFlags value
We allow this to mean a sambaAcctFlags value of zero in other parts of the code
and by allowing these users to show up in a search, we can read and correct them
during the classicupgrade, rather than not know they exist at all.
Most parts of the code do not look for ACB_NORMAL, which is why
these users appear to work.
Andrew Bartlett
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/passdb/pdb_ldap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index dc6a9c3239..0905ab4eeb 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -4452,11 +4452,11 @@ static bool ldapuser2displayentry(struct ldap_search_state *state, vals = ldap_get_values(ld, entry, "sambaAcctFlags"); if ((vals == NULL) || (vals[0] == NULL)) { - DEBUG(5, ("\"sambaAcctFlags\" not found\n")); - return False; + acct_flags = ACB_NORMAL; + } else { + acct_flags = pdb_decode_acct_ctrl(vals[0]); + ldap_value_free(vals); } - acct_flags = pdb_decode_acct_ctrl(vals[0]); - ldap_value_free(vals); if ((state->acct_flags != 0) && ((state->acct_flags & acct_flags) == 0)) |