diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-02 04:15:11 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-02 04:15:11 +0100 |
commit | 2d7a3748b2063c4137ee98ceca85361651ef8ee7 (patch) | |
tree | 2fd585a487b3d4af7056022bbf02c61910fe92c6 /source3/lib | |
parent | c7b9757b8ac3ac6baa478655a4d2f77dff8240a8 (diff) | |
parent | 9b0df441e1bd836c433e11582650fa0171791485 (diff) | |
download | samba-2d7a3748b2063c4137ee98ceca85361651ef8ee7.tar.gz samba-2d7a3748b2063c4137ee98ceca85361651ef8ee7.tar.bz2 samba-2d7a3748b2063c4137ee98ceca85361651ef8ee7.zip |
Merge branch 'master' of git://git.samba.org/samba into convenience
Diffstat (limited to 'source3/lib')
-rw-r--r-- | source3/lib/util_reg_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/util_reg_api.c b/source3/lib/util_reg_api.c index 8f28e9c282..9313193f10 100644 --- a/source3/lib/util_reg_api.c +++ b/source3/lib/util_reg_api.c @@ -92,7 +92,7 @@ WERROR registry_pull_value(TALLOC_CTX *mem_ctx, } if (!convert_string_talloc(value, CH_UTF16LE, CH_UNIX, tmp, - length+2, &value->v.sz.str, + length+2, (void **)&value->v.sz.str, &value->v.sz.len, False)) { SAFE_FREE(tmp); err = WERR_INVALID_PARAM; |