[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-432-g3d2fdcd

[Michael Adam]

The branch, v3-2-test has been updated
       via  3d2fdcd50fdbfb66a14360516836445d47eceeb0 (commit)
       via  1c51bec5318bad085c09931aa7e8f72f41d103fe (commit)
      from  79f7a519f8f61a31d84467c5b5975cae13db1c29 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 3d2fdcd50fdbfb66a14360516836445d47eceeb0
Author: Michael Adam <obnox at samba.org>
Date:   Wed Mar 26 10:50:08 2008 +0100

    use tdb_wipe_all() instead of tdb_wipe() - it is faster...
    
    Michael

commit 1c51bec5318bad085c09931aa7e8f72f41d103fe
Author: Michael Adam <obnox at samba.org>
Date:   Wed Mar 26 10:45:53 2008 +0100

    util_tdb: make the _byblob fetch/store functions public again.
    
    Users of these are currently being written...
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 source/include/util_tdb.h  |    4 ++++
 source/intl/lang_tdb.c     |    2 +-
 source/lib/sharesec.c      |    2 +-
 source/lib/util_tdb.c      |    8 ++++----
 source/printing/printing.c |    2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/util_tdb.h b/source/include/util_tdb.h
index 0a8eb93..f9049c3 100644
--- a/source/include/util_tdb.h
+++ b/source/include/util_tdb.h
@@ -65,9 +65,13 @@ int tdb_read_lock_bystring_with_timeout(TDB_CONTEXT *tdb, const char *keyval,
 					unsigned int timeout);
 void tdb_read_unlock_bystring(TDB_CONTEXT *tdb, const char *keyval);
 
+int32 tdb_fetch_int32_byblob(TDB_CONTEXT *tdb, TDB_DATA key);
 int32 tdb_fetch_int32(struct tdb_context *tdb, const char *keystr);
+bool tdb_store_uint32_byblob(TDB_CONTEXT *tdb, TDB_DATA key, uint32 value);
 bool tdb_store_uint32(struct tdb_context *tdb, const char *keystr, uint32 value);
+int tdb_store_int32_byblob(TDB_CONTEXT *tdb, TDB_DATA key, int32 v);
 int tdb_store_int32(struct tdb_context *tdb, const char *keystr, int32 v);
+bool tdb_fetch_uint32_byblob(TDB_CONTEXT *tdb, TDB_DATA key, uint32 *value);
 bool tdb_fetch_uint32(struct tdb_context *tdb, const char *keystr, uint32 *value);
 int32 tdb_change_int32_atomic(struct tdb_context *tdb, const char *keystr, int32 *oldval, int32 change_val);
 bool tdb_change_uint32_atomic(TDB_CONTEXT *tdb, const char *keystr,
diff --git a/source/intl/lang_tdb.c b/source/intl/lang_tdb.c
index 4e4a3a5..499b9eb 100644
--- a/source/intl/lang_tdb.c
+++ b/source/intl/lang_tdb.c
@@ -45,7 +45,7 @@ static bool load_msg(const char *msg_file)
 	}
 
 	/* wipe the db */
-	tdb_wipe(tdb);
+	tdb_wipe_all(tdb);
 
 	msgid = NULL;
 	
diff --git a/source/lib/sharesec.c b/source/lib/sharesec.c
index 60f6e50..5a8984f 100644
--- a/source/lib/sharesec.c
+++ b/source/lib/sharesec.c
@@ -65,7 +65,7 @@ static bool share_info_db_init(void)
 	}
 
 	if (vers_id != SHARE_DATABASE_VERSION_V2) {
-		tdb_wipe(share_tdb);
+		tdb_wipe_all(share_tdb);
 		tdb_store_int32(share_tdb, vstring, SHARE_DATABASE_VERSION_V2);
 	}
 	tdb_unlock_bystring(share_tdb, vstring);
diff --git a/source/lib/util_tdb.c b/source/lib/util_tdb.c
index 0c56e10..e9c2d31 100644
--- a/source/lib/util_tdb.c
+++ b/source/lib/util_tdb.c
@@ -167,7 +167,7 @@ void tdb_read_unlock_bystring(TDB_CONTEXT *tdb, const char *keyval)
  Output is int32 in native byte order.
 ****************************************************************************/
 
-static int32 tdb_fetch_int32_byblob(TDB_CONTEXT *tdb, TDB_DATA key)
+int32 tdb_fetch_int32_byblob(TDB_CONTEXT *tdb, TDB_DATA key)
 {
 	TDB_DATA data;
 	int32 ret;
@@ -200,7 +200,7 @@ int32 tdb_fetch_int32(TDB_CONTEXT *tdb, const char *keystr)
  Input is int32 in native byte order. Output in tdb is in little-endian.
 ****************************************************************************/
 
-static int tdb_store_int32_byblob(TDB_CONTEXT *tdb, TDB_DATA key, int32 v)
+int tdb_store_int32_byblob(TDB_CONTEXT *tdb, TDB_DATA key, int32 v)
 {
 	TDB_DATA data;
 	int32 v_store;
@@ -229,7 +229,7 @@ int tdb_store_int32(TDB_CONTEXT *tdb, const char *keystr, int32 v)
  Output is uint32 in native byte order.
 ****************************************************************************/
 
-static bool tdb_fetch_uint32_byblob(TDB_CONTEXT *tdb, TDB_DATA key, uint32 *value)
+bool tdb_fetch_uint32_byblob(TDB_CONTEXT *tdb, TDB_DATA key, uint32 *value)
 {
 	TDB_DATA data;
 
@@ -261,7 +261,7 @@ bool tdb_fetch_uint32(TDB_CONTEXT *tdb, const char *keystr, uint32 *value)
  Input is uint32 in native byte order. Output in tdb is in little-endian.
 ****************************************************************************/
 
-static bool tdb_store_uint32_byblob(TDB_CONTEXT *tdb, TDB_DATA key, uint32 value)
+bool tdb_store_uint32_byblob(TDB_CONTEXT *tdb, TDB_DATA key, uint32 value)
 {
 	TDB_DATA data;
 	uint32 v_store;
diff --git a/source/printing/printing.c b/source/printing/printing.c
index c9736b7..4c2f7b9 100644
--- a/source/printing/printing.c
+++ b/source/printing/printing.c
@@ -202,7 +202,7 @@ bool print_backend_init(struct messaging_context *msg_ctx)
 			return False;
 		}
 		if (tdb_fetch_int32(pdb->tdb, sversion) != PRINT_DATABASE_VERSION) {
-			tdb_wipe(pdb->tdb);
+			tdb_wipe_all(pdb->tdb);
 			tdb_store_int32(pdb->tdb, sversion, PRINT_DATABASE_VERSION);
 		}
 		tdb_unlock_bystring(pdb->tdb, sversion);


-- 
Samba Shared Repository