s3:idmap_tdb2: remove special treatment of NULL sid from idmap_tdb2_sids_to_unixids

allocate_id has now been (re)added to the idmap methods.

diff --git a/source3/winbindd/idmap_tdb2.c b/source3/winbindd/idmap_tdb2.c
index 088a421882a45da24f88fa60e524b3ebf849a8ec..74a5030f4a9c43b30b41a0b135e64184a0a058cc 100644 (file)
--- a/source3/winbindd/idmap_tdb2.c
+++ b/source3/winbindd/idmap_tdb2.c
@@ -832,25 +832,9 @@ static NTSTATUS idmap_tdb2_sids_to_unixids_action(struct db_context *db,
                if ((state->ids[i]->status == ID_UNMAPPED) &&
                    state->allocate_unmapped)
                {
-                       if (state->ids[i]->sid != NULL) {
-                               ret = idmap_tdb2_new_mapping(state->dom,
-                                                            state->ids[i]);
-                               if (!NT_STATUS_IS_OK(ret)) {
-                                       goto done;
-                               }
-                       } else {
-                               /*
-                                *  Special treatment to only allocate an ID.
-                                *  (No mapping is stored.)
-                                */
-                               ret = idmap_tdb2_get_new_id(state->dom,
-                                                       &state->ids[i]->xid);
-                               if (!NT_STATUS_IS_OK(ret)) {
-                                       DEBUG(3, ("Could not allocate id: "
-                                                 "%s\n", nt_errstr(ret)));
-                                       goto done;
-                               }
-                               state->ids[i]->status = ID_MAPPED;
+                       ret = idmap_tdb2_new_mapping(state->dom, state->ids[i]);
+                       if (!NT_STATUS_IS_OK(ret)) {
+                               goto done;
                        }
                }
        }