idmap4: Slightly simplify idmap_xid_to_sid
[samba.git] / source4 / winbind / idmap.c
index b14885213e91f51f3cebec57c7f6f5385efb5895..bc3b57b585573a5827799bc7b85c6d980a412cb3 100644 (file)
@@ -1,9 +1,10 @@
 /*
    Unix SMB/CIFS implementation.
 
-   Map SIDs to uids/gids and back
+   Map SIDs to unixids and back
 
    Copyright (C) Kai Blin 2008
+   Copyright (C) Andrew Bartlett 2012
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
 #include "includes.h"
 #include "auth/auth.h"
-#include "librpc/gen_ndr/lsa.h"
-#include "librpc/gen_ndr/samr.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
-#include "lib/ldb_wrap.h"
+#include <ldb.h>
+#include "ldb_wrap.h"
 #include "param/param.h"
 #include "winbind/idmap.h"
-#include "libcli/security/proto.h"
+#include "libcli/security/security.h"
 #include "libcli/ldap/ldap_ndr.h"
+#include "dsdb/samdb/samdb.h"
+#include "../libds/common/flags.h"
 
 /**
  * Get uid/gid bounds from idmap database
@@ -54,11 +54,9 @@ static int idmap_get_bounds(struct idmap_context *idmap_ctx, uint32_t *low,
        dn = ldb_dn_new(tmp_ctx, ldb, "CN=CONFIG");
        if (dn == NULL) goto failed;
 
-       ret = ldb_search(ldb, dn, LDB_SCOPE_BASE, NULL, NULL, &res);
+       ret = ldb_search(ldb, tmp_ctx, &res, dn, LDB_SCOPE_BASE, NULL, NULL);
        if (ret != LDB_SUCCESS) goto failed;
 
-       talloc_steal(tmp_ctx, res);
-
        if (res->count != 1) {
                ret = -1;
                goto failed;
@@ -102,9 +100,7 @@ static int idmap_msg_add_dom_sid(struct idmap_context *idmap_ctx,
        struct ldb_val val;
        enum ndr_err_code ndr_err;
 
-       ndr_err = ndr_push_struct_blob(&val, mem_ctx,
-                                      lp_iconv_convenience(idmap_ctx->lp_ctx),
-                                      sid,
+       ndr_err = ndr_push_struct_blob(&val, mem_ctx, sid,
                                       (ndr_push_flags_fn_t)ndr_push_dom_sid);
 
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -139,7 +135,7 @@ static struct dom_sid *idmap_msg_get_dom_sid(TALLOC_CTX *mem_ctx,
                return NULL;
        }
 
-       ndr_err = ndr_pull_struct_blob(val, sid, NULL, sid,
+       ndr_err = ndr_pull_struct_blob(val, sid, sid,
                                       (ndr_pull_flags_fn_t)ndr_pull_dom_sid);
        if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                talloc_free(sid);
@@ -158,7 +154,8 @@ static struct dom_sid *idmap_msg_get_dom_sid(TALLOC_CTX *mem_ctx,
  * \return allocated idmap_context on success, NULL on error
  */
 struct idmap_context *idmap_init(TALLOC_CTX *mem_ctx,
-               struct loadparm_context *lp_ctx)
+                                struct tevent_context *ev_ctx,
+                                struct loadparm_context *lp_ctx)
 {
        struct idmap_context *idmap_ctx;
 
@@ -169,47 +166,160 @@ struct idmap_context *idmap_init(TALLOC_CTX *mem_ctx,
 
        idmap_ctx->lp_ctx = lp_ctx;
 
-       idmap_ctx->ldb_ctx = ldb_wrap_connect(mem_ctx, lp_ctx,
-                                             lp_idmap_url(lp_ctx),
-                                             system_session(mem_ctx, lp_ctx),
-                                             NULL, 0, NULL);
+       idmap_ctx->ldb_ctx = ldb_wrap_connect(idmap_ctx, ev_ctx, lp_ctx,
+                                             "idmap.ldb",
+                                             system_session(lp_ctx),
+                                             NULL, 0);
        if (idmap_ctx->ldb_ctx == NULL) {
-               return NULL;
+               goto fail;
+       }
+
+       idmap_ctx->unix_groups_sid = dom_sid_parse_talloc(
+               idmap_ctx, "S-1-22-2");
+       if (idmap_ctx->unix_groups_sid == NULL) {
+               goto fail;
+       }
+
+       idmap_ctx->unix_users_sid = dom_sid_parse_talloc(
+               idmap_ctx, "S-1-22-1");
+       if (idmap_ctx->unix_users_sid == NULL) {
+               goto fail;
+       }
+       
+       idmap_ctx->samdb = samdb_connect(idmap_ctx, ev_ctx, lp_ctx, system_session(lp_ctx), 0);
+       if (idmap_ctx->samdb == NULL) {
+               DEBUG(0, ("Failed to load sam.ldb in idmap_init\n"));
+               goto fail;
        }
 
        return idmap_ctx;
+fail:
+       TALLOC_FREE(idmap_ctx);
+       return NULL;
 }
 
 /**
- * Convert a uid to the corresponding SID
+ * Convert an unixid to the corresponding SID
  *
  * \param idmap_ctx idmap context to use
  * \param mem_ctx talloc context the memory for the struct dom_sid is allocated
  * from.
- * \param uid Unix uid to map to a SID
- * \param sid Pointer that will take the struct dom_sid pointer if the mapping
+ * \param unixid pointer to a unixid struct to convert
+ * \param sid pointer that will take the struct dom_sid pointer if the mapping
  * succeeds.
  * \return NT_STATUS_OK on success, NT_STATUS_NONE_MAPPED if mapping not
  * possible or some other NTSTATUS that is more descriptive on failure.
  */
 
-NTSTATUS idmap_uid_to_sid(struct idmap_context *idmap_ctx, TALLOC_CTX *mem_ctx,
-               const uid_t uid, struct dom_sid **sid)
+static NTSTATUS idmap_xid_to_sid(struct idmap_context *idmap_ctx,
+                                TALLOC_CTX *mem_ctx,
+                                struct unixid *unixid,
+                                struct dom_sid **sid)
 {
        int ret;
        NTSTATUS status = NT_STATUS_NONE_MAPPED;
        struct ldb_context *ldb = idmap_ctx->ldb_ctx;
-       struct ldb_message *msg;
        struct ldb_result *res = NULL;
-       int trans = -1;
-       uid_t low, high;
-       char *sid_string, *uid_string;
-       struct dom_sid *unix_users_sid, *new_sid;
+       struct ldb_message *msg;
+       const struct dom_sid *unix_sid;
+       struct dom_sid *new_sid;
        TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
+       const char *id_type;
+
+       const char *sam_attrs[] = {"objectSid", NULL};
+       
+       /* 
+        * First check against our local DB, to see if this user has a
+        * mapping there.  This means that the Samba4 AD DC behaves
+        * much like a winbindd member server running idmap_ad
+        */
+       
+       switch (unixid->type) {
+               case ID_TYPE_UID:
+                       if (lpcfg_parm_bool(idmap_ctx->lp_ctx, NULL, "idmap_ldb", "use rfc2307", false)) {
+                               ret = dsdb_search_one(idmap_ctx->samdb, tmp_ctx, &msg,
+                                                     ldb_get_default_basedn(idmap_ctx->samdb),
+                                                     LDB_SCOPE_SUBTREE,
+                                                     sam_attrs, 0,
+                                                     "(&(|(sAMaccountType=%u)(sAMaccountType=%u)(sAMaccountType=%u))"
+                                                     "(uidNumber=%u)(objectSid=*))",
+                                                     ATYPE_ACCOUNT, ATYPE_WORKSTATION_TRUST, ATYPE_INTERDOMAIN_TRUST, unixid->id);
+                       } else {
+                               /* If we are not to use the rfc2307 attributes, we just emulate a non-match */
+                               ret = LDB_ERR_NO_SUCH_OBJECT;
+                       }
+
+                       if (ret == LDB_ERR_CONSTRAINT_VIOLATION) {
+                               DEBUG(1, ("Search for uidNumber=%lu gave duplicate results, failing to map to a SID!\n",
+                                         (unsigned long)unixid->id));
+                               status = NT_STATUS_NONE_MAPPED;
+                               goto failed;
+                       } else if (ret == LDB_SUCCESS) {
+                               *sid = samdb_result_dom_sid(mem_ctx, msg, "objectSid");
+                               if (*sid == NULL) {
+                                       DEBUG(1, ("Search for uidNumber=%lu did not return an objectSid!\n",
+                                                 (unsigned long)unixid->id));
+                                       status = NT_STATUS_NONE_MAPPED;
+                                       goto failed;
+                               }
+                               talloc_free(tmp_ctx);
+                               return NT_STATUS_OK;
+                       } else if (ret != LDB_ERR_NO_SUCH_OBJECT) {
+                               DEBUG(1, ("Search for uidNumber=%lu gave '%s', failing to map to a SID!\n",
+                                         (unsigned long)unixid->id, ldb_errstring(idmap_ctx->samdb)));
+                               status = NT_STATUS_NONE_MAPPED;
+                               goto failed;
+                       }
+
+                       id_type = "ID_TYPE_UID";
+                       break;
+               case ID_TYPE_GID:
+                       if (lpcfg_parm_bool(idmap_ctx->lp_ctx, NULL, "idmap_ldb", "use rfc2307", false)) {
+                               ret = dsdb_search_one(idmap_ctx->samdb, tmp_ctx, &msg,
+                                                     ldb_get_default_basedn(idmap_ctx->samdb),
+                                                     LDB_SCOPE_SUBTREE,
+                                                     sam_attrs, 0,
+                                                     "(&(|(sAMaccountType=%u)(sAMaccountType=%u))(gidNumber=%u))",
+                                                     ATYPE_SECURITY_GLOBAL_GROUP, ATYPE_SECURITY_LOCAL_GROUP,
+                                                     unixid->id);
+                       } else {
+                               /* If we are not to use the rfc2307 attributes, we just emulate a non-match */
+                               ret = LDB_ERR_NO_SUCH_OBJECT;
+                       }
+                       if (ret == LDB_ERR_CONSTRAINT_VIOLATION) {
+                               DEBUG(1, ("Search for gidNumber=%lu gave duplicate results, failing to map to a SID!\n",
+                                         (unsigned long)unixid->id));
+                               status = NT_STATUS_NONE_MAPPED;
+                               goto failed;
+                       } else if (ret == LDB_SUCCESS) {
+                               *sid = samdb_result_dom_sid(mem_ctx, msg, "objectSid");
+                               if (*sid == NULL) {
+                                       DEBUG(1, ("Search for gidNumber=%lu did not return an objectSid!\n",
+                                                 (unsigned long)unixid->id));
+                                       status = NT_STATUS_NONE_MAPPED;
+                                       goto failed;
+                               }
+                               talloc_free(tmp_ctx);
+                               return NT_STATUS_OK;
+                       } else if (ret != LDB_ERR_NO_SUCH_OBJECT) {
+                               DEBUG(1, ("Search for gidNumber=%lu gave '%s', failing to map to a SID!\n",
+                                         (unsigned long)unixid->id, ldb_errstring(idmap_ctx->samdb)));
+                               status = NT_STATUS_NONE_MAPPED;
+                               goto failed;
+                       }
+
+                       id_type = "ID_TYPE_GID";
+                       break;
+               default:
+                       DEBUG(1, ("unixid->type must be type gid or uid (got %u) for lookup with id %lu\n",
+                                 (unsigned)unixid->type, (unsigned long)unixid->id));
+                       status = NT_STATUS_NONE_MAPPED;
+                       goto failed;
+       }
 
-       ret = ldb_search_exp_fmt(ldb, tmp_ctx, &res, NULL, LDB_SCOPE_SUBTREE,
-                                NULL, "(&(objectClass=sidMap)(uidNumber=%u))",
-                                uid);
+       ret = ldb_search(ldb, tmp_ctx, &res, NULL, LDB_SCOPE_SUBTREE,
+                                NULL, "(&(|(type=ID_TYPE_BOTH)(type=%s))"
+                                "(xidNumber=%u))", id_type, unixid->id);
        if (ret != LDB_SUCCESS) {
                DEBUG(1, ("Search failed: %s\n", ldb_errstring(ldb)));
                status = NT_STATUS_NONE_MAPPED;
@@ -217,6 +327,9 @@ NTSTATUS idmap_uid_to_sid(struct idmap_context *idmap_ctx, TALLOC_CTX *mem_ctx,
        }
 
        if (res->count == 1) {
+               const char *type = ldb_msg_find_attr_as_string(res->msgs[0],
+                                                              "type", NULL);
+
                *sid = idmap_msg_get_dom_sid(mem_ctx, res->msgs[0],
                                             "objectSid");
                if (*sid == NULL) {
@@ -224,11 +337,214 @@ NTSTATUS idmap_uid_to_sid(struct idmap_context *idmap_ctx, TALLOC_CTX *mem_ctx,
                        status = NT_STATUS_NONE_MAPPED;
                        goto failed;
                }
+
+               if (type == NULL) {
+                       DEBUG(1, ("Invalid type for mapping entry.\n"));
+                       talloc_free(tmp_ctx);
+                       return NT_STATUS_NONE_MAPPED;
+               }
+
+               if (strcmp(type, "ID_TYPE_BOTH") == 0) {
+                       unixid->type = ID_TYPE_BOTH;
+               } else if (strcmp(type, "ID_TYPE_UID") == 0) {
+                       unixid->type = ID_TYPE_UID;
+               } else {
+                       unixid->type = ID_TYPE_GID;
+               }
+
+               talloc_free(tmp_ctx);
+               return NT_STATUS_OK;
+       }
+
+       DEBUG(6, ("xid not found in idmap db, create S-1-22- SID.\n"));
+
+       /* For local users/groups , we just create a rid = uid/gid */
+       if (unixid->type == ID_TYPE_UID) {
+               unix_sid = &global_sid_Unix_Users;
+       } else {
+               unix_sid = &global_sid_Unix_Groups;
+       }
+
+       new_sid = dom_sid_add_rid(mem_ctx, unix_sid, unixid->id);
+       if (new_sid == NULL) {
+               status = NT_STATUS_NO_MEMORY;
+               goto failed;
+       }
+
+       *sid = new_sid;
+       talloc_free(tmp_ctx);
+       return NT_STATUS_OK;
+
+failed:
+       talloc_free(tmp_ctx);
+       return status;
+}
+
+
+/**
+ * Map a SID to an unixid struct.
+ *
+ * If no mapping exists, a new mapping will be created.
+ *
+ * \param idmap_ctx idmap context to use
+ * \param mem_ctx talloc context to use
+ * \param sid SID to map to an unixid struct
+ * \param unixid pointer to a unixid struct
+ * \return NT_STATUS_OK on success, NT_STATUS_INVALID_SID if the sid is not from
+ * a trusted domain and idmap trusted only = true, NT_STATUS_NONE_MAPPED if the
+ * mapping failed.
+ */
+static NTSTATUS idmap_sid_to_xid(struct idmap_context *idmap_ctx,
+                                TALLOC_CTX *mem_ctx,
+                                const struct dom_sid *sid,
+                                struct unixid *unixid)
+{
+       int ret;
+       NTSTATUS status = NT_STATUS_NONE_MAPPED;
+       struct ldb_context *ldb = idmap_ctx->ldb_ctx;
+       struct ldb_dn *dn;
+       struct ldb_message *hwm_msg, *map_msg, *sam_msg;
+       struct ldb_result *res = NULL;
+       int trans = -1;
+       uint32_t low, high, hwm, new_xid;
+       char *sid_string, *unixid_string, *hwm_string;
+       bool hwm_entry_exists;
+       TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
+       const char *sam_attrs[] = {"uidNumber", "gidNumber", "samAccountType", NULL};
+
+       if (dom_sid_in_domain(idmap_ctx->unix_users_sid, sid)) {
+               uint32_t rid;
+               DEBUG(6, ("This is a local unix uid, just calculate that.\n"));
+               status = dom_sid_split_rid(tmp_ctx, sid, NULL, &rid);
+               if (!NT_STATUS_IS_OK(status)) {
+                       talloc_free(tmp_ctx);
+                       return status;
+               }
+
+               unixid->id = rid;
+               unixid->type = ID_TYPE_UID;
+
+               talloc_free(tmp_ctx);
+               return NT_STATUS_OK;
+       }
+
+       if (dom_sid_in_domain(idmap_ctx->unix_groups_sid, sid)) {
+               uint32_t rid;
+               DEBUG(6, ("This is a local unix gid, just calculate that.\n"));
+               status = dom_sid_split_rid(tmp_ctx, sid, NULL, &rid);
+               if (!NT_STATUS_IS_OK(status)) {
+                       talloc_free(tmp_ctx);
+                       return status;
+               }
+
+               unixid->id = rid;
+               unixid->type = ID_TYPE_GID;
+
+               talloc_free(tmp_ctx);
+               return NT_STATUS_OK;
+       }
+
+       /* 
+        * First check against our local DB, to see if this user has a
+        * mapping there.  This means that the Samba4 AD DC behaves
+        * much like a winbindd member server running idmap_ad
+        */
+       
+       if (lpcfg_parm_bool(idmap_ctx->lp_ctx, NULL, "idmap_ldb", "use rfc2307", false)) {
+               ret = dsdb_search_one(idmap_ctx->samdb, tmp_ctx, &sam_msg,
+                                     ldb_get_default_basedn(idmap_ctx->samdb),
+                                     LDB_SCOPE_SUBTREE, sam_attrs, 0,
+                                     "(&(objectSid=%s)"
+                                     "(|(sAMaccountType=%u)(sAMaccountType=%u)(sAMaccountType=%u)"
+                                     "(sAMaccountType=%u)(sAMaccountType=%u))"
+                                     "(|(uidNumber=*)(gidNumber=*)))",
+                                     dom_sid_string(tmp_ctx, sid),
+                                     ATYPE_ACCOUNT, ATYPE_WORKSTATION_TRUST, ATYPE_INTERDOMAIN_TRUST,
+                                     ATYPE_SECURITY_GLOBAL_GROUP, ATYPE_SECURITY_LOCAL_GROUP);
+       } else {
+               /* If we are not to use the rfc2307 attributes, we just emulate a non-match */
+               ret = LDB_ERR_NO_SUCH_OBJECT;
+       }
+
+       if (ret == LDB_ERR_CONSTRAINT_VIOLATION) {
+               DEBUG(1, ("Search for objectSid=%s gave duplicate results, failing to map to a unix ID!\n",
+                         dom_sid_string(tmp_ctx, sid)));
+               status = NT_STATUS_NONE_MAPPED;
+               goto failed;
+       } else if (ret == LDB_SUCCESS) {
+               uint32_t account_type = ldb_msg_find_attr_as_uint(sam_msg, "sAMaccountType", 0);
+               if ((account_type == ATYPE_ACCOUNT) ||
+                   (account_type == ATYPE_WORKSTATION_TRUST ) ||
+                   (account_type == ATYPE_INTERDOMAIN_TRUST ))
+               {
+                       const struct ldb_val *v = ldb_msg_find_ldb_val(sam_msg, "uidNumber");
+                       if (v) {
+                               unixid->type = ID_TYPE_UID;
+                               unixid->id = ldb_msg_find_attr_as_uint(sam_msg, "uidNumber", -1);
+                               talloc_free(tmp_ctx);
+                               return NT_STATUS_OK;
+                       }
+
+               } else if ((account_type == ATYPE_SECURITY_GLOBAL_GROUP) ||
+                          (account_type == ATYPE_SECURITY_LOCAL_GROUP))
+               {
+                       const struct ldb_val *v = ldb_msg_find_ldb_val(sam_msg, "gidNumber");
+                       if (v) {
+                               unixid->type = ID_TYPE_GID;
+                               unixid->id = ldb_msg_find_attr_as_uint(sam_msg, "gidNumber", -1);
+                               talloc_free(tmp_ctx);
+                               return NT_STATUS_OK;
+                       }
+               }
+       } else if (ret != LDB_ERR_NO_SUCH_OBJECT) {
+               DEBUG(1, ("Search for objectSid=%s gave '%s', failing to map to a SID!\n",
+                         dom_sid_string(tmp_ctx, sid), ldb_errstring(idmap_ctx->samdb)));
+
+               status = NT_STATUS_NONE_MAPPED;
+               goto failed;
+       }
+
+       ret = ldb_search(ldb, tmp_ctx, &res, NULL, LDB_SCOPE_SUBTREE,
+                                NULL, "(&(objectClass=sidMap)(objectSid=%s))",
+                                ldap_encode_ndr_dom_sid(tmp_ctx, sid));
+       if (ret != LDB_SUCCESS) {
+               DEBUG(1, ("Search failed: %s\n", ldb_errstring(ldb)));
+               talloc_free(tmp_ctx);
+               return NT_STATUS_NONE_MAPPED;
+       }
+
+       if (res->count == 1) {
+               const char *type = ldb_msg_find_attr_as_string(res->msgs[0],
+                                                              "type", NULL);
+               new_xid = ldb_msg_find_attr_as_uint(res->msgs[0], "xidNumber",
+                                                   -1);
+               if (new_xid == (uint32_t) -1) {
+                       DEBUG(1, ("Invalid xid mapping.\n"));
+                       talloc_free(tmp_ctx);
+                       return NT_STATUS_NONE_MAPPED;
+               }
+
+               if (type == NULL) {
+                       DEBUG(1, ("Invalid type for mapping entry.\n"));
+                       talloc_free(tmp_ctx);
+                       return NT_STATUS_NONE_MAPPED;
+               }
+
+               unixid->id = new_xid;
+
+               if (strcmp(type, "ID_TYPE_BOTH") == 0) {
+                       unixid->type = ID_TYPE_BOTH;
+               } else if (strcmp(type, "ID_TYPE_UID") == 0) {
+                       unixid->type = ID_TYPE_UID;
+               } else {
+                       unixid->type = ID_TYPE_GID;
+               }
+
                talloc_free(tmp_ctx);
                return NT_STATUS_OK;
        }
 
-       DEBUG(6, ("uid not found in idmap db, trying to allocate SID.\n"));
+       DEBUG(6, ("No existing mapping found, attempting to create one.\n"));
 
        trans = ldb_transaction_start(ldb);
        if (trans != LDB_SUCCESS) {
@@ -236,11 +552,11 @@ NTSTATUS idmap_uid_to_sid(struct idmap_context *idmap_ctx, TALLOC_CTX *mem_ctx,
                goto failed;
        }
 
-       /* Now redo the search to make sure noone added a mapping for that SID
-        * while we weren't looking.*/
-       ret = ldb_search_exp_fmt(ldb, tmp_ctx, &res, NULL, LDB_SCOPE_SUBTREE,
-                                NULL, "(&(objectClass=sidMap)(uidNumber=%u))",
-                                uid);
+       /* Redo the search to make sure noone changed the mapping while we
+        * weren't looking */
+       ret = ldb_search(ldb, tmp_ctx, &res, NULL, LDB_SCOPE_SUBTREE,
+                                NULL, "(&(objectClass=sidMap)(objectSid=%s))",
+                                ldap_encode_ndr_dom_sid(tmp_ctx, sid));
        if (ret != LDB_SUCCESS) {
                DEBUG(1, ("Search failed: %s\n", ldb_errstring(ldb)));
                status = NT_STATUS_NONE_MAPPED;
@@ -248,100 +564,201 @@ NTSTATUS idmap_uid_to_sid(struct idmap_context *idmap_ctx, TALLOC_CTX *mem_ctx,
        }
 
        if (res->count > 0) {
-               DEBUG(1, ("sidMap modified while trying to add a mapping.\n"));
+               DEBUG(1, ("Database changed while trying to add a sidmap.\n"));
                status = NT_STATUS_RETRY;
                goto failed;
        }
 
        ret = idmap_get_bounds(idmap_ctx, &low, &high);
        if (ret != LDB_SUCCESS) {
-               DEBUG(1, ("Failed to get id bounds from db: %u\n", ret));
                status = NT_STATUS_NONE_MAPPED;
                goto failed;
        }
 
-       if (uid >= low && uid <= high) {
-               /* An existing user would have been mapped before */
-               status = NT_STATUS_NO_SUCH_USER;
+       dn = ldb_dn_new(tmp_ctx, ldb, "CN=CONFIG");
+       if (dn == NULL) {
+               status = NT_STATUS_NO_MEMORY;
                goto failed;
        }
 
-       /* For local users, we just create a rid = uid +1, so root doesn't end
-        * up with a 0 rid */
-       unix_users_sid = dom_sid_parse_talloc(tmp_ctx, "S-1-22-1");
-       if (unix_users_sid == NULL) {
+       ret = ldb_search(ldb, tmp_ctx, &res, dn, LDB_SCOPE_BASE, NULL, NULL);
+       if (ret != LDB_SUCCESS) {
+               DEBUG(1, ("Search failed: %s\n", ldb_errstring(ldb)));
+               status = NT_STATUS_NONE_MAPPED;
+               goto failed;
+       }
+
+       if (res->count != 1) {
+               DEBUG(1, ("No CN=CONFIG record, idmap database is broken.\n"));
+               status = NT_STATUS_NONE_MAPPED;
+               goto failed;
+       }
+
+       hwm = ldb_msg_find_attr_as_uint(res->msgs[0], "xidNumber", -1);
+       if (hwm == (uint32_t)-1) {
+               hwm = low;
+               hwm_entry_exists = false;
+       } else {
+               hwm_entry_exists = true;
+       }
+
+       if (hwm > high) {
+               DEBUG(1, ("Out of xids to allocate.\n"));
+               status = NT_STATUS_NONE_MAPPED;
+               goto failed;
+       }
+
+       hwm_msg = ldb_msg_new(tmp_ctx);
+       if (hwm_msg == NULL) {
+               DEBUG(1, ("Out of memory when creating ldb_message\n"));
                status = NT_STATUS_NO_MEMORY;
                goto failed;
        }
 
-       new_sid = dom_sid_add_rid(mem_ctx, unix_users_sid, uid + 1);
-       if (new_sid == NULL) {
+       hwm_msg->dn = dn;
+
+       new_xid = hwm;
+       hwm++;
+
+       hwm_string = talloc_asprintf(tmp_ctx, "%u", hwm);
+       if (hwm_string == NULL) {
                status = NT_STATUS_NO_MEMORY;
                goto failed;
        }
 
-       sid_string = dom_sid_string(tmp_ctx, new_sid);
+       sid_string = dom_sid_string(tmp_ctx, sid);
        if (sid_string == NULL) {
                status = NT_STATUS_NO_MEMORY;
                goto failed;
        }
 
-       uid_string = talloc_asprintf(tmp_ctx, "%u", uid);
-       if (uid_string == NULL) {
+       unixid_string = talloc_asprintf(tmp_ctx, "%u", new_xid);
+       if (unixid_string == NULL) {
                status = NT_STATUS_NO_MEMORY;
                goto failed;
        }
 
-       msg = ldb_msg_new(tmp_ctx);
-       if (msg == NULL) {
+       if (hwm_entry_exists) {
+               struct ldb_message_element *els;
+               struct ldb_val *vals;
+
+               /* We're modifying the entry, not just adding a new one. */
+               els = talloc_array(tmp_ctx, struct ldb_message_element, 2);
+               if (els == NULL) {
+                       status = NT_STATUS_NO_MEMORY;
+                       goto failed;
+               }
+
+               vals = talloc_array(tmp_ctx, struct ldb_val, 2);
+               if (els == NULL) {
+                       status = NT_STATUS_NO_MEMORY;
+                       goto failed;
+               }
+
+               hwm_msg->num_elements = 2;
+               hwm_msg->elements = els;
+
+               els[0].num_values = 1;
+               els[0].values = &vals[0];
+               els[0].flags = LDB_FLAG_MOD_DELETE;
+               els[0].name = talloc_strdup(tmp_ctx, "xidNumber");
+               if (els[0].name == NULL) {
+                       status = NT_STATUS_NO_MEMORY;
+                       goto failed;
+               }
+
+               els[1].num_values = 1;
+               els[1].values = &vals[1];
+               els[1].flags = LDB_FLAG_MOD_ADD;
+               els[1].name = els[0].name;
+
+               vals[0].data = (uint8_t *)unixid_string;
+               vals[0].length = strlen(unixid_string);
+               vals[1].data = (uint8_t *)hwm_string;
+               vals[1].length = strlen(hwm_string);
+       } else {
+               ret = ldb_msg_add_empty(hwm_msg, "xidNumber", LDB_FLAG_MOD_ADD,
+                                       NULL);
+               if (ret != LDB_SUCCESS) {
+                       status = NT_STATUS_NONE_MAPPED;
+                       goto failed;
+               }
+
+               ret = ldb_msg_add_string(hwm_msg, "xidNumber", hwm_string);
+               if (ret != LDB_SUCCESS)
+               {
+                       status = NT_STATUS_NONE_MAPPED;
+                       goto failed;
+               }
+       }
+
+       ret = ldb_modify(ldb, hwm_msg);
+       if (ret != LDB_SUCCESS) {
+               DEBUG(1, ("Updating the xid high water mark failed: %s\n",
+                         ldb_errstring(ldb)));
+               status = NT_STATUS_NONE_MAPPED;
+               goto failed;
+       }
+
+       map_msg = ldb_msg_new(tmp_ctx);
+       if (map_msg == NULL) {
                status = NT_STATUS_NO_MEMORY;
                goto failed;
        }
 
-       msg->dn = ldb_dn_new_fmt(tmp_ctx, ldb, "CN=%s", sid_string);
-       if (msg->dn == NULL) {
+       map_msg->dn = ldb_dn_new_fmt(tmp_ctx, ldb, "CN=%s", sid_string);
+       if (map_msg->dn == NULL) {
                status = NT_STATUS_NO_MEMORY;
                goto failed;
        }
 
-       ret = ldb_msg_add_string(msg, "uidNumber", uid_string);
+       ret = ldb_msg_add_string(map_msg, "xidNumber", unixid_string);
+       if (ret != LDB_SUCCESS) {
+               status = NT_STATUS_NONE_MAPPED;
+               goto failed;
+       }
+
+       ret = idmap_msg_add_dom_sid(idmap_ctx, tmp_ctx, map_msg, "objectSid",
+                       sid);
        if (ret != LDB_SUCCESS) {
                status = NT_STATUS_NONE_MAPPED;
                goto failed;
        }
 
-       ret = idmap_msg_add_dom_sid(idmap_ctx, tmp_ctx, msg, "objectSid",
-                                   new_sid);
+       ret = ldb_msg_add_string(map_msg, "objectClass", "sidMap");
        if (ret != LDB_SUCCESS) {
                status = NT_STATUS_NONE_MAPPED;
                goto failed;
        }
 
-       ret = ldb_msg_add_string(msg, "objectClass", "sidMap");
+       ret = ldb_msg_add_string(map_msg, "type", "ID_TYPE_BOTH");
        if (ret != LDB_SUCCESS) {
                status = NT_STATUS_NONE_MAPPED;
                goto failed;
        }
 
-       ret = ldb_msg_add_string(msg, "cn", sid_string);
+       ret = ldb_msg_add_string(map_msg, "cn", sid_string);
        if (ret != LDB_SUCCESS) {
                status = NT_STATUS_NONE_MAPPED;
                goto failed;
        }
 
-       ret = ldb_add(ldb, msg);
+       ret = ldb_add(ldb, map_msg);
        if (ret != LDB_SUCCESS) {
+               DEBUG(1, ("Adding a sidmap failed: %s\n", ldb_errstring(ldb)));
                status = NT_STATUS_NONE_MAPPED;
                goto failed;
        }
 
        trans = ldb_transaction_commit(ldb);
        if (trans != LDB_SUCCESS) {
+               DEBUG(1, ("Transaction failed: %s\n", ldb_errstring(ldb)));
                status = NT_STATUS_NONE_MAPPED;
                goto failed;
        }
 
-       *sid = new_sid;
+       unixid->id = new_xid;
+       unixid->type = ID_TYPE_BOTH;
        talloc_free(tmp_ctx);
        return NT_STATUS_OK;
 
@@ -352,64 +769,102 @@ failed:
 }
 
 /**
- * Map a Unix gid to the corresponding SID
- *
- * \todo Create a SID from the S-1-22-2 range for unmapped groups
+ * Convert an array of unixids to the corresponding array of SIDs
  *
  * \param idmap_ctx idmap context to use
- * \param mem_ctx talloc context the memory for the struct dom_sid is allocated
+ * \param mem_ctx talloc context the memory for the dom_sids is allocated
  * from.
- * \param gid Unix gid to map to a SID
- * \param sid Pointer that will take the struct dom_sid pointer if mapping
- * succeeds.
- * \return NT_STATUS_OK on success, NT_STATUS_NONE_MAPPED if mapping not
- * possible or some other NTSTATUS that is more descriptive on failure.
+ * \param count length of id_mapping array.
+ * \param id array of id_mappings.
+ * \return NT_STATUS_OK on success, NT_STATUS_NONE_MAPPED if mapping is not
+ * possible at all, NT_STATUS_SOME_UNMAPPED if some mappings worked and some
+ * did not.
  */
-NTSTATUS idmap_gid_to_sid(struct idmap_context *idmap_ctx, TALLOC_CTX *mem_ctx,
-               const gid_t gid, struct dom_sid **sid)
-{
-       return NT_STATUS_NONE_MAPPED;
-}
 
-/**
- * Map a SID to a Unix uid.
- *
- * If no mapping exists, a new mapping will be created.
- *
- * \todo Create mappings for users not from our primary domain.
- *
- * \param idmap_ctx idmap context to use
- * \param mem_ctx talloc context to use
- * \param sid SID to map to a Unix uid
- * \param uid pointer to receive the mapped uid
- * \return NT_STATUS_OK on success, NT_STATUS_INVALID_SID if the sid is not from
- * a trusted domain and idmap trusted only = true, NT_STATUS_NONE_MAPPED if the
- * mapping failed.
- */
-NTSTATUS idmap_sid_to_uid(struct idmap_context *idmap_ctx, TALLOC_CTX *mem_ctx,
-               const struct dom_sid *sid, uid_t *uid)
+NTSTATUS idmap_xids_to_sids(struct idmap_context *idmap_ctx,
+                           TALLOC_CTX *mem_ctx,
+                           struct id_map **id)
 {
-       return NT_STATUS_NONE_MAPPED;
+       unsigned int i, error_count = 0;
+       NTSTATUS status;
+
+       for (i = 0; id && id[i]; i++) {
+               status = idmap_xid_to_sid(idmap_ctx, mem_ctx,
+                                               &id[i]->xid, &id[i]->sid);
+               if (NT_STATUS_EQUAL(status, NT_STATUS_RETRY)) {
+                       status = idmap_xid_to_sid(idmap_ctx, mem_ctx,
+                                                       &id[i]->xid,
+                                                       &id[i]->sid);
+               }
+               if (!NT_STATUS_IS_OK(status)) {
+                       DEBUG(1, ("idmapping xid_to_sid failed for id[%d]=%lu: %s\n",
+                                 i, (unsigned long)id[i]->xid.id, nt_errstr(status)));
+                       error_count++;
+                       id[i]->status = ID_UNMAPPED;
+               } else {
+                       id[i]->status = ID_MAPPED;
+               }
+       }
+
+       if (error_count == i) {
+               /* Mapping did not work at all. */
+               return NT_STATUS_NONE_MAPPED;
+       } else if (error_count > 0) {
+               /* Some mappings worked, some did not. */
+               return STATUS_SOME_UNMAPPED;
+       } else {
+               return NT_STATUS_OK;
+       }
 }
 
 /**
- * Map a SID to a Unix gid.
- *
- * If no mapping exist, a new mapping will be created.
- *
- * \todo Create mappings for groups not from our primary domain.
+ * Convert an array of SIDs to the corresponding array of unixids
  *
  * \param idmap_ctx idmap context to use
- * \param mem_ctx talloc context to use
- * \param sid SID to map to a Unix gid
- * \param gid pointer to receive the mapped gid
- * \return NT_STATUS_OK on success, NT_STATUS_INVALID_SID if the sid is not from
- * a trusted domain and idmap trusted only = true, NT_STATUS_NONE_MAPPED if the
- * mapping failed.
+ * \param mem_ctx talloc context the memory for the unixids is allocated
+ * from.
+ * \param count length of id_mapping array.
+ * \param id array of id_mappings.
+ * \return NT_STATUS_OK on success, NT_STATUS_NONE_MAPPED if mapping is not
+ * possible at all, NT_STATUS_SOME_UNMAPPED if some mappings worked and some
+ * did not.
  */
-NTSTATUS idmap_sid_to_gid(struct idmap_context *idmap_ctx, TALLOC_CTX *mem_ctx,
-               const struct dom_sid *sid, gid_t *gid)
+
+NTSTATUS idmap_sids_to_xids(struct idmap_context *idmap_ctx,
+                           TALLOC_CTX *mem_ctx,
+                           struct id_map **id)
 {
-       return NT_STATUS_NONE_MAPPED;
+       unsigned int i, error_count = 0;
+       NTSTATUS status;
+
+       for (i = 0; id && id[i]; i++) {
+               status = idmap_sid_to_xid(idmap_ctx, mem_ctx,
+                                         id[i]->sid, &id[i]->xid);
+               if (NT_STATUS_EQUAL(status, NT_STATUS_RETRY)) {
+                       status = idmap_sid_to_xid(idmap_ctx, mem_ctx,
+                                                 id[i]->sid,
+                                                 &id[i]->xid);
+               }
+               if (!NT_STATUS_IS_OK(status)) {
+                       char *str = dom_sid_string(mem_ctx, id[i]->sid);
+                       DEBUG(1, ("idmapping sid_to_xid failed for id[%d]=%s: %s\n",
+                                 i, str, nt_errstr(status)));
+                       talloc_free(str);
+                       error_count++;
+                       id[i]->status = ID_UNMAPPED;
+               } else {
+                       id[i]->status = ID_MAPPED;
+               }
+       }
+
+       if (error_count == i) {
+               /* Mapping did not work at all. */
+               return NT_STATUS_NONE_MAPPED;
+       } else if (error_count > 0) {
+               /* Some mappings worked, some did not. */
+               return STATUS_SOME_UNMAPPED;
+       } else {
+               return NT_STATUS_OK;
+       }
 }