summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-05-21 13:40:27 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:22:16 -0500
commit5057c595d5637ad610c54de0300488ca690f1438 (patch)
treec32c6cdabc39492eca2d0babf43fd00fa1a360f4
parent772d8b0cd3e97d0314aab4195c8520711532d0f0 (diff)
downloadsamba-5057c595d5637ad610c54de0300488ca690f1438.tar.gz
samba-5057c595d5637ad610c54de0300488ca690f1438.tar.bz2
samba-5057c595d5637ad610c54de0300488ca690f1438.zip
r23039: 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 (This used to be commit fb77cc7fbc0100c66365109ae6c3cc4824079a2e)
-rw-r--r--source3/nsswitch/winbindd_cache.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source3/nsswitch/winbindd_cache.c b/source3/nsswitch/winbindd_cache.c
index 28a0a09422..aa38bb6971 100644
--- a/source3/nsswitch/winbindd_cache.c
+++ b/source3/nsswitch/winbindd_cache.c
@@ -3566,8 +3566,7 @@ static TDB_DATA make_tdc_key( const char *domain_name )
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;
}