diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-04-28 11:46:22 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-04-28 11:46:22 +0000 |
| commit | c5be81e636157332bd84aad32bc53cbf1866dd0a (patch) | |
| tree | b858a06c8933362f2b59085cfa43bc9c1a3db0bb | |
| parent | 84e479c4a39eac9d6247b5637d89e6f21f1d5c6a (diff) | |
| download | samba-c5be81e636157332bd84aad32bc53cbf1866dd0a.tar.gz samba-c5be81e636157332bd84aad32bc53cbf1866dd0a.tar.bz2 samba-c5be81e636157332bd84aad32bc53cbf1866dd0a.zip | |
The caller must always set the RID on the SAM_ACCOUNT, so don't try and guess
it from the UID.
Andrew Bartlett
(This used to be commit cdc1d0505107d05d784693d321b24208a386d4f0)
| -rw-r--r-- | source3/passdb/pdb_ldap.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index 607c77d30f..a936fb298c 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -1921,9 +1921,7 @@ static BOOL init_ldap_from_sam (struct ldapsam_privates *ldap_state, DEBUG(2, ("Setting entry for user: %s\n", pdb_get_username(sampass))); if (pdb_get_init_flags(sampass, PDB_USERSID) == PDB_DEFAULT) { - if (!IS_SAM_DEFAULT(sampass, PDB_UID)) { - rid = fallback_pdb_uid_to_user_rid(pdb_get_uid(sampass)); - } else if (ldap_state->permit_non_unix_accounts) { + if (ldap_state->permit_non_unix_accounts) { if (!NT_STATUS_IS_OK(ldapsam_next_rid(ldap_state, &rid, USER_RID_TYPE))) { DEBUG(0, ("NO user RID specified on account %s, and " "finding next available NUA RID failed, " |