diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-28 18:27:29 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-28 18:27:29 +0100 |
commit | fc6bc92e116d3891671a77bc4564047eefd69f95 (patch) | |
tree | 9fd31f538af9cea9f144ece7e7b7cd2333d2bd81 /source4/lib/registry/tools/regdiff.c | |
parent | d70eafc5c635255feafc7121b381e7044ac11854 (diff) | |
parent | afe8e533b9626fff8c59653972019d3f91bf136c (diff) | |
download | samba-fc6bc92e116d3891671a77bc4564047eefd69f95.tar.gz samba-fc6bc92e116d3891671a77bc4564047eefd69f95.tar.xz samba-fc6bc92e116d3891671a77bc4564047eefd69f95.zip |
Merge branch 'v4-0-trivial' into v4-0-test
(This used to be commit 6cbb241c05539cc62526a366094c9c472e6422a5)
Diffstat (limited to 'source4/lib/registry/tools/regdiff.c')
-rw-r--r-- | source4/lib/registry/tools/regdiff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/lib/registry/tools/regdiff.c b/source4/lib/registry/tools/regdiff.c index 406eaeea3d..c94380efd2 100644 --- a/source4/lib/registry/tools/regdiff.c +++ b/source4/lib/registry/tools/regdiff.c @@ -126,7 +126,7 @@ int main(int argc, const char **argv) poptFreeContext(pc); - error = reg_dotreg_diff_save(ctx, outputfile, &callbacks, + error = reg_dotreg_diff_save(ctx, outputfile, lp_iconv_convenience(cmdline_lp_ctx), &callbacks, &callback_data); if (!W_ERROR_IS_OK(error)) { fprintf(stderr, "Problem saving registry diff to '%s': %s\n", |