diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-18 18:30:10 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-18 18:30:10 +0200 |
| commit | 2243479b7415942604284028cd34a20aa0ba79c0 (patch) | |
| tree | 9d13b463baaccdcab307943f6896592f8385a677 /source3/lib/dbwrap_tdb.c | |
| parent | 6a89b59ca6187ef6e06124c2aa729be18b43bb75 (diff) | |
| parent | 4f9b6fdce4340a1022f659daaa035d0336ff6b53 (diff) | |
| download | samba-2243479b7415942604284028cd34a20aa0ba79c0.tar.gz samba-2243479b7415942604284028cd34a20aa0ba79c0.tar.bz2 samba-2243479b7415942604284028cd34a20aa0ba79c0.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/lib/dbwrap_tdb.c')
| -rw-r--r-- | source3/lib/dbwrap_tdb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/lib/dbwrap_tdb.c b/source3/lib/dbwrap_tdb.c index 7bdadd3770..4860c61ab0 100644 --- a/source3/lib/dbwrap_tdb.c +++ b/source3/lib/dbwrap_tdb.c @@ -31,14 +31,14 @@ static int db_tdb_record_destr(struct db_record* data) struct db_tdb_ctx *ctx = talloc_get_type_abort(data->private_data, struct db_tdb_ctx); - /* This hex_encode() call allocates memory on data context. By way how current + /* This hex_encode_talloc() call allocates memory on data context. By way how current __talloc_free() code works, it is OK to allocate in the destructor as the children of data will be freed after call to the destructor and this new 'child' will be caught and freed correctly. */ DEBUG(10, (DEBUGLEVEL > 10 ? "Unlocking key %s\n" : "Unlocking key %.20s\n", - hex_encode(data, (unsigned char *)data->key.dptr, + hex_encode_talloc(data, (unsigned char *)data->key.dptr, data->key.dsize))); if (tdb_chainunlock(ctx->wtdb->tdb, data->key) != 0) { @@ -94,7 +94,7 @@ static struct db_record *db_tdb_fetch_locked(struct db_context *db, /* Do not accidently allocate/deallocate w/o need when debug level is lower than needed */ if(DEBUGLEVEL >= 10) { - char *keystr = hex_encode(NULL, (unsigned char*)key.dptr, key.dsize); + char *keystr = hex_encode_talloc(NULL, (unsigned char*)key.dptr, key.dsize); DEBUG(10, (DEBUGLEVEL > 10 ? "Locking key %s\n" : "Locking key %.20s\n", keystr)); |