diff options
| author | Gerald Carter <jerry@samba.org> | 2005-04-21 17:13:50 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2005-04-21 17:13:50 +0000 |
| commit | 208374541caa953b032a4780bed24c9d10e411dc (patch) | |
| tree | 40d2dd1a84e449c56dda1b3858505e6af5b6cf6f /source/passdb | |
| parent | 809afa362f16281ed5ce580d7b4e9622084e24be (diff) | |
| download | samba-208374541caa953b032a4780bed24c9d10e411dc.tar.gz samba-208374541caa953b032a4780bed24c9d10e411dc.tar.xz samba-208374541caa953b032a4780bed24c9d10e411dc.zip | |
r6421: use add machine script when creating a user (ACB_NORMAL)
who has a name ending in '$' (usrmgr.exe does this for
domain trusts (that's was jfm's original comment I think).
avoid an assert() call in libldap.
Diffstat (limited to 'source/passdb')
| -rw-r--r-- | source/passdb/pdb_ldap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/passdb/pdb_ldap.c b/source/passdb/pdb_ldap.c index 04929314f09..7d66b0aaf04 100644 --- a/source/passdb/pdb_ldap.c +++ b/source/passdb/pdb_ldap.c @@ -3423,7 +3423,8 @@ static BOOL ldapsam_search_firstpage(struct pdb_search *search) state->connection->paged_results = False; } - state->current_entry = ldap_first_entry(ld, state->entries); + if ( ld ) + state->current_entry = ldap_first_entry(ld, state->entries); if (state->current_entry == NULL) { ldap_msgfree(state->entries); |