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)

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index 607c77d30f1a05a92d89586c8c82444480ef97a2..a936fb298c99c114a3637b20aa4d17992772d6b9 100644 (file)
--- 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, "