diff options
| author | Wilco Baan Hofman <wilco@baanhofman.nl> | 2009-04-20 16:51:33 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2009-04-20 23:16:17 +0200 |
| commit | 171a361375e1cd76a80253d67e4e34a139bb5570 (patch) | |
| tree | 50f01eb72412462dd69ce0b17ccc99834b4d3d01 /source3/libgpo/gpext/scripts.c | |
| parent | 933482e64869f5aee2ca0356abb721facfd65943 (diff) | |
| download | samba-171a361375e1cd76a80253d67e4e34a139bb5570.tar.gz samba-171a361375e1cd76a80253d67e4e34a139bb5570.tar.bz2 samba-171a361375e1cd76a80253d67e4e34a139bb5570.zip | |
Fix ini parsing in the s3 gpext modules. Fix ini parser API. Make the build work
Signed-off-by: Günther Deschner <gd@samba.org>
Diffstat (limited to 'source3/libgpo/gpext/scripts.c')
| -rw-r--r-- | source3/libgpo/gpext/scripts.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source3/libgpo/gpext/scripts.c b/source3/libgpo/gpext/scripts.c index ddea35c644..4ced3abda5 100644 --- a/source3/libgpo/gpext/scripts.c +++ b/source3/libgpo/gpext/scripts.c @@ -124,6 +124,7 @@ static NTSTATUS scripts_parse_ini_section(struct gp_inifile_context *ini_ctx, size_t *num_entries) { NTSTATUS status = NT_STATUS_OBJECT_NAME_NOT_FOUND; + NTSTATUS result; int i = 0; while (1) { @@ -141,8 +142,8 @@ static NTSTATUS scripts_parse_ini_section(struct gp_inifile_context *ini_ctx, GP_SCRIPTS_SECTION_CMDLINE); NT_STATUS_HAVE_NO_MEMORY(key); - script = iniparser_getstring(ini_ctx->dict, key, NULL); - if (!script) { + result = gp_inifile_getstring(ini_ctx, key, &script); + if (!NT_STATUS_IS_OK(result)) { break; } @@ -151,7 +152,10 @@ static NTSTATUS scripts_parse_ini_section(struct gp_inifile_context *ini_ctx, GP_SCRIPTS_SECTION_PARAMETERS); NT_STATUS_HAVE_NO_MEMORY(key); - parameters = iniparser_getstring(ini_ctx->dict, key, NULL); + result = gp_inifile_getstring(ini_ctx, key, ¶meters); + if (!NT_STATUS_IS_OK(result)) { + break; + } { struct gp_registry_entry *entry = NULL; |