The branch, v3-2-test has been updated
via 8e0fa453a3d0a2c997a935b6940796612c972708 (commit)
via 38bb69cb316ba605a6d3a4454b986cb63ace3c21 (commit)
via 66d2a9c87411be88269bbb3a4d3c0a218a55be06 (commit)
via 9d30e5991c6fe77ef5fd505efb756554bbe77256 (commit)
from 874a0ffd7dbd993230c00c503ec6b27fbffb7745 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 8e0fa453a3d0a2c997a935b6940796612c972708
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date: Tue Mar 11 14:15:52 2008 +0100
Convert mapping_tdb.c to dbwrap
I know, this is not used anymore, but until ldb knows about ctdb which is
blocked by the lack of transactions in ctdb, a tiny patch reactivating
mapping_tdb.c might be needed for cluster setups.
commit 38bb69cb316ba605a6d3a4454b986cb63ace3c21
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date: Tue Mar 11 12:53:50 2008 +0100
Clean up add_mapping_entry slightly
commit 66d2a9c87411be88269bbb3a4d3c0a218a55be06
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date: Tue Mar 11 12:46:36 2008 +0100
Cleanup after pstring removal
commit 9d30e5991c6fe77ef5fd505efb756554bbe77256
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date: Tue Mar 11 12:30:46 2008 +0100
Convert secrets.c to use dbwrap
-----------------------------------------------------------------------
Summary of changes:
source/groupdb/mapping.h | 2 +
source/groupdb/mapping_tdb.c | 573 +++++++++++++++++++++---------------------
source/passdb/secrets.c | 221 +++++++----------
3 files changed, 376 insertions(+), 420 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/groupdb/mapping.h b/source/groupdb/mapping.h
index 4af3831..c37ae84 100644
--- a/source/groupdb/mapping.h
+++ b/source/groupdb/mapping.h
@@ -2,6 +2,7 @@
#define DATABASE_VERSION_V2 2 /* le format. */
#define GROUP_PREFIX "UNIXGROUP/"
+#define GROUP_PREFIX_LEN 10
/* Alias memberships are stored reverse, as memberships. The performance
* critical operation is to determine the aliases a SID is member of, not
@@ -9,6 +10,7 @@
* hanging of the member as key.
*/
#define MEMBEROF_PREFIX "MEMBEROF/"
+#define MEMBEROF_PREFIX_LEN 9
/*
groupdb mapping backend abstraction
diff --git a/source/groupdb/mapping_tdb.c b/source/groupdb/mapping_tdb.c
index 67e377c..c9c8cdc 100644
--- a/source/groupdb/mapping_tdb.c
+++ b/source/groupdb/mapping_tdb.c
@@ -23,7 +23,7 @@
#include "includes.h"
#include "groupdb/mapping.h"
-static TDB_CONTEXT *tdb; /* used for driver files */
+static struct db_context *db; /* used for driver files */
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);
@@ -34,95 +34,119 @@ static bool group_map_remove(const DOM_SID *sid);
****************************************************************************/
static bool init_group_mapping(void)
{
- const char *vstring = "INFO/version";
- int32 vers_id;
- GROUP_MAP *map_table = NULL;
- size_t num_entries = 0;
-
- if (tdb)
- return True;
-
- tdb = tdb_open_log(state_path("group_mapping.tdb"), 0, TDB_DEFAULT,
O_RDWR|O_CREAT, 0600);
- if (!tdb) {
- DEBUG(0,("Failed to open group mapping database\n"));
- return False;
+ if (db != NULL) {
+ return true;
}
- /* handle a Samba upgrade */
- tdb_lock_bystring(tdb, vstring);
-
- /* Cope with byte-reversed older versions of the db. */
- vers_id = tdb_fetch_int32(tdb, vstring);
- if ((vers_id == DATABASE_VERSION_V1) || (IREV(vers_id) ==
DATABASE_VERSION_V1)) {
- /* Written on a bigendian machine with old fetch_int code. Save
as le. */
- tdb_store_int32(tdb, vstring, DATABASE_VERSION_V2);
- vers_id = DATABASE_VERSION_V2;
+ db = db_open(NULL, state_path("group_mapping.tdb"), 0, TDB_DEFAULT,
+ O_RDWR|O_CREAT, 0600);
+ if (db == NULL) {
+ DEBUG(0, ("Failed to open group mapping database: %s\n",
+ strerror(errno)));
+ return false;
}
- /* if its an unknown version we remove everthing in the db */
-
- if (vers_id != DATABASE_VERSION_V2) {
- tdb_traverse(tdb, tdb_traverse_delete_fn, NULL);
- tdb_store_int32(tdb, vstring, DATABASE_VERSION_V2);
- }
+#if 0
+ /*
+ * This code was designed to handle a group mapping version
+ * upgrade. mapping_tdb is not active by default anymore, so ignore
+ * this here.
+ */
+ {
+ const char *vstring = "INFO/version";
+ int32 vers_id;
+ GROUP_MAP *map_table = NULL;
+ size_t num_entries = 0;
+
+ /* handle a Samba upgrade */
+ tdb_lock_bystring(tdb, vstring);
+
+ /* Cope with byte-reversed older versions of the db. */
+ vers_id = tdb_fetch_int32(tdb, vstring);
+ if ((vers_id == DATABASE_VERSION_V1)
+ || (IREV(vers_id) == DATABASE_VERSION_V1)) {
+ /*
+ * Written on a bigendian machine with old fetch_int
+ * code. Save as le.
+ */
+ tdb_store_int32(tdb, vstring, DATABASE_VERSION_V2);
+ vers_id = DATABASE_VERSION_V2;
+ }
- tdb_unlock_bystring(tdb, vstring);
+ /* if its an unknown version we remove everthing in the db */
- /* cleanup any map entries with a gid == -1 */
-
- if ( enum_group_mapping( NULL, SID_NAME_UNKNOWN, &map_table,
&num_entries, False ) ) {
- int i;
-
- for ( i=0; i<num_entries; i++ ) {
- if ( map_table[i].gid == -1 ) {
- group_map_remove( &map_table[i].sid );
+ if (vers_id != DATABASE_VERSION_V2) {
+ tdb_traverse(tdb, tdb_traverse_delete_fn, NULL);
+ tdb_store_int32(tdb, vstring, DATABASE_VERSION_V2);
+ }
+
+ tdb_unlock_bystring(tdb, vstring);
+
+ /* cleanup any map entries with a gid == -1 */
+
+ if ( enum_group_mapping( NULL, SID_NAME_UNKNOWN, &map_table,
+ &num_entries, False ) ) {
+ int i;
+
+ for ( i=0; i<num_entries; i++ ) {
+ if ( map_table[i].gid == -1 ) {
+ group_map_remove( &map_table[i].sid );
+ }
}
+
+ SAFE_FREE( map_table );
}
-
- SAFE_FREE( map_table );
}
+#endif
+ return true;
+}
+
+static char *group_mapping_key(TALLOC_CTX *mem_ctx, const DOM_SID *sid)
+{
+ char *sidstr, *result;
- return True;
+ sidstr = sid_string_talloc(talloc_tos(), sid);
+ if (sidstr == NULL) {
+ return NULL;
+ }
+
+ result = talloc_asprintf(mem_ctx, "GROUP_PREFIX%s", sidstr);
+
+ TALLOC_FREE(sidstr);
+ return result;
}
/****************************************************************************
****************************************************************************/
static bool add_mapping_entry(GROUP_MAP *map, int flag)
{
- TDB_DATA dbuf;
- char *key = NULL;
- char *buf = NULL;
- fstring string_sid="";
+ char *key, *buf;
int len;
- bool ret;
+ NTSTATUS status;
- sid_to_fstring(string_sid, &map->sid);
+ key = group_mapping_key(talloc_tos(), &map->sid);
+ if (key == NULL) {
+ return NULL;
+ }
len = tdb_pack(NULL, sizeof(buf), "ddff",
map->gid, map->sid_name_use, map->nt_name, map->comment);
- if (len) {
- buf = SMB_MALLOC_ARRAY(char, len);
- if (!buf) {
- return false;
- }
- len = tdb_pack((uint8 *)buf, sizeof(buf), "ddff", map->gid,
- map->sid_name_use, map->nt_name, map->comment);
- }
- if (asprintf(&key, "%s%s", GROUP_PREFIX, string_sid) < 0) {
- SAFE_FREE(buf);
+ buf = TALLOC_ARRAY(key, char, len);
+ if (!buf) {
+ TALLOC_FREE(key);
return false;
}
+ len = tdb_pack((uint8 *)buf, len, "ddff", map->gid,
+ map->sid_name_use, map->nt_name, map->comment);
- dbuf.dsize = len;
- dbuf.dptr = (uint8 *)buf;
+ status = dbwrap_store_bystring(
+ db, key, make_tdb_data((uint8_t *)buf, len), flag);
- ret = (tdb_store_bystring(tdb, key, dbuf, flag) == 0);
+ TALLOC_FREE(key);
- SAFE_FREE(key);
- SAFE_FREE(buf);
- return ret;
+ return NT_STATUS_IS_OK(status);
}
@@ -133,129 +157,121 @@ static bool add_mapping_entry(GROUP_MAP *map, int flag)
static bool get_group_map_from_sid(DOM_SID sid, GROUP_MAP *map)
{
TDB_DATA dbuf;
- char *key = NULL;
- fstring string_sid;
+ char *key;
int ret = 0;
/* the key is the SID, retrieving is direct */
- sid_to_fstring(string_sid, &sid);
- if (asprintf(&key, "%s%s", GROUP_PREFIX, string_sid) < 0) {
+ key = group_mapping_key(talloc_tos(), &map->sid);
+ if (key == NULL) {
return false;
}
- dbuf = tdb_fetch_bystring(tdb, key);
- if (!dbuf.dptr) {
- SAFE_FREE(key);
+ dbuf = dbwrap_fetch_bystring(db, key, key);
+ if (dbuf.dptr == NULL) {
+ TALLOC_FREE(key);
return false;
}
- SAFE_FREE(key);
-
ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "ddff",
&map->gid, &map->sid_name_use,
&map->nt_name, &map->comment);
- SAFE_FREE(dbuf.dptr);
+ TALLOC_FREE(key);
if ( ret == -1 ) {
DEBUG(3,("get_group_map_from_sid: tdb_unpack failure\n"));
- return False;
+ return false;
}
sid_copy(&map->sid, &sid);
- return True;
+ return true;
}
-/****************************************************************************
- Return the sid and the type of the unix group.
-****************************************************************************/
-
-static bool get_group_map_from_gid(gid_t gid, GROUP_MAP *map)
+static bool dbrec2map(const struct db_record *rec, GROUP_MAP *map)
{
- TDB_DATA kbuf, dbuf, newkey;
- fstring string_sid;
- int ret;
-
- /* we need to enumerate the TDB to find the GID */
-
- for (kbuf = tdb_firstkey(tdb);
- kbuf.dptr;
- newkey = tdb_nextkey(tdb, kbuf), safe_free(kbuf.dptr),
kbuf=newkey) {
-
- if (strncmp((const char *)kbuf.dptr, GROUP_PREFIX,
strlen(GROUP_PREFIX)) != 0) continue;
+ if ((rec->key.dsize < strlen(GROUP_PREFIX))
+ || (strncmp((char *)rec->key.dptr, GROUP_PREFIX,
+ GROUP_PREFIX_LEN) != 0)) {
+ return False;
+ }
- dbuf = tdb_fetch(tdb, kbuf);
- if (!dbuf.dptr)
- continue;
+ if (!string_to_sid(&map->sid, (const char *)rec->key.dptr
+ + GROUP_PREFIX_LEN)) {
+ return False;
+ }
- fstrcpy(string_sid, (const char
*)kbuf.dptr+strlen(GROUP_PREFIX));
+ return tdb_unpack(rec->value.dptr, rec->value.dsize, "ddff",
+ &map->gid, &map->sid_name_use, &map->nt_name,
+ &map->comment) != -1;
+}
- string_to_sid(&map->sid, string_sid);
+struct find_map_state {
+ bool found;
+ const char *name; /* If != NULL, look for name */
+ gid_t gid; /* valid iff name == NULL */
+ GROUP_MAP *map;
+};
- ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "ddff",
- &map->gid, &map->sid_name_use, &map->nt_name,
&map->comment);
+static int find_map(struct db_record *rec, void *private_data)
+{
+ struct find_map_state *state = (struct find_map_state *)private_data;
- SAFE_FREE(dbuf.dptr);
+ if (!dbrec2map(rec, state->map)) {
+ DEBUG(10, ("failed to unpack map\n"));
+ return 0;
+ }
- if ( ret == -1 ) {
- DEBUG(3,("get_group_map_from_gid: tdb_unpack
failure\n"));
- return False;
+ if (state->name != NULL) {
+ if (strequal(state->name, state->map->nt_name)) {
+ state->found = true;
+ return 1;
}
-
- if (gid==map->gid) {
- SAFE_FREE(kbuf.dptr);
- return True;
+ }
+ else {
+ if (state->map->gid == state->gid) {
+ state->found = true;
+ return 1;
}
}
- return False;
+ return 0;
}
/****************************************************************************
Return the sid and the type of the unix group.
****************************************************************************/
-static bool get_group_map_from_ntname(const char *name, GROUP_MAP *map)
+static bool get_group_map_from_gid(gid_t gid, GROUP_MAP *map)
{
- TDB_DATA kbuf, dbuf, newkey;
- fstring string_sid;
- int ret;
-
- /* we need to enumerate the TDB to find the name */
+ struct find_map_state state;
- for (kbuf = tdb_firstkey(tdb);
- kbuf.dptr;
- newkey = tdb_nextkey(tdb, kbuf), safe_free(kbuf.dptr),
kbuf=newkey) {
+ state.found = false;
+ state.name = NULL; /* Indicate we're looking for gid */
+ state.gid = gid;
+ state.map = map;
- if (strncmp((const char *)kbuf.dptr, GROUP_PREFIX,
strlen(GROUP_PREFIX)) != 0) continue;
-
- dbuf = tdb_fetch(tdb, kbuf);
- if (!dbuf.dptr)
- continue;
+ db->traverse_read(db, find_map, (void *)&state);
- fstrcpy(string_sid, (const char
*)kbuf.dptr+strlen(GROUP_PREFIX));
-
- string_to_sid(&map->sid, string_sid);
+ return state.found;
+}
- ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "ddff",
- &map->gid, &map->sid_name_use, &map->nt_name,
&map->comment);
+/****************************************************************************
+ Return the sid and the type of the unix group.
+****************************************************************************/
- SAFE_FREE(dbuf.dptr);
+static bool get_group_map_from_ntname(const char *name, GROUP_MAP *map)
+{
+ struct find_map_state state;
- if ( ret == -1 ) {
- DEBUG(3,("get_group_map_from_ntname: tdb_unpack
failure\n"));
- return False;
- }
+ state.found = false;
+ state.name = name;
+ state.map = map;
- if ( strequal(name, map->nt_name) ) {
- SAFE_FREE(kbuf.dptr);
- return True;
- }
- }
+ db->traverse_read(db, find_map, (void *)&state);
- return False;
+ return state.found;
}
/****************************************************************************
@@ -264,123 +280,97 @@ static bool get_group_map_from_ntname(const char *name,
GROUP_MAP *map)
static bool group_map_remove(const DOM_SID *sid)
{
- TDB_DATA dbuf;
- char *key = NULL;
- fstring string_sid;
- bool ret;
-
- /* the key is the SID, retrieving is direct */
-
- sid_to_fstring(string_sid, sid);
- if (asprintf(&key, "%s%s", GROUP_PREFIX, string_sid) < 0) {
- return false;
- }
+ char *key;
+ bool result;
- dbuf = tdb_fetch_bystring(tdb, key);
- if (!dbuf.dptr) {
- SAFE_FREE(key);
+ key = group_mapping_key(talloc_tos(), sid);
+ if (key == NULL) {
return false;
}
- SAFE_FREE(dbuf.dptr);
+ result = NT_STATUS_IS_OK(dbwrap_delete_bystring(db, key));
- ret = (tdb_delete_bystring(tdb, key) == TDB_SUCCESS);
- SAFE_FREE(key);
- return ret;
+ TALLOC_FREE(key);
+ return result;
}
/****************************************************************************
Enumerate the group mapping.
****************************************************************************/
-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)
-{
- TDB_DATA kbuf, dbuf, newkey;
- fstring string_sid;
- GROUP_MAP map;
- GROUP_MAP *mapt;
- int ret;
- size_t entries=0;
- DOM_SID grpsid;
- uint32 rid;
-
- *p_num_entries=0;
- *pp_rmap=NULL;
-
- for (kbuf = tdb_firstkey(tdb);
- kbuf.dptr;
- newkey = tdb_nextkey(tdb, kbuf), safe_free(kbuf.dptr),
kbuf=newkey) {
+struct enum_map_state {
+ const DOM_SID *domsid;
+ enum lsa_SidType sid_name_use;
+ bool unix_only;
- if (strncmp((const char *)kbuf.dptr, GROUP_PREFIX,
strlen(GROUP_PREFIX)) != 0)
- continue;
-
- dbuf = tdb_fetch(tdb, kbuf);
- if (!dbuf.dptr)
- continue;
-
- fstrcpy(string_sid, (const char
*)kbuf.dptr+strlen(GROUP_PREFIX));
-
- ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "ddff",
- &map.gid, &map.sid_name_use, &map.nt_name,
&map.comment);
-
- SAFE_FREE(dbuf.dptr);
-
- if ( ret == -1 ) {
- DEBUG(3,("enum_group_mapping: tdb_unpack failure\n"));
- continue;
- }
-
- /* list only the type or everything if UNKNOWN */
- if (sid_name_use!=SID_NAME_UNKNOWN &&
sid_name_use!=map.sid_name_use) {
- DEBUG(11,("enum_group_mapping: group %s is not of the
requested type\n", map.nt_name));
- continue;
- }
-
- if (unix_only==ENUM_ONLY_MAPPED && map.gid==-1) {
- DEBUG(11,("enum_group_mapping: group %s is non
mapped\n", map.nt_name));
--
Samba Shared Repository
