[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-276-g948ab77
Volker Lendecke
vlendec at samba.org
Mon Mar 17 11:50:44 GMT 2008
The branch, v3-2-test has been updated
via 948ab77863b12b1b0bd1c970004b84b9bb1bb2fa (commit)
from 3ea0a0beb47bf91b71d949de5abb797177721dcc (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 948ab77863b12b1b0bd1c970004b84b9bb1bb2fa
Author: Volker Lendecke <vl at samba.org>
Date: Fri Mar 14 20:35:38 2008 +0100
Convert pdb_tdb to use dbwrap
-----------------------------------------------------------------------
Summary of changes:
source/passdb/pdb_tdb.c | 634 +++++++++++++++++++++++------------------------
1 files changed, 316 insertions(+), 318 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/passdb/pdb_tdb.c b/source/passdb/pdb_tdb.c
index b05a42b..25aa6b4 100644
--- a/source/passdb/pdb_tdb.c
+++ b/source/passdb/pdb_tdb.c
@@ -41,13 +41,13 @@ static int tdbsam_debug_level = DBGC_ALL;
#define TDBSAM_VERSION_STRING "INFO/version"
#define PASSDB_FILE_NAME "passdb.tdb"
#define USERPREFIX "USER_"
+#define USERPREFIX_LEN 5
#define RIDPREFIX "RID_"
#define PRIVPREFIX "PRIV_"
/* GLOBAL TDB SAM CONTEXT */
-static TDB_CONTEXT *tdbsam;
-static int ref_count = 0;
+static struct db_context *db_sam;
static char *tdbsam_filename;
/**********************************************************************
@@ -690,110 +690,129 @@ static uint32 init_buffer_from_sam (uint8 **buf, struct samu *sampass, bool size
Intialize a BYTE buffer from a struct samu struct
*********************************************************************/
-static bool tdbsam_convert(int32 from)
+struct tdbsam_convert_state {
+ int32_t from;
+ bool success;
+};
+
+static int tdbsam_convert_one(struct db_record *rec, void *priv)
{
- const char *vstring = TDBSAM_VERSION_STRING;
- const char *prefix = USERPREFIX;
- TDB_DATA data, key, old_key;
- uint8 *buf = NULL;
- bool ret;
+ struct tdbsam_convert_state *state =
+ (struct tdbsam_convert_state *)priv;
+ struct samu *user;
+ TDB_DATA data;
+ NTSTATUS status;
+ bool ret;
- /* handle a Samba upgrade */
- tdb_lock_bystring(tdbsam, vstring);
-
- /* Enumerate all records and convert them */
- key = tdb_firstkey(tdbsam);
+ if (rec->key.dsize < USERPREFIX_LEN) {
+ return 0;
+ }
+ if (strncmp((char *)rec->key.dptr, USERPREFIX, USERPREFIX_LEN) != 0) {
+ return 0;
+ }
- while (key.dptr) {
-
- /* skip all non-USER entries (eg. RIDs) */
- while ((key.dsize != 0) && (strncmp((const char *)key.dptr, prefix, strlen (prefix)))) {
- old_key = key;
- /* increment to next in line */
- key = tdb_nextkey(tdbsam, key);
- SAFE_FREE(old_key.dptr);
- }
-
- if (key.dptr) {
- struct samu *user = NULL;
-
- /* read from tdbsam */
- data = tdb_fetch(tdbsam, key);
- if (!data.dptr) {
- DEBUG(0,("tdbsam_convert: database entry not found: %s.\n",key.dptr));
- return False;
- }
-
- /* unpack the buffer from the former format */
- if ( !(user = samu_new( NULL )) ) {
- DEBUG(0,("tdbsam_convert: samu_new() failed!\n"));
- SAFE_FREE( data.dptr );
- return False;
- }
- DEBUG(10,("tdbsam_convert: Try unpacking a record with (key:%s) (version:%d)\n", key.dptr, from));
- switch (from) {
- case 0:
- ret = init_sam_from_buffer_v0(user, (uint8 *)data.dptr, data.dsize);
- break;
- case 1:
- ret = init_sam_from_buffer_v1(user, (uint8 *)data.dptr, data.dsize);
- break;
- case 2:
- ret = init_sam_from_buffer_v2(user, (uint8 *)data.dptr, data.dsize);
- break;
- case 3:
- ret = init_sam_from_buffer_v3(user, (uint8 *)data.dptr, data.dsize);
- break;
- default:
- /* unknown tdbsam version */
- ret = False;
- }
- if (!ret) {
- DEBUG(0,("tdbsam_convert: Bad struct samu entry returned from TDB (key:%s) (version:%d)\n", key.dptr, from));
- SAFE_FREE(data.dptr);
- TALLOC_FREE(user );
- return False;
- }
-
- /* We're finished with the old data. */
- SAFE_FREE(data.dptr);
-
- /* pack from the buffer into the new format */
-
- DEBUG(10,("tdbsam_convert: Try packing a record (key:%s) (version:%d)\n",
- (const char *)key.dptr, from));
- data.dsize = init_buffer_from_sam (&buf, user, False);
- TALLOC_FREE(user );
-
- if ( data.dsize == -1 ) {
- DEBUG(0,("tdbsam_convert: cannot pack the struct samu into the new format\n"));
- return False;
- }
- data.dptr = buf;
-
- /* Store the buffer inside the TDBSAM */
- if (tdb_store(tdbsam, key, data, TDB_MODIFY) != TDB_SUCCESS) {
- DEBUG(0,("tdbsam_convert: cannot store the struct samu (key:%s) in new format\n",key.dptr));
- SAFE_FREE(data.dptr);
- return False;
- }
-
- SAFE_FREE(data.dptr);
-
- /* increment to next in line */
- old_key = key;
- key = tdb_nextkey(tdbsam, key);
- SAFE_FREE(old_key.dptr);
- }
-
+ user = samu_new(talloc_tos());
+ if (user == NULL) {
+ DEBUG(0,("tdbsam_convert: samu_new() failed!\n"));
+ state->success = false;
+ return -1;
+ }
+
+ DEBUG(10,("tdbsam_convert: Try unpacking a record with (key:%s) "
+ "(version:%d)\n", rec->key.dptr, state->from));
+
+ switch (state->from) {
+ case 0:
+ ret = init_sam_from_buffer_v0(user, (uint8 *)rec->value.dptr,
+ rec->value.dsize);
+ break;
+ case 1:
+ ret = init_sam_from_buffer_v1(user, (uint8 *)rec->value.dptr,
+ rec->value.dsize);
+ break;
+ case 2:
+ ret = init_sam_from_buffer_v2(user, (uint8 *)rec->value.dptr,
+ rec->value.dsize);
+ break;
+ case 3:
+ ret = init_sam_from_buffer_v3(user, (uint8 *)rec->value.dptr,
+ rec->value.dsize);
+ break;
+ default:
+ /* unknown tdbsam version */
+ ret = False;
+ }
+ if (!ret) {
+ DEBUG(0,("tdbsam_convert: Bad struct samu entry returned "
+ "from TDB (key:%s) (version:%d)\n", rec->key.dptr,
+ state->from));
+ TALLOC_FREE(user);
+ state->success = false;
+ return -1;
}
-
- /* upgrade finished */
- tdb_store_int32(tdbsam, vstring, TDBSAM_VERSION);
- tdb_unlock_bystring(tdbsam, vstring);
+ data.dsize = init_buffer_from_sam(&data.dptr, user, false);
+ TALLOC_FREE(user);
+
+ if (data.dsize == -1) {
+ DEBUG(0,("tdbsam_convert: cannot pack the struct samu into "
+ "the new format\n"));
+ state->success = false;
+ return -1;
+ }
+
+ status = rec->store(rec, data, TDB_MODIFY);
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(0, ("Could not store the new record: %s\n",
+ nt_errstr(status)));
+ state->success = false;
+ return -1;
+ }
+
+ return 0;
+}
+
+static bool tdbsam_convert(struct db_context *db, int32 from)
+{
+ struct tdbsam_convert_state state;
+
+ state.from = from;
+ state.success = true;
+
+ if (db->transaction_start(db) != 0) {
+ DEBUG(0, ("Could not start transaction\n"));
+ return false;
+ }
+
+ if (db->traverse(db, tdbsam_convert_one, &state) != 0) {
+ DEBUG(0, ("traverse failed\n"));
+ goto cancel;
+ }
- return(True);
+ if (!state.success) {
+ DEBUG(0, ("Converting records failed\n"));
+ goto cancel;
+ }
+
+ if (dbwrap_store_int32(db, TDBSAM_VERSION_STRING,
+ TDBSAM_VERSION) != 0) {
+ DEBUG(0, ("Could not store tdbsam version\n"));
+ goto cancel;
+ }
+
+ if (db->transaction_commit(db) != 0) {
+ DEBUG(0, ("Could not commit transaction\n"));
+ goto cancel;
+ }
+
+ return true;
+
+ cancel:
+ if (db->transaction_cancel(db) != 0) {
+ smb_panic("transaction_cancel failed");
+ }
+
+ return false;
}
/*********************************************************************
@@ -804,91 +823,61 @@ static bool tdbsam_convert(int32 from)
static bool tdbsam_open( const char *name )
{
int32 version;
-
+
/* check if we are already open */
-
- if ( tdbsam ) {
- ref_count++;
- DEBUG(8,("tdbsam_open: Incrementing open reference count. Ref count is now %d\n",
- ref_count));
- return True;
- }
-
- SMB_ASSERT( ref_count == 0 );
-
- /* Try to open tdb passwd. Create a new one if necessary */
-
- if (!(tdbsam = tdb_open_log(name, 0, TDB_DEFAULT, O_CREAT|O_RDWR, 0600))) {
- DEBUG(0, ("tdbsam_open: Failed to open/create TDB passwd [%s]\n", name));
- return False;
+
+ if ( db_sam ) {
+ return true;
}
- /* set the initial reference count - must be done before tdbsam_convert
- as that calls tdbsam_open()/tdbsam_close(). */
+ /* Try to open tdb passwd. Create a new one if necessary */
- ref_count = 1;
+ db_sam = db_open(NULL, name, 0, TDB_DEFAULT, O_CREAT|O_RDWR, 0600);
+ if (db_sam == NULL) {
+ DEBUG(0, ("tdbsam_open: Failed to open/create TDB passwd "
+ "[%s]\n", name));
+ return false;
+ }
/* Check the version */
- version = tdb_fetch_int32( tdbsam, TDBSAM_VERSION_STRING );
-
+ version = dbwrap_fetch_int32(db_sam, TDBSAM_VERSION_STRING);
if (version == -1) {
version = 0; /* Version not found, assume version 0 */
}
-
+
/* Compare the version */
if (version > TDBSAM_VERSION) {
- /* Version more recent than the latest known */
+ /* Version more recent than the latest known */
DEBUG(0, ("tdbsam_open: unknown version => %d\n", version));
- tdb_close( tdbsam );
- ref_count = 0;
- return False;
- }
-
-
- if ( version < TDBSAM_VERSION ) {
- DEBUG(1, ("tdbsam_open: Converting version %d database to version %d.\n",
- version, TDBSAM_VERSION));
-
- if ( !tdbsam_convert(version) ) {
- DEBUG(0, ("tdbsam_open: Error when trying to convert tdbsam [%s]\n",name));
- tdb_close(tdbsam);
- ref_count = 0;
- return False;
- }
-
- DEBUG(3, ("TDBSAM converted successfully.\n"));
+ TALLOC_FREE(db_sam);
+ return false;
}
-
- DEBUG(4,("tdbsam_open: successfully opened %s\n", name ));
-
- return True;
-}
-/****************************************************************************
- wrapper atound tdb_close() to handle the reference count
-****************************************************************************/
+ if ( version < TDBSAM_VERSION ) {
+ DEBUG(1, ("tdbsam_open: Converting version %d database to "
+ "version %d.\n", version, TDBSAM_VERSION));
-void tdbsam_close( void )
-{
- ref_count--;
-
- DEBUG(8,("tdbsam_close: Reference count is now %d.\n", ref_count));
+ if ( !tdbsam_convert(db_sam, version) ) {
+ DEBUG(0, ("tdbsam_open: Error when trying to convert "
+ "tdbsam [%s]\n",name));
+ TALLOC_FREE(db_sam);
+ return false;
+ }
- SMB_ASSERT(ref_count >= 0 );
-
- if ( ref_count == 0 ) {
- tdb_close( tdbsam );
- tdbsam = NULL;
+ DEBUG(3, ("TDBSAM converted successfully.\n"));
}
-
- return;
+
+ DEBUG(4,("tdbsam_open: successfully opened %s\n", name ));
+
+ return true;
}
/******************************************************************
Lookup a name in the SAM TDB
******************************************************************/
-static NTSTATUS tdbsam_getsampwnam (struct pdb_methods *my_methods, struct samu *user, const char *sname)
+static NTSTATUS tdbsam_getsampwnam (struct pdb_methods *my_methods,
+ struct samu *user, const char *sname)
{
TDB_DATA data;
fstring keystr;
@@ -907,37 +896,33 @@ static NTSTATUS tdbsam_getsampwnam (struct pdb_methods *my_methods, struct samu
slprintf(keystr, sizeof(keystr)-1, "%s%s", USERPREFIX, name);
/* open the database */
-
+
if ( !tdbsam_open( tdbsam_filename ) ) {
DEBUG(0,("tdbsam_getsampwnam: failed to open %s!\n", tdbsam_filename));
return NT_STATUS_ACCESS_DENIED;
}
-
+
/* get the record */
-
- data = tdb_fetch_bystring(tdbsam, keystr);
+
+ data = dbwrap_fetch_bystring(db_sam, talloc_tos(), keystr);
if (!data.dptr) {
DEBUG(5,("pdb_getsampwnam (TDB): error fetching database.\n"));
- DEBUGADD(5, (" Error: %s\n", tdb_errorstr(tdbsam)));
DEBUGADD(5, (" Key: %s\n", keystr));
- tdbsam_close();
return NT_STATUS_NO_SUCH_USER;
}
-
+
/* unpack the buffer */
-
+
if (!init_sam_from_buffer(user, data.dptr, data.dsize)) {
DEBUG(0,("pdb_getsampwent: Bad struct samu entry returned from TDB!\n"));
SAFE_FREE(data.dptr);
- tdbsam_close();
return NT_STATUS_NO_MEMORY;
}
-
+
/* success */
-
- SAFE_FREE(data.dptr);
- tdbsam_close();
-
+
+ TALLOC_FREE(data.dptr);
+
return NT_STATUS_OK;
}
@@ -945,7 +930,8 @@ static NTSTATUS tdbsam_getsampwnam (struct pdb_methods *my_methods, struct samu
Search by rid
**************************************************************************/
-static NTSTATUS tdbsam_getsampwrid (struct pdb_methods *my_methods, struct samu *user, uint32 rid)
+static NTSTATUS tdbsam_getsampwrid (struct pdb_methods *my_methods,
+ struct samu *user, uint32 rid)
{
NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
TDB_DATA data;
@@ -956,45 +942,37 @@ static NTSTATUS tdbsam_getsampwrid (struct pdb_methods *my_methods, struct samu
DEBUG(0,("pdb_getsampwrid: struct samu is NULL.\n"));
return nt_status;
}
-
+
/* set search key */
-
+
slprintf(keystr, sizeof(keystr)-1, "%s%.8x", RIDPREFIX, rid);
/* open the database */
-
+
if ( !tdbsam_open( tdbsam_filename ) ) {
DEBUG(0,("tdbsam_getsampwnam: failed to open %s!\n", tdbsam_filename));
return NT_STATUS_ACCESS_DENIED;
}
/* get the record */
-
- data = tdb_fetch_bystring (tdbsam, keystr);
+
+ data = dbwrap_fetch_bystring(db_sam, talloc_tos(), keystr);
if (!data.dptr) {
DEBUG(5,("pdb_getsampwrid (TDB): error looking up RID %d by key %s.\n", rid, keystr));
- DEBUGADD(5, (" Error: %s\n", tdb_errorstr(tdbsam)));
- nt_status = NT_STATUS_UNSUCCESSFUL;
- goto done;
+ return NT_STATUS_UNSUCCESSFUL;
}
fstrcpy(name, (const char *)data.dptr);
- SAFE_FREE(data.dptr);
-
- nt_status = tdbsam_getsampwnam (my_methods, user, name);
+ TALLOC_FREE(data.dptr);
- done:
- /* cleanup */
-
- tdbsam_close();
-
- return nt_status;
+ return tdbsam_getsampwnam (my_methods, user, name);
}
-static NTSTATUS tdbsam_getsampwsid(struct pdb_methods *my_methods, struct samu * user, const DOM_SID *sid)
+static NTSTATUS tdbsam_getsampwsid(struct pdb_methods *my_methods,
+ struct samu * user, const DOM_SID *sid)
{
uint32 rid;
-
+
if ( !sid_peek_check_rid(get_global_sam_sid(), sid, &rid) )
return NT_STATUS_UNSUCCESSFUL;
@@ -1005,38 +983,41 @@ static bool tdb_delete_samacct_only( struct samu *sam_pass )
{
fstring keystr;
fstring name;
+ NTSTATUS status;
fstrcpy(name, pdb_get_username(sam_pass));
strlower_m(name);
-
+
/* set the search key */
-
+
--
Samba Shared Repository
More information about the samba-cvs
mailing list