Changeset 740 for vendor/current/source4/winbind/idmap.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source4/winbind/idmap.c (modified) (17 diffs)

vendor/current/source4/winbind/idmap.c ¶

@@ -22 +22 @@
 #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"
@@ -101 +98 @@
         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);
 
@@ -138 +133 @@
         }
 
-        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)) {
@@ -158 +153 @@
 struct idmap_context *idmap_init(TALLOC_CTX *mem_ctx,
                                  struct tevent_context *ev_ctx,
-                struct loadparm_context *lp_ctx)
+                                 struct loadparm_context *lp_ctx)
 {
         struct idmap_context *idmap_ctx;
@@ -170 +165 @@
 
         idmap_ctx->ldb_ctx = ldb_wrap_connect(mem_ctx, ev_ctx, lp_ctx,
-                                              lp_idmap_url(lp_ctx),
-                                              system_session(mem_ctx, lp_ctx),
-                                              NULL, 0, NULL);
+                                              lpcfg_idmap_url(lp_ctx),
+                                              system_session(lp_ctx),
+                                              NULL, 0);
         if (idmap_ctx->ldb_ctx == NULL) {
                 return NULL;
@@ -203 +198 @@
  */
 
-NTSTATUS idmap_xid_to_sid(struct idmap_context *idmap_ctx, TALLOC_CTX *mem_ctx,
-                const struct unixid *unixid, struct dom_sid **sid)
+static NTSTATUS idmap_xid_to_sid(struct idmap_context *idmap_ctx,
+                                 TALLOC_CTX *mem_ctx,
+                                 const struct unixid *unixid,
+                                 struct dom_sid **sid)
 {
         int ret;
@@ -222 +219 @@
                         break;
                 default:
-                        DEBUG(1, ("unixid->type must be type gid or uid\n"));
+                        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;
@@ -282 +280 @@
  * If no mapping exists, a new mapping will be created.
  *
- * \todo Check if SIDs can be resolved if lp_idmap_trusted_only() == true
+ * \todo Check if SIDs can be resolved if lpcfg_idmap_trusted_only() == true
  * \todo Fix backwards compatibility for Samba3
  *
@@ -288 +286 @@
  * \param mem_ctx talloc context to use
  * \param sid SID to map to an unixid struct
- * \param unixid pointer to a unixid struct pointer
+ * \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.
  */
-NTSTATUS idmap_sid_to_xid(struct idmap_context *idmap_ctx, TALLOC_CTX *mem_ctx,
-                const struct dom_sid *sid, struct unixid **unixid)
+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;
@@ -312 +312 @@
                 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)) goto failed;
-
-                *unixid = talloc(mem_ctx, struct unixid);
-                if (*unixid == NULL) {
-                        status = NT_STATUS_NO_MEMORY;
-                        goto failed;
-                }
-                (*unixid)->id = rid;
-                (*unixid)->type = ID_TYPE_UID;
+                if (!NT_STATUS_IS_OK(status)) {
+                        talloc_free(tmp_ctx);
+                        return status;
+                }
+
+                unixid->id = rid;
+                unixid->type = ID_TYPE_UID;
 
                 talloc_free(tmp_ctx);
@@ -330 +328 @@
                 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)) goto failed;
-
-                *unixid = talloc(mem_ctx, struct unixid);
-                if (*unixid == NULL) {
-                        status = NT_STATUS_NO_MEMORY;
-                        goto failed;
-                }
-                (*unixid)->id = rid;
-                (*unixid)->type = ID_TYPE_GID;
+                if (!NT_STATUS_IS_OK(status)) {
+                        talloc_free(tmp_ctx);
+                        return status;
+                }
+
+                unixid->id = rid;
+                unixid->type = ID_TYPE_GID;
 
                 talloc_free(tmp_ctx);
@@ -349 +345 @@
         if (ret != LDB_SUCCESS) {
                 DEBUG(1, ("Search failed: %s\n", ldb_errstring(ldb)));
-                status = NT_STATUS_NONE_MAPPED;
-                goto failed;
+                talloc_free(tmp_ctx);
+                return NT_STATUS_NONE_MAPPED;
         }
 
@@ -360 +356 @@
                 if (new_xid == (uint32_t) -1) {
                         DEBUG(1, ("Invalid xid mapping.\n"));
-                        status = NT_STATUS_NONE_MAPPED;
-                        goto failed;
+                        talloc_free(tmp_ctx);
+                        return NT_STATUS_NONE_MAPPED;
                 }
 
                 if (type == NULL) {
                         DEBUG(1, ("Invalid type for mapping entry.\n"));
-                        status = NT_STATUS_NONE_MAPPED;
-                        goto failed;
-                }
-
-                *unixid = talloc(mem_ctx, struct unixid);
-                if (*unixid == NULL) {
-                        status = NT_STATUS_NO_MEMORY;
-                        goto failed;
-                }
-
-                (*unixid)->id = new_xid;
+                        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;
+                        unixid->type = ID_TYPE_BOTH;
                 } else if (strcmp(type, "ID_TYPE_UID") == 0) {
-                        (*unixid)->type = ID_TYPE_UID;
+                        unixid->type = ID_TYPE_UID;
                 } else {
-                        (*unixid)->type = ID_TYPE_GID;
+                        unixid->type = ID_TYPE_GID;
                 }
 
@@ -415 +405 @@
         }
 
-        /*FIXME: if lp_idmap_trusted_only() == true, check if SID can be
+        /*FIXME: if lpcfg_idmap_trusted_only() == true, check if SID can be
          * resolved here. */
 
@@ -606 +596 @@
         }
 
-        *unixid = talloc(mem_ctx, struct unixid);
-        if (*unixid == NULL) {
-                status = NT_STATUS_NO_MEMORY;
-                goto failed;
-        }
-
-        (*unixid)->id = new_xid;
-        (*unixid)->type = ID_TYPE_BOTH;
+        unixid->id = new_xid;
+        unixid->type = ID_TYPE_BOTH;
         talloc_free(tmp_ctx);
         return NT_STATUS_OK;
@@ -637 +621 @@
 
 NTSTATUS idmap_xids_to_sids(struct idmap_context *idmap_ctx,
-                            TALLOC_CTX *mem_ctx, int count,
-                            struct id_mapping *id)
+                            TALLOC_CTX *mem_ctx,
+                            struct id_map **id)
 {
-        int i;
-        int error_count = 0;
-
-        for (i = 0; i < count; ++i) {
-                id[i].status = idmap_xid_to_sid(idmap_ctx, mem_ctx,
-                                                id[i].unixid, &id[i].sid);
-                if (NT_STATUS_EQUAL(id[i].status, NT_STATUS_RETRY)) {
-                        id[i].status = idmap_xid_to_sid(idmap_ctx, mem_ctx,
-                                                        id[i].unixid,
-                                                        &id[i].sid);
-                }
-                if (!NT_STATUS_IS_OK(id[i].status)) {
-                        DEBUG(1, ("idmapping xid_to_sid failed for id[%d]\n", i));
+        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++;
-                }
-        }
-
-        if (error_count == 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;
@@ -682 +670 @@
 
 NTSTATUS idmap_sids_to_xids(struct idmap_context *idmap_ctx,
-                            TALLOC_CTX *mem_ctx, int count,
-                            struct id_mapping *id)
+                            TALLOC_CTX *mem_ctx,
+                            struct id_map **id)
 {
-        int i;
-        int error_count = 0;
-
-        for (i = 0; i < count; ++i) {
-                id[i].status = idmap_sid_to_xid(idmap_ctx, mem_ctx,
-                                                id[i].sid, &id[i].unixid);
-                if (NT_STATUS_EQUAL(id[i].status, NT_STATUS_RETRY)) {
-                        id[i].status = idmap_sid_to_xid(idmap_ctx, mem_ctx,
-                                                        id[i].sid,
-                                                        &id[i].unixid);
-                }
-                if (!NT_STATUS_IS_OK(id[i].status)) {
-                        DEBUG(1, ("idmapping sid_to_xid failed for id[%d]\n", i));
+        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++;
-                }
-        }
-
-        if (error_count == 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;