diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2002-11-02 07:54:04 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2002-11-02 07:54:04 +0000 |
| commit | 593e0b5d000f8a7836bcb4abf02e5d1a62d85cc9 (patch) | |
| tree | e3a04b857daa51e7a93e3f46e566a7df3da9979b | |
| parent | b017064cec857b3fd533c5c1b1cd4e6327906b45 (diff) | |
| download | samba-593e0b5d000f8a7836bcb4abf02e5d1a62d85cc9.tar.gz samba-593e0b5d000f8a7836bcb4abf02e5d1a62d85cc9.tar.bz2 samba-593e0b5d000f8a7836bcb4abf02e5d1a62d85cc9.zip | |
Clean up this a little - add comments describing a bit of what is going on
here.
(This used to be commit 88455313f6551a75eff4df2f0ba91430948c1c78)
| -rw-r--r-- | source3/passdb/pdb_ldap.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index 866c4f6b76..22358cb47d 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -963,13 +963,14 @@ static BOOL init_sam_from_ldap (struct ldapsam_privates *ldap_state, } + /* + * If so configured, try and get the values from LDAP + */ - if (lp_ldap_trust_ids() && (get_unix_attributes(ldap_state,sampass, entry))) { + if (!lp_ldap_trust_ids() || (!get_unix_attributes(ldap_state, sampass, entry))) { - } else { - - /* These values MAY be in LDAP, but they can also be retrieved through - * sys_getpw*() which is how we're doing it + /* + * Otherwise just ask the system getpw() calls. */ pw = getpwnam_alloc(username); |