While we're all making incompatible tdb changes, I changed the implementation

of tdb_{store,get}_int() to store the length of the string key + 1 so the
stored key contains the trailing NULL character.  This allows normal
string library routines to manipulate keys.

Also renamed tdb_get_int() to tdb_fetch_int() to keep the set of verbs
consistent.
(This used to be commit a423c7c5f21dc4046530b85482dee88dcfcbf070)

2 files changed, 5 insertions, 4 deletions

diff --git a/source3/nsswitch/winbindd_cache.c b/source3/nsswitch/winbindd_cache.c
index b6b753bae0..cd648c696c 100644
--- a/source3/nsswitch/winbindd_cache.c
+++ b/source3/nsswitch/winbindd_cache.c
@@ -101,7 +101,7 @@ static uint32 get_cache_sequence_number(char *domain_name, char *cache_type, cha
 	uint32 seq_num;
 	slprintf(keystr,sizeof(keystr),"CACHESEQ %s/%s/%s",
 		 domain_name, cache_type, subkey?subkey:"");
-	seq_num = (uint32)tdb_get_int(cache_tdb, keystr);
+	seq_num = (uint32)tdb_fetch_int(cache_tdb, keystr);
 	DEBUG(4,("%s is %u\n", keystr, (unsigned)seq_num));
 	return seq_num;
 }
diff --git a/source3/nsswitch/winbindd_idmap.c b/source3/nsswitch/winbindd_idmap.c
index cd3fd2caab..15a9ac4009 100644
--- a/source3/nsswitch/winbindd_idmap.c
+++ b/source3/nsswitch/winbindd_idmap.c
@@ -40,7 +40,8 @@ static BOOL allocate_id(int *id, BOOL isgroup)
 
     /* Get current high water mark */
 
-    if ((hwm = tdb_get_int(idmap_tdb, isgroup ? HWM_GROUP : HWM_USER)) == -1) {
+    if ((hwm = tdb_fetch_int(idmap_tdb, 
+                             isgroup ? HWM_GROUP : HWM_USER)) == -1) {
         return False;
     }
 
@@ -217,14 +218,14 @@ BOOL winbindd_idmap_init(void)
 
      /* Create high water marks for group and user id */
 
-    if (tdb_get_int(idmap_tdb, HWM_USER) == -1) {
+    if (tdb_fetch_int(idmap_tdb, HWM_USER) == -1) {
         if (tdb_store_int(idmap_tdb, HWM_USER, server_state.uid_low) == -1) {
             DEBUG(0, ("Unable to initialise user hwm in idmap database\n"));
             return False;
         }
     }
 
-    if (tdb_get_int(idmap_tdb, HWM_GROUP) == -1) {
+    if (tdb_fetch_int(idmap_tdb, HWM_GROUP) == -1) {
         if (tdb_store_int(idmap_tdb, HWM_GROUP, server_state.gid_low) == -1) {
             DEBUG(0, ("Unable to initialise group hwm in idmap database\n"));
             return False;