return ret;
}
-struct idmap_ldap_context {
+struct idmap_ldap_alloc_context {
struct smbldap_state *smbldap_state;
char *url;
char *suffix;
char *user_dn;
- bool anon;
};
-struct idmap_ldap_alloc_context {
+struct idmap_ldap_context {
struct smbldap_state *smbldap_state;
char *url;
char *suffix;
char *user_dn;
+ bool anon;
+ struct idmap_ldap_alloc_context *alloc;
};
#define CHECK_ALLOC_DONE(mem) do { \
IDMAP ALLOC TDB BACKEND
**********************************************************************/
-static struct idmap_ldap_alloc_context *idmap_alloc_ldap;
-
/*********************************************************************
********************************************************************/
static NTSTATUS verify_idpool(struct idmap_domain *dom)
{
NTSTATUS ret;
- TALLOC_CTX *ctx;
+ TALLOC_CTX *mem_ctx;
LDAPMessage *result = NULL;
LDAPMod **mods = NULL;
const char **attr_list;
char *filter;
int count;
int rc;
+ struct idmap_ldap_context *ctx;
+
+ ctx = talloc_get_type(dom->private_data, struct idmap_ldap_context);
- if ( ! idmap_alloc_ldap) {
+ if (!ctx->alloc) {
return NT_STATUS_UNSUCCESSFUL;
}
- ctx = talloc_new(idmap_alloc_ldap);
- if ( ! ctx) {
+ mem_ctx = talloc_new(ctx->alloc);
+ if (mem_ctx == NULL) {
DEBUG(0, ("Out of memory!\n"));
return NT_STATUS_NO_MEMORY;
}
- filter = talloc_asprintf(ctx, "(objectclass=%s)", LDAP_OBJ_IDPOOL);
+ filter = talloc_asprintf(mem_ctx, "(objectclass=%s)", LDAP_OBJ_IDPOOL);
CHECK_ALLOC_DONE(filter);
- attr_list = get_attr_list(ctx, idpool_attr_list);
+ attr_list = get_attr_list(mem_ctx, idpool_attr_list);
CHECK_ALLOC_DONE(attr_list);
- rc = smbldap_search(idmap_alloc_ldap->smbldap_state,
- idmap_alloc_ldap->suffix,
+ rc = smbldap_search(ctx->alloc->smbldap_state,
+ ctx->alloc->suffix,
LDAP_SCOPE_SUBTREE,
filter,
attr_list,
return NT_STATUS_UNSUCCESSFUL;
}
- count = ldap_count_entries(idmap_alloc_ldap->smbldap_state->ldap_struct,
+ count = ldap_count_entries(ctx->alloc->smbldap_state->ldap_struct,
result);
ldap_msgfree(result);
if ( count > 1 ) {
DEBUG(0,("Multiple entries returned from %s (base == %s)\n",
- filter, idmap_alloc_ldap->suffix));
+ filter, ctx->alloc->suffix));
ret = NT_STATUS_UNSUCCESSFUL;
goto done;
}
else if (count == 0) {
char *uid_str, *gid_str;
- uid_str = talloc_asprintf(ctx, "%lu",
+ uid_str = talloc_asprintf(mem_ctx, "%lu",
(unsigned long)dom->low_id);
- gid_str = talloc_asprintf(ctx, "%lu",
+ gid_str = talloc_asprintf(mem_ctx, "%lu",
(unsigned long)dom->low_id);
smbldap_set_mod(&mods, LDAP_MOD_ADD,
LDAP_ATTR_GIDNUMBER),
gid_str);
if (mods) {
- rc = smbldap_modify(idmap_alloc_ldap->smbldap_state,
- idmap_alloc_ldap->suffix,
+ rc = smbldap_modify(ctx->alloc->smbldap_state,
+ ctx->alloc->suffix,
mods);
ldap_mods_free(mods, True);
} else {
ret = (rc == LDAP_SUCCESS)?NT_STATUS_OK:NT_STATUS_UNSUCCESSFUL;
done:
- talloc_free(ctx);
+ talloc_free(mem_ctx);
return ret;
}
Initialise idmap database.
*****************************************************************************/
+static int idmap_ldap_alloc_close_destructor(struct idmap_ldap_alloc_context *ctx)
+{
+ smbldap_free_struct(&ctx->smbldap_state);
+ DEBUG(5,("The connection to the LDAP server was closed\n"));
+ /* maybe free the results here --metze */
+ return 0;
+}
+
static NTSTATUS idmap_ldap_alloc_init(struct idmap_domain *dom,
const char *params)
{
NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
const char *tmp;
+ struct idmap_ldap_context *ctx;
/* Only do init if we are online */
if (idmap_is_offline()) {
return NT_STATUS_FILE_IS_OFFLINE;
}
- idmap_alloc_ldap = TALLOC_ZERO_P(NULL, struct idmap_ldap_alloc_context);
- CHECK_ALLOC_DONE( idmap_alloc_ldap );
+ ctx = talloc_get_type(dom->private_data, struct idmap_ldap_context);
+
+ ctx->alloc = talloc_zero(ctx, struct idmap_ldap_alloc_context);
+ CHECK_ALLOC_DONE(ctx->alloc);
if (params && *params) {
/* assume location is the only parameter */
- idmap_alloc_ldap->url = talloc_strdup(idmap_alloc_ldap, params);
+ ctx->alloc->url = talloc_strdup(ctx->alloc, params);
} else {
tmp = lp_parm_const_string(-1, "idmap alloc config",
"ldap_url", NULL);
goto done;
}
- idmap_alloc_ldap->url = talloc_strdup(idmap_alloc_ldap, tmp);
+ ctx->alloc->url = talloc_strdup(ctx->alloc, tmp);
}
- CHECK_ALLOC_DONE( idmap_alloc_ldap->url );
+ CHECK_ALLOC_DONE(ctx->alloc->url);
- trim_char(idmap_alloc_ldap->url, '\"', '\"');
+ trim_char(ctx->alloc->url, '\"', '\"');
tmp = lp_parm_const_string(-1, "idmap alloc config",
"ldap_base_dn", NULL);
}
}
- idmap_alloc_ldap->suffix = talloc_strdup(idmap_alloc_ldap, tmp);
- CHECK_ALLOC_DONE( idmap_alloc_ldap->suffix );
+ ctx->alloc->suffix = talloc_strdup(ctx->alloc, tmp);
+ CHECK_ALLOC_DONE(ctx->alloc->suffix);
- ret = smbldap_init(idmap_alloc_ldap, winbind_event_context(),
- idmap_alloc_ldap->url,
- &idmap_alloc_ldap->smbldap_state);
+ ret = smbldap_init(ctx->alloc, winbind_event_context(),
+ ctx->alloc->url,
+ &ctx->alloc->smbldap_state);
if (!NT_STATUS_IS_OK(ret)) {
DEBUG(1, ("ERROR: smbldap_init (%s) failed!\n",
- idmap_alloc_ldap->url));
+ ctx->alloc->url));
goto done;
}
- ret = get_credentials( idmap_alloc_ldap,
- idmap_alloc_ldap->smbldap_state,
- "idmap alloc config", NULL,
- &idmap_alloc_ldap->user_dn );
+ talloc_set_destructor(ctx->alloc, idmap_ldap_alloc_close_destructor);
+
+ ret = get_credentials(ctx->alloc,
+ ctx->alloc->smbldap_state,
+ "idmap alloc config", NULL,
+ &ctx->alloc->user_dn);
if ( !NT_STATUS_IS_OK(ret) ) {
DEBUG(1,("idmap_ldap_alloc_init: Failed to get connection "
"credentials (%s)\n", nt_errstr(ret)));
done:
if ( !NT_STATUS_IS_OK( ret ) )
- TALLOC_FREE( idmap_alloc_ldap );
+ TALLOC_FREE(ctx->alloc);
return ret;
}
static NTSTATUS idmap_ldap_allocate_id(struct idmap_domain *dom,
struct unixid *xid)
{
- TALLOC_CTX *ctx;
+ TALLOC_CTX *mem_ctx;
NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
int rc = LDAP_SERVER_DOWN;
int count = 0;
const char *dn = NULL;
const char **attr_list;
const char *type;
+ struct idmap_ldap_context *ctx;
/* Only do query if we are online */
if (idmap_is_offline()) {
return NT_STATUS_FILE_IS_OFFLINE;
}
- if ( ! idmap_alloc_ldap) {
+ ctx = talloc_get_type(dom->private_data, struct idmap_ldap_context);
+
+ if (!ctx->alloc) {
return NT_STATUS_UNSUCCESSFUL;
}
- ctx = talloc_new(idmap_alloc_ldap);
- if ( ! ctx) {
+ mem_ctx = talloc_new(ctx->alloc);
+ if (!mem_ctx) {
DEBUG(0, ("Out of memory!\n"));
return NT_STATUS_NO_MEMORY;
}
return NT_STATUS_INVALID_PARAMETER;
}
- filter = talloc_asprintf(ctx, "(objectClass=%s)", LDAP_OBJ_IDPOOL);
+ filter = talloc_asprintf(mem_ctx, "(objectClass=%s)", LDAP_OBJ_IDPOOL);
CHECK_ALLOC_DONE(filter);
- attr_list = get_attr_list(ctx, idpool_attr_list);
+ attr_list = get_attr_list(mem_ctx, idpool_attr_list);
CHECK_ALLOC_DONE(attr_list);
DEBUG(10, ("Search of the id pool (filter: %s)\n", filter));
- rc = smbldap_search(idmap_alloc_ldap->smbldap_state,
- idmap_alloc_ldap->suffix,
+ rc = smbldap_search(ctx->alloc->smbldap_state,
+ ctx->alloc->suffix,
LDAP_SCOPE_SUBTREE, filter,
attr_list, 0, &result);
goto done;
}
- talloc_autofree_ldapmsg(ctx, result);
+ talloc_autofree_ldapmsg(mem_ctx, result);
- count = ldap_count_entries(idmap_alloc_ldap->smbldap_state->ldap_struct,
+ count = ldap_count_entries(ctx->alloc->smbldap_state->ldap_struct,
result);
if (count != 1) {
DEBUG(0,("Single %s object not found\n", LDAP_OBJ_IDPOOL));
goto done;
}
- entry = ldap_first_entry(idmap_alloc_ldap->smbldap_state->ldap_struct,
+ entry = ldap_first_entry(ctx->alloc->smbldap_state->ldap_struct,
result);
- dn = smbldap_talloc_dn(ctx,
- idmap_alloc_ldap->smbldap_state->ldap_struct,
+ dn = smbldap_talloc_dn(mem_ctx,
+ ctx->alloc->smbldap_state->ldap_struct,
entry);
if ( ! dn) {
goto done;
}
- if ( ! (id_str = smbldap_talloc_single_attribute(idmap_alloc_ldap->smbldap_state->ldap_struct,
- entry, type, ctx))) {
+ id_str = smbldap_talloc_single_attribute(
+ ctx->alloc->smbldap_state->ldap_struct,
+ entry, type, mem_ctx);
+ if (id_str == NULL) {
DEBUG(0,("%s attribute not found\n", type));
ret = NT_STATUS_UNSUCCESSFUL;
goto done;
goto done;
}
- new_id_str = talloc_asprintf(ctx, "%lu", (unsigned long)xid->id + 1);
+ new_id_str = talloc_asprintf(mem_ctx, "%lu", (unsigned long)xid->id + 1);
if ( ! new_id_str) {
DEBUG(0,("Out of memory\n"));
ret = NT_STATUS_NO_MEMORY;
DEBUG(10, ("Try to atomically increment the id (%s -> %s)\n",
id_str, new_id_str));
- rc = smbldap_modify(idmap_alloc_ldap->smbldap_state, dn, mods);
+ rc = smbldap_modify(ctx->alloc->smbldap_state, dn, mods);
ldap_mods_free(mods, True);
ret = NT_STATUS_OK;
done:
- talloc_free(ctx);
+ talloc_free(mem_ctx);
return ret;
}
-/**********************************
- Close idmap ldap alloc
-**********************************/
-
-static NTSTATUS idmap_ldap_alloc_close(void)
+/**
+ * Allocate a new unix-ID.
+ * For now this is for the default idmap domain only.
+ * Should be extended later on.
+ */
+static NTSTATUS idmap_ldap_get_new_id(struct idmap_domain *dom,
+ struct unixid *id)
{
- if (idmap_alloc_ldap) {
- smbldap_free_struct(&idmap_alloc_ldap->smbldap_state);
- DEBUG(5,("The connection to the LDAP server was closed\n"));
- /* maybe free the results here --metze */
- TALLOC_FREE(idmap_alloc_ldap);
+ NTSTATUS ret;
+
+ if (!strequal(dom->name, "*")) {
+ DEBUG(3, ("idmap_ldap_get_new_id: "
+ "Refusing allocation of a new unixid for domain'%s'. "
+ "Currently only supported for the default "
+ "domain \"*\".\n",
+ dom->name));
+ return NT_STATUS_NOT_IMPLEMENTED;
}
- return NT_STATUS_OK;
+
+ ret = idmap_ldap_allocate_id(dom, id);
+
+ return ret;
}
return ret;
}
+/**
+ * set a mapping.
+ */
+
+/* TODO: change this: This function cannot be called to modify a mapping,
+ * only set a new one */
+
+static NTSTATUS idmap_ldap_set_mapping(struct idmap_domain *dom,
+ const struct id_map *map)
+{
+ NTSTATUS ret;
+ TALLOC_CTX *memctx;
+ struct idmap_ldap_context *ctx;
+ LDAPMessage *entry = NULL;
+ LDAPMod **mods = NULL;
+ const char *type;
+ char *id_str;
+ char *sid;
+ char *dn;
+ int rc = -1;
+
+ /* Only do query if we are online */
+ if (idmap_is_offline()) {
+ return NT_STATUS_FILE_IS_OFFLINE;
+ }
+
+ ctx = talloc_get_type(dom->private_data, struct idmap_ldap_context);
+
+ switch(map->xid.type) {
+ case ID_TYPE_UID:
+ type = get_attr_key2string(sidmap_attr_list,
+ LDAP_ATTR_UIDNUMBER);
+ break;
+
+ case ID_TYPE_GID:
+ type = get_attr_key2string(sidmap_attr_list,
+ LDAP_ATTR_GIDNUMBER);
+ break;
+
+ default:
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+
+ memctx = talloc_new(ctx);
+ if ( ! memctx) {
+ DEBUG(0, ("Out of memory!\n"));
+ return NT_STATUS_NO_MEMORY;
+ }
+
+ id_str = talloc_asprintf(memctx, "%lu", (unsigned long)map->xid.id);
+ CHECK_ALLOC_DONE(id_str);
+
+ sid = talloc_strdup(memctx, sid_string_talloc(memctx, map->sid));
+ CHECK_ALLOC_DONE(sid);
+
+ dn = talloc_asprintf(memctx, "%s=%s,%s",
+ get_attr_key2string(sidmap_attr_list, LDAP_ATTR_SID),
+ sid,
+ ctx->suffix);
+ CHECK_ALLOC_DONE(dn);
+
+ smbldap_set_mod(&mods, LDAP_MOD_ADD,
+ "objectClass", LDAP_OBJ_IDMAP_ENTRY);
+
+ smbldap_make_mod(ctx->smbldap_state->ldap_struct,
+ entry, &mods, type, id_str);
+
+ smbldap_make_mod(ctx->smbldap_state->ldap_struct, entry, &mods,
+ get_attr_key2string(sidmap_attr_list, LDAP_ATTR_SID),
+ sid);
+
+ if ( ! mods) {
+ DEBUG(2, ("ERROR: No mods?\n"));
+ ret = NT_STATUS_UNSUCCESSFUL;
+ goto done;
+ }
+
+ /* TODO: remove conflicting mappings! */
+
+ smbldap_set_mod(&mods, LDAP_MOD_ADD, "objectClass", LDAP_OBJ_SID_ENTRY);
+
+ DEBUG(10, ("Set DN %s (%s -> %s)\n", dn, sid, id_str));
+
+ rc = smbldap_add(ctx->smbldap_state, dn, mods);
+ ldap_mods_free(mods, True);
+
+ if (rc != LDAP_SUCCESS) {
+ char *ld_error = NULL;
+ ldap_get_option(ctx->smbldap_state->ldap_struct,
+ LDAP_OPT_ERROR_STRING, &ld_error);
+ DEBUG(0,("ldap_set_mapping_internals: Failed to add %s to %lu "
+ "mapping [%s]\n", sid,
+ (unsigned long)map->xid.id, type));
+ DEBUG(0, ("ldap_set_mapping_internals: Error was: %s (%s)\n",
+ ld_error ? ld_error : "(NULL)", ldap_err2string (rc)));
+ if (ld_error) {
+ ldap_memfree(ld_error);
+ }
+ ret = NT_STATUS_UNSUCCESSFUL;
+ goto done;
+ }
+
+ DEBUG(10,("ldap_set_mapping: Successfully created mapping from %s to "
+ "%lu [%s]\n", sid, (unsigned long)map->xid.id, type));
+
+ ret = NT_STATUS_OK;
+
+done:
+ talloc_free(memctx);
+ return ret;
+}
+
+/**
+ * Create a new mapping for an unmapped SID, also allocating a new ID.
+ * If possible, this should be run inside a transaction to make the
+ * action atomic.
+ */
+static NTSTATUS idmap_ldap_new_mapping(struct idmap_domain *dom, struct id_map *map)
+{
+ NTSTATUS ret;
+
+ if (map == NULL) {
+ ret = NT_STATUS_INVALID_PARAMETER;
+ goto done;
+ }
+
+ if ((map->xid.type != ID_TYPE_UID) && (map->xid.type != ID_TYPE_GID)) {
+ ret = NT_STATUS_INVALID_PARAMETER;
+ goto done;
+ }
+
+ if (map->sid == NULL) {
+ ret = NT_STATUS_INVALID_PARAMETER;
+ goto done;
+ }
+
+ ret = idmap_ldap_get_new_id(dom, &map->xid);
+ if (!NT_STATUS_IS_OK(ret)) {
+ DEBUG(3, ("Could not allocate id: %s\n", nt_errstr(ret)));
+ goto done;
+ }
+
+ DEBUG(10, ("Setting mapping: %s <-> %s %lu\n",
+ sid_string_dbg(map->sid),
+ (map->xid.type == ID_TYPE_UID) ? "UID" : "GID",
+ (unsigned long)map->xid.id));
+
+ map->status = ID_MAPPED;
+
+ /* store the mapping */
+ ret = idmap_ldap_set_mapping(dom, map);
+ if (!NT_STATUS_IS_OK(ret)) {
+ DEBUG(3, ("Could not store the new mapping: %s\n",
+ nt_errstr(ret)));
+ }
+
+done:
+ return ret;
+}
+
+
/* max number of ids requested per batch query */
#define IDMAP_LDAP_MAX_IDS 30
goto again;
}
- ret = NT_STATUS_OK;
-
- /* mark all unknwon/expired ones as unmapped */
+ /*
+ * try to create new mappings for unmapped sids
+ */
for (i = 0; ids[i]; i++) {
- if (ids[i]->status != ID_MAPPED)
+ if (ids[i]->status != ID_MAPPED) {
ids[i]->status = ID_UNMAPPED;
- }
-
-done:
- talloc_free(memctx);
- return ret;
-}
-
-/**********************************
- set a mapping.
-**********************************/
-
-/* TODO: change this: This function cannot be called to modify a mapping,
- * only set a new one */
-
-static NTSTATUS idmap_ldap_set_mapping(struct idmap_domain *dom,
- const struct id_map *map)
-{
- NTSTATUS ret;
- TALLOC_CTX *memctx;
- struct idmap_ldap_context *ctx;
- LDAPMessage *entry = NULL;
- LDAPMod **mods = NULL;
- const char *type;
- char *id_str;
- char *sid;
- char *dn;
- int rc = -1;
-
- /* Only do query if we are online */
- if (idmap_is_offline()) {
- return NT_STATUS_FILE_IS_OFFLINE;
- }
-
- ctx = talloc_get_type(dom->private_data, struct idmap_ldap_context);
-
- switch(map->xid.type) {
- case ID_TYPE_UID:
- type = get_attr_key2string(sidmap_attr_list,
- LDAP_ATTR_UIDNUMBER);
- break;
-
- case ID_TYPE_GID:
- type = get_attr_key2string(sidmap_attr_list,
- LDAP_ATTR_GIDNUMBER);
- break;
-
- default:
- return NT_STATUS_INVALID_PARAMETER;
- }
-
- memctx = talloc_new(ctx);
- if ( ! memctx) {
- DEBUG(0, ("Out of memory!\n"));
- return NT_STATUS_NO_MEMORY;
- }
-
- id_str = talloc_asprintf(memctx, "%lu", (unsigned long)map->xid.id);
- CHECK_ALLOC_DONE(id_str);
-
- sid = talloc_strdup(memctx, sid_string_talloc(memctx, map->sid));
- CHECK_ALLOC_DONE(sid);
-
- dn = talloc_asprintf(memctx, "%s=%s,%s",
- get_attr_key2string(sidmap_attr_list, LDAP_ATTR_SID),
- sid,
- ctx->suffix);
- CHECK_ALLOC_DONE(dn);
-
- smbldap_set_mod(&mods, LDAP_MOD_ADD,
- "objectClass", LDAP_OBJ_IDMAP_ENTRY);
-
- smbldap_make_mod(ctx->smbldap_state->ldap_struct,
- entry, &mods, type, id_str);
-
- smbldap_make_mod(ctx->smbldap_state->ldap_struct, entry, &mods,
- get_attr_key2string(sidmap_attr_list, LDAP_ATTR_SID),
- sid);
-
- if ( ! mods) {
- DEBUG(2, ("ERROR: No mods?\n"));
- ret = NT_STATUS_UNSUCCESSFUL;
- goto done;
- }
-
- /* TODO: remove conflicting mappings! */
-
- smbldap_set_mod(&mods, LDAP_MOD_ADD, "objectClass", LDAP_OBJ_SID_ENTRY);
-
- DEBUG(10, ("Set DN %s (%s -> %s)\n", dn, sid, id_str));
-
- rc = smbldap_add(ctx->smbldap_state, dn, mods);
- ldap_mods_free(mods, True);
-
- if (rc != LDAP_SUCCESS) {
- char *ld_error = NULL;
- ldap_get_option(ctx->smbldap_state->ldap_struct,
- LDAP_OPT_ERROR_STRING, &ld_error);
- DEBUG(0,("ldap_set_mapping_internals: Failed to add %s to %lu "
- "mapping [%s]\n", sid,
- (unsigned long)map->xid.id, type));
- DEBUG(0, ("ldap_set_mapping_internals: Error was: %s (%s)\n",
- ld_error ? ld_error : "(NULL)", ldap_err2string (rc)));
- if (ld_error) {
- ldap_memfree(ld_error);
+ if (ids[i]->sid != NULL) {
+ ret = idmap_ldap_new_mapping(dom, ids[i]);
+ if (!NT_STATUS_IS_OK(ret)) {
+ goto done;
+ }
+ }
}
- ret = NT_STATUS_UNSUCCESSFUL;
- goto done;
}
- DEBUG(10,("ldap_set_mapping: Successfully created mapping from %s to "
- "%lu [%s]\n", sid, (unsigned long)map->xid.id, type));
-
ret = NT_STATUS_OK;
done:
git.samba.org / amitay / samba.git / blobdiff