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/libgpo | |
| 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/libgpo')
| -rw-r--r-- | source3/libgpo/gpo_ini.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/libgpo/gpo_ini.c b/source3/libgpo/gpo_ini.c index aa8f7c7770..edca85530b 100644 --- a/source3/libgpo/gpo_ini.c +++ b/source3/libgpo/gpo_ini.c @@ -83,7 +83,7 @@ static NTSTATUS convert_file_from_ucs2(TALLOC_CTX *mem_ctx, } if (!convert_string_talloc(mem_ctx, CH_UTF16LE, CH_UNIX, data_in, n, - &data_out, &converted_size, False)) + (void **)&data_out, &converted_size, False)) { status = NT_STATUS_INVALID_BUFFER_SIZE; goto out; |