The branch, master has been updated
via be026a6... s3:groupmap revert to tdb storage
from 05bd8c1... s4:srvsvc RPC - revert one unsigned integer "i" back to
signed
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit be026a6fd89b44ba7e6bdf5bef049959b242c61e
Author: Simo Sorce <[email protected]>
Date: Fri Feb 26 15:16:23 2010 -0500
s3:groupmap revert to tdb storage
Group mapping needs to be cluster aware, and this means using the tdb
backend.
Remove ldb group mapping as this is not cluster aware.
-----------------------------------------------------------------------
Summary of changes:
source3/Makefile.in | 2 +-
source3/groupdb/mapping.c | 20 +--
source3/groupdb/mapping_ldb.c | 701 -----------------------------------------
source3/groupdb/mapping_tdb.c | 279 ++++++++++++++++-
4 files changed, 269 insertions(+), 733 deletions(-)
delete mode 100644 source3/groupdb/mapping_ldb.c
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 323da3c..325984c 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -680,7 +680,7 @@ CP850_OBJ = modules/CP850.o
CP437_OBJ = modules/CP437.o
CHARSET_MACOSXFS_OBJ = modules/charset_macosxfs.o
-GROUPDB_OBJ = groupdb/mapping.o groupdb/mapping_tdb.o groupdb/mapping_ldb.o
+GROUPDB_OBJ = groupdb/mapping.o groupdb/mapping_tdb.o
PROFILE_OBJ = profile/profile.o
PROFILES_OBJ = utils/profiles.o \
diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c
index 579486b..b648c58 100644
--- a/source3/groupdb/mapping.c
+++ b/source3/groupdb/mapping.c
@@ -30,30 +30,12 @@ static const struct mapping_backend *backend;
*/
static bool init_group_mapping(void)
{
- const char *backend_string;
-
if (backend != NULL) {
/* already initialised */
return True;
}
- /*
- * default to using the ldb backend. This parameter should
- * disappear in future versions of Samba3.
- *
- * But it's needed for cluster setups, because it's
- * not yet possible to distribute a ldb inside a cluster.
- */
- backend_string = lp_parm_const_string(-1, "groupdb", "backend", "ldb");
-
- if (strcmp(backend_string, "ldb") == 0) {
- backend = groupdb_ldb_init();
- } else if (strcmp(backend_string, "tdb") == 0) {
- backend = groupdb_tdb_init();
- } else {
- DEBUG(0,("Unknown groupdb backend '%s'\n", backend_string));
- smb_panic("Unknown groupdb backend");
- }
+ backend = groupdb_tdb_init();
return backend != NULL;
}
diff --git a/source3/groupdb/mapping_ldb.c b/source3/groupdb/mapping_ldb.c
deleted file mode 100644
index 89966e1..0000000
--- a/source3/groupdb/mapping_ldb.c
+++ /dev/null
@@ -1,701 +0,0 @@
-/*
- * Unix SMB/CIFS implementation.
- *
- * group mapping code on top of ldb
- *
- * Copyright (C) Andrew Tridgell 2006
- *
- * based on tdb group mapping code from groupdb/mapping.c
- *
- * 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
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "includes.h"
-#include "groupdb/mapping.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
-
-static struct ldb_context *ldb;
-
-static bool mapping_upgrade(const char *tdb_path);
-
-/*
- connect to the group mapping ldb
-*/
-static bool init_group_mapping(void)
-{
- bool existed;
- const char *init_ldif[] =
- { "dn: @ATTRIBUTES\n" \
- "ntName: CASE_INSENSITIVE\n" \
- "\n",
- "dn: @INDEXLIST\n" \
- "@IDXATTR: gidNumber\n" \
- "@IDXATTR: ntName\n" \
- "@IDXATTR: member\n" };
- const char *db_path, *tdb_path;
- int ret;
- int flags = 0;
-
- if (ldb != NULL) {
- return True;
- }
-
- /* this is needed as Samba3 doesn't have this globally yet */
- ldb_global_init();
-
- db_path = state_path("group_mapping.ldb");
-
- ldb = ldb_init(NULL, NULL);
- if (ldb == NULL) goto failed;
-
- /* Ensure this db is created read/write for root only. */
- ldb_set_create_perms(ldb, 0600);
-
- existed = file_exist(db_path);
-
- if (lp_parm_bool(-1, "groupmap", "nosync", False)) {
- flags |= LDB_FLG_NOSYNC;
- }
-
- if (!lp_use_mmap()) {
- flags |= LDB_FLG_NOMMAP;
- }
-
- ret = ldb_connect(ldb, db_path, flags, NULL);
- if (ret != LDB_SUCCESS) {
- goto failed;
- }
-
- /* force the permissions on the ldb to 0600 - this will fix
- existing databases as well as new ones */
- if (chmod(db_path, 0600) != 0) {
- goto failed;
- }
-
- if (!existed) {
- /* initialise the ldb with an index */
- struct ldb_ldif *ldif;
- int i;
- for (i=0;i<ARRAY_SIZE(init_ldif);i++) {
- ldif = ldb_ldif_read_string(ldb, &init_ldif[i]);
- if (ldif == NULL) goto failed;
- ret = ldb_add(ldb, ldif->msg);
- talloc_free(ldif);
- if (ret == -1) goto failed;
- }
- }
-
- /* possibly upgrade */
- tdb_path = state_path("group_mapping.tdb");
- if (file_exist(tdb_path) && !mapping_upgrade(tdb_path)) {
- unlink(state_path("group_mapping.ldb"));
- goto failed;
- }
-
- return True;
-
-failed:
- DEBUG(0,("Failed to open group mapping ldb '%s' - '%s'\n",
- db_path, ldb?ldb_errstring(ldb):strerror(errno)));
- talloc_free(ldb);
- ldb = NULL;
- return False;
-}
-
-
-/*
- form the DN for a mapping entry from a SID
- */
-static struct ldb_dn *mapping_dn(TALLOC_CTX *mem_ctx, const DOM_SID *sid)
-{
- fstring string_sid;
- uint32_t rid;
- DOM_SID domsid;
-
- sid_copy(&domsid, sid);
- if (!sid_split_rid(&domsid, &rid)) {
- return NULL;
- }
- if (!sid_to_fstring(string_sid, &domsid)) {
- return NULL;
- }
- /* we split by domain and rid so we can do a subtree search
- when we only want one domain */
- return ldb_dn_new_fmt(mem_ctx, ldb, "rid=%u,domain=%s",
- rid, string_sid);
-}
-
-/*
- add a group mapping entry
- */
-static bool add_mapping_entry(GROUP_MAP *map, int flag)
-{
- struct ldb_message *msg;
- int ret, i;
- fstring string_sid;
-
- msg = ldb_msg_new(ldb);
- if (msg == NULL) {
- return False;
- }
-
- msg->dn = mapping_dn(msg, &map->sid);
- if (msg->dn == NULL) {
- goto failed;
- }
-
- if (ldb_msg_add_string(msg, "objectClass", "groupMap") != LDB_SUCCESS ||
- ldb_msg_add_string(msg, "sid",
- sid_to_fstring(string_sid, &map->sid)) !=
LDB_SUCCESS ||
- ldb_msg_add_fmt(msg, "gidNumber", "%u", (unsigned)map->gid) !=
LDB_SUCCESS ||
- ldb_msg_add_fmt(msg, "sidNameUse", "%u",
(unsigned)map->sid_name_use) != LDB_SUCCESS ||
- ldb_msg_add_string(msg, "comment", map->comment) != LDB_SUCCESS ||
- ldb_msg_add_string(msg, "ntName", map->nt_name) != LDB_SUCCESS) {
- goto failed;
- }
-
- ret = ldb_add(ldb, msg);
-
- /* if it exists we update it. This is a hangover from the semantics the
- tdb backend had */
- if (ret == LDB_ERR_ENTRY_ALREADY_EXISTS) {
- for (i=0;i<msg->num_elements;i++) {
- msg->elements[i].flags = LDB_FLAG_MOD_REPLACE;
- }
- ret = ldb_modify(ldb, msg);
- }
-
- talloc_free(msg);
-
- return ret == LDB_SUCCESS;
-
-failed:
- talloc_free(msg);
- return False;
-}
-
-/*
- unpack a ldb message into a GROUP_MAP structure
-*/
-static bool msg_to_group_map(struct ldb_message *msg, GROUP_MAP *map)
-{
- const char *sidstr;
-
- map->gid = ldb_msg_find_attr_as_int(msg, "gidNumber", -1);
- map->sid_name_use = ldb_msg_find_attr_as_int(msg, "sidNameUse", -1);
- fstrcpy(map->nt_name, ldb_msg_find_attr_as_string(msg, "ntName", NULL));
- fstrcpy(map->comment, ldb_msg_find_attr_as_string(msg, "comment",
NULL));
- sidstr = ldb_msg_find_attr_as_string(msg, "sid", NULL);
-
- if (!string_to_sid(&map->sid, sidstr) ||
- map->gid == (gid_t)-1 ||
- map->sid_name_use == (enum lsa_SidType)-1) {
- DEBUG(0,("Unable to unpack group mapping\n"));
- return False;
- }
-
- return True;
-}
-
-/*
- return a group map entry for a given sid
-*/
-static bool get_group_map_from_sid(DOM_SID sid, GROUP_MAP *map)
-{
- int ret;
- struct ldb_dn *dn;
- struct ldb_result *res=NULL;
- bool result = false;
-
- dn = mapping_dn(talloc_tos(), &sid);
- if (dn == NULL) {
- goto failed;
- }
-
- ret = ldb_search(ldb, dn, &res, dn, LDB_SCOPE_BASE, NULL, NULL);
- if (ret != LDB_SUCCESS || res->count != 1) {
- goto failed;
- }
-
- if (!msg_to_group_map(res->msgs[0], map)) {
- goto failed;
- }
-
- result = true;
- failed:
- talloc_free(dn);
- return result;
-}
-
-/*
- return a group map entry for a given gid
-*/
-static bool get_group_map_from_gid(gid_t gid, GROUP_MAP *map)
-{
- int ret;
- struct ldb_result *res=NULL;
- bool result = false;
-
- ret = ldb_search(ldb, talloc_tos(), &res, NULL, LDB_SCOPE_SUBTREE,
- NULL, "(&(gidNumber=%u)(objectClass=groupMap))",
- (unsigned)gid);
- if (ret != LDB_SUCCESS || res->count != 1) {
- goto failed;
- }
-
- if (!msg_to_group_map(res->msgs[0], map)) {
- goto failed;
- }
-
- result = true;
-failed:
- TALLOC_FREE(res);
- return result;
-}
-
-/*
- Return the sid and the type of the unix group.
-*/
-static bool get_group_map_from_ntname(const char *name, GROUP_MAP *map)
-{
- int ret;
- struct ldb_result *res=NULL;
- bool result = false;
-
- ret = ldb_search(ldb, talloc_tos(), &res, NULL, LDB_SCOPE_SUBTREE,
- NULL, "(&(ntName=%s)(objectClass=groupMap))", name);
- if (ret != LDB_SUCCESS || res->count != 1) {
- goto failed;
- }
-
- if (!msg_to_group_map(res->msgs[0], map)) {
- goto failed;
- }
-
- result = true;
- failed:
- TALLOC_FREE(res);
- return result;
-}
-
-/*
- Remove a group mapping entry.
-*/
-static bool group_map_remove(const DOM_SID *sid)
-{
- struct ldb_dn *dn;
- int ret;
-
- dn = mapping_dn(ldb, sid);
- if (dn == NULL) {
- return False;
- }
- ret = ldb_delete(ldb, dn);
- talloc_free(dn);
-
- return ret == LDB_SUCCESS;
-}
-
-
-/*
- Enumerate the group mappings for a domain
-*/
-static bool enum_group_mapping(const DOM_SID *domsid, enum lsa_SidType
sid_name_use,
- GROUP_MAP **pp_rmap,
- size_t *p_num_entries, bool unix_only)
-{
- int i, ret;
- fstring name;
- struct ldb_result *res = NULL;
- struct ldb_dn *basedn=NULL;
- TALLOC_CTX *tmp_ctx;
-
- tmp_ctx = talloc_new(ldb);
- if (tmp_ctx == NULL) goto failed;
-
- /* we do a subtree search on the domain */
- if (domsid != NULL) {
- sid_to_fstring(name, domsid);
- basedn = ldb_dn_new_fmt(tmp_ctx, ldb, "domain=%s", name);
- if (basedn == NULL) goto failed;
- }
-
- if (sid_name_use == SID_NAME_UNKNOWN) {
- ret = ldb_search(ldb, tmp_ctx, &res, basedn, LDB_SCOPE_SUBTREE,
- NULL, "(&(objectClass=groupMap))");
- } else {
- ret = ldb_search(ldb, tmp_ctx, &res, basedn, LDB_SCOPE_SUBTREE,
- NULL,
"(&(sidNameUse=%u)(objectClass=groupMap))",
- sid_name_use);
- }
-
- if (ret != LDB_SUCCESS) goto failed;
-
- (*pp_rmap) = NULL;
- *p_num_entries = 0;
-
- for (i=0;i<res->count;i++) {
- (*pp_rmap) = SMB_REALLOC_ARRAY((*pp_rmap), GROUP_MAP,
- (*p_num_entries)+1);
- if (!(*pp_rmap)) goto failed;
-
- if (!msg_to_group_map(res->msgs[i],
&(*pp_rmap)[*p_num_entries])) {
- goto failed;
- }
-
- (*p_num_entries)++;
- }
-
- talloc_free(tmp_ctx);
- return True;
-
-failed:
- talloc_free(tmp_ctx);
- return False;
-}
-
-/*
- This operation happens on session setup, so it should better be fast. We
- store a list of aliases a SID is member of hanging off MEMBEROF/SID.
-*/
-static NTSTATUS one_alias_membership(const DOM_SID *member,
- DOM_SID **sids, size_t *num)
-{
- const char *attrs[] = {
- "sid",
- NULL
- };
- DOM_SID alias;
- int ret, i;
- struct ldb_result *res=NULL;
- fstring string_sid;
- NTSTATUS status;
-
- if (!sid_to_fstring(string_sid, member)) {
- return NT_STATUS_INVALID_PARAMETER;
- }
-
- ret = ldb_search(ldb, talloc_tos(), &res, NULL, LDB_SCOPE_SUBTREE,
- attrs, "(&(member=%s)(objectClass=groupMap))",
- string_sid);
- if (ret != LDB_SUCCESS) {
- status = NT_STATUS_INTERNAL_DB_CORRUPTION;
- goto failed;
- }
-
- for (i=0;i<res->count;i++) {
- struct ldb_message_element *el;
- el = ldb_msg_find_element(res->msgs[i], "sid");
- if (el == NULL || el->num_values != 1) {
- status = NT_STATUS_INTERNAL_DB_CORRUPTION;
- goto failed;
- }
- string_to_sid(&alias, (char *)el->values[0].data);
- status = add_sid_to_array_unique(NULL, &alias, sids, num);
- if (!NT_STATUS_IS_OK(status)) {
- goto failed;
- }
- }
-
- status = NT_STATUS_OK;
- failed:
- TALLOC_FREE(res);
- return status;
-}
-
-/*
- add/remove a member field
-*/
-static NTSTATUS modify_aliasmem(const DOM_SID *alias, const DOM_SID *member,
- int operation)
-{
- fstring string_sid;
- int ret;
- struct ldb_message msg;
- struct ldb_message_element el;
- struct ldb_val val;
- TALLOC_CTX *tmp_ctx;
- GROUP_MAP map;
-
- if (!get_group_map_from_sid(*alias, &map)) {
- sid_to_fstring(string_sid, alias);
- return NT_STATUS_NO_SUCH_ALIAS;
- }
-
- if ((map.sid_name_use != SID_NAME_ALIAS) &&
- (map.sid_name_use != SID_NAME_WKN_GRP)) {
- DEBUG(0,("sid_name_use=%d\n", map.sid_name_use));
- return NT_STATUS_NO_SUCH_ALIAS;
- }
-
- tmp_ctx = talloc_new(NULL);
- if (tmp_ctx == NULL) {
- return NT_STATUS_NO_MEMORY;
--
Samba Shared Repository
