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

metze at samba.org metze at samba.org
Mon May 21 13:40:28 GMT 2007


Author: metze
Date: 2007-05-21 13:40:27 +0000 (Mon, 21 May 2007)
New Revision: 23039

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

Log:
merge from SAMBA_3_0_26:

use a helper function to construct the TDB_DATA key
as strlen_m() is totally wrong here anyway

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-05-21 13:39:34 UTC (rev 23038)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_cache.c	2007-05-21 13:40:27 UTC (rev 23039)
@@ -3566,8 +3566,7 @@
 	       
 		
 	asprintf( &keystr, "TRUSTDOMCACHE/%s", domain_name );
-	key.dptr = (unsigned char*)keystr;
-	key.dsize = strlen_m(keystr) + 1;
+	key = string_term_tdb_data(keystr);
 	
 	return key;	
 }



More information about the samba-cvs mailing list