summaryrefslogtreecommitdiff
path: root/source3/lib/util_reg_api.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-04-23 15:12:35 +0200
committerAndrew Bartlett <abartlet@samba.org>2009-04-23 15:12:35 +0200
commit53d491c9a4011a7d9ad69db52fb91d163f3f990a (patch)
tree9d0ed3130f35142da50c2e20e8addfe8909f459f /source3/lib/util_reg_api.c
parentaf6298a84dffb400551861c6dc34591f1473830c (diff)
parent1722859abd169f2949b5822f97c810f2b8d162da (diff)
downloadsamba-53d491c9a4011a7d9ad69db52fb91d163f3f990a.tar.gz
samba-53d491c9a4011a7d9ad69db52fb91d163f3f990a.tar.bz2
samba-53d491c9a4011a7d9ad69db52fb91d163f3f990a.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
Diffstat (limited to 'source3/lib/util_reg_api.c')
-rw-r--r--source3/lib/util_reg_api.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/util_reg_api.c b/source3/lib/util_reg_api.c
index 9313193f10..56ecc5472d 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, (void **)&value->v.sz.str,
+ length+2, (void *)&value->v.sz.str,
&value->v.sz.len, False)) {
SAFE_FREE(tmp);
err = WERR_INVALID_PARAM;