Author: metze Date: 2007-05-16 13:35:26 +0000 (Wed, 16 May 2007) New Revision: 22938
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22938 Log: merge 22007 and 22008 from SAMBA_3_0 use tdb helper functions metze Modified: branches/SAMBA_3_0_26/source/lib/util_tdb.c branches/SAMBA_3_0_26/source/smbd/connection.c Changeset: Modified: branches/SAMBA_3_0_26/source/lib/util_tdb.c =================================================================== --- branches/SAMBA_3_0_26/source/lib/util_tdb.c 2007-05-16 13:25:16 UTC (rev 22937) +++ branches/SAMBA_3_0_26/source/lib/util_tdb.c 2007-05-16 13:35:26 UTC (rev 22938) @@ -53,12 +53,12 @@ TDB_DATA string_tdb_data(const char *string) { - return make_tdb_data(string, strlen(string)); + return make_tdb_data(string, string ? strlen(string) : 0 ); } TDB_DATA string_term_tdb_data(const char *string) { - return make_tdb_data(string, strlen(string) + 1); + return make_tdb_data(string, string ? strlen(string) + 1 : 0); } /**************************************************************************** Modified: branches/SAMBA_3_0_26/source/smbd/connection.c =================================================================== --- branches/SAMBA_3_0_26/source/smbd/connection.c 2007-05-16 13:25:16 UTC (rev 22937) +++ branches/SAMBA_3_0_26/source/smbd/connection.c 2007-05-16 13:35:26 UTC (rev 22938) @@ -259,11 +259,10 @@ snprintf( key_string, sizeof(key_string), "%s/%d/%d", prec->name, procid_to_pid(&prec->pid), prec->pnum ); - if ( (kbuf->dptr = talloc_strdup(prec, key_string)) == NULL ) + *kbuf = string_term_tdb_data(talloc_strdup(prec, key_string)); + if (kbuf->dptr == NULL ) return NULL; - - kbuf->dsize = strlen(key_string)+1; - + return kbuf; }
