svn commit: samba r21985 - in branches/SAMBA_3_0/source/nsswitch: .

[metze at samba.org]

Author: metze
Date: 2007-03-27 10:59:03 +0000 (Tue, 27 Mar 2007)
New Revision: 21985

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21985

Log:
make use of string_tdb_data()
to avoid creating the TDB_DATA struct from strings "by hand"

metze

Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c	2007-03-27 10:50:32 UTC (rev 21984)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c	2007-03-27 10:59:03 UTC (rev 21985)
@@ -520,8 +520,7 @@
 	struct cache_entry *centry;
 	TDB_DATA key;
 
-	key.dptr = kstr;
-	key.dsize = strlen(kstr);
+	key = string_tdb_data(kstr);
 	data = tdb_fetch(wcache->tdb, key);
 	if (!data.dptr) {
 		/* a cache miss */
@@ -605,8 +604,7 @@
 	smb_xvasprintf(&kstr, format, ap);
 	va_end(ap);
 
-	key.dptr = kstr;
-	key.dsize = strlen(kstr);
+	key = string_tdb_data(kstr);
 
 	tdb_delete(wcache->tdb, key);
 	free(kstr);
@@ -757,8 +755,7 @@
 	smb_xvasprintf(&kstr, format, ap);
 	va_end(ap);
 
-	key.dptr = kstr;
-	key.dsize = strlen(kstr);
+	key = string_tdb_data(kstr);
 	data.dptr = (char *)centry->data;
 	data.dsize = centry->ofs;
 
@@ -896,7 +893,7 @@
 
 	fstr_sprintf(key_str, "CRED/%s", sid_string_static(sid));
 
-	data = tdb_fetch(cache->tdb, make_tdb_data(key_str, strlen(key_str)));
+	data = tdb_fetch(cache->tdb, string_tdb_data(key_str));
 	if (!data.dptr) {
 		return NT_STATUS_OBJECT_NAME_NOT_FOUND;
 	}
@@ -2486,7 +2483,7 @@
 		TDB_DATA data;
 		time_t t;
 
-		data = tdb_fetch(cache->tdb, make_tdb_data(cred->name, strlen(cred->name)));
+		data = tdb_fetch(cache->tdb, string_tdb_data(cred->name));
 		if (!data.dptr) {
 			DEBUG(10,("wcache_remove_oldest_cached_creds: entry for [%s] not found\n", 
 				cred->name));