From 171a361375e1cd76a80253d67e4e34a139bb5570 Mon Sep 17 00:00:00 2001 From: Wilco Baan Hofman Date: Mon, 20 Apr 2009 16:51:33 +0200 Subject: Fix ini parsing in the s3 gpext modules. Fix ini parser API. Make the build work MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Günther Deschner --- source3/libgpo/gpext/scripts.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'source3/libgpo/gpext/scripts.c') 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; -- cgit