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>

diff --git a/libgpo/config.mk b/libgpo/config.mk
index a9ad76c964a069bb8da3770df803e9c8c41f3f60..6472d161915a94ff8fe53f70ab746f8b467a5547 100644 (file)
--- a/libgpo/config.mk
+++ b/libgpo/config.mk
@@ -2,5 +2,6 @@
 PRIVATE_DEPENDENCIES = LIBLDB LIBSAMBA-NET
 
 LIBGPO_OBJ_FILES = ../libgpo/gpo_util.o ../libgpo/gpo_sec.o \
-                                  ../libgpo/gpext/gpext.o ../libgpo/gpo_fetch.o \
+                                  ../libgpo/gpext/gpext.o \
+                                  ../libgpo/gpo_fetch.o ../libgpo/gpo_ini.o \
                        $(libgpodir)/ads_convenience.o $(libgpodir)/gpo_filesync.o

diff --git a/libgpo/gpo_fetch.c b/libgpo/gpo_fetch.c
index a5714f7243a5a8ff7dbf1ea24488a265994bb499..beedfc228013003df637f967c067b377f02f93b2 100644 (file)
--- a/libgpo/gpo_fetch.c
+++ b/libgpo/gpo_fetch.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "../libgpo/gpo.h"
+#include "../libgpo/gpo_ini.h"
 
 #if _SAMBA_BUILD_ == 4
 #include "param/param.h"

diff --git a/libgpo/gpo_ini.c b/libgpo/gpo_ini.c
index 79bf5fd8d83fc90aa44cd175b8463f7707ec24f7..af2b88c0b8a311f702d6ed7403641b3ea9ecc65b 100644 (file)
--- a/libgpo/gpo_ini.c
+++ b/libgpo/gpo_ini.c
@@ -169,6 +169,7 @@ NTSTATUS gp_inifile_init_context(TALLOC_CTX *mem_ctx,
 {
        struct gp_inifile_context *ctx = NULL;
        NTSTATUS status;
+       int rv;
        char *tmp_filename = NULL;
        const char *ini_filename = NULL;
 
@@ -192,6 +193,12 @@ NTSTATUS gp_inifile_init_context(TALLOC_CTX *mem_ctx,
                goto failed;
        }
 
+       rv = pm_process(tmp_filename, change_section, store_keyval_pair, ctx);
+       if (!rv) {
+               return NT_STATUS_NO_SUCH_FILE;
+       }
+
+
        ctx->generated_filename = tmp_filename;
        ctx->mem_ctx = mem_ctx;
 
@@ -217,7 +224,7 @@ NTSTATUS gp_inifile_init_context(TALLOC_CTX *mem_ctx,
 #define GPT_INI_PARAMETER_VERSION "Version"
 #define GPT_INI_PARAMETER_DISPLAYNAME "displayName"
 
-NTSTATUS parse_gpt_ini(struct gp_inifile_context *ctx,
+NTSTATUS parse_gpt_ini(TALLOC_CTX *mem_ctx,
                       const char *filename,
                       uint32_t *version,
                       char **display_name)
@@ -226,12 +233,16 @@ NTSTATUS parse_gpt_ini(struct gp_inifile_context *ctx,
        int rv;
        int v = 0;
        char *name = NULL;
+       struct gp_inifile_context *ctx;
 
        if (!filename) {
                return NT_STATUS_INVALID_PARAMETER;
        }
 
-       rv = pm_process(filename, change_section, store_keyval_pair, NULL);
+       ctx = talloc_zero(mem_ctx, struct gp_inifile_context);
+       NT_STATUS_HAVE_NO_MEMORY(ctx);
+
+       rv = pm_process(filename, change_section, store_keyval_pair, ctx);
        if (!rv) {
                return NT_STATUS_NO_SUCH_FILE;
        }
@@ -263,7 +274,7 @@ NTSTATUS parse_gpt_ini(struct gp_inifile_context *ctx,
                *version = v;
        }
 
-       result = NT_STATUS_OK;
+       talloc_free(ctx);
 
-       return result;
+       return NT_STATUS_OK;
 }

diff --git a/libgpo/gpo_ini.h b/libgpo/gpo_ini.h
index 20588b666455404929749571b7d5fdd4a5074c8e..02ca0ff9ad6c4c3bfa0e55a2bc28a06932433c2a 100644 (file)
--- a/libgpo/gpo_ini.h
+++ b/libgpo/gpo_ini.h
@@ -36,7 +36,7 @@ NTSTATUS gp_inifile_init_context(TALLOC_CTX *mem_ctx, uint32_t flags,
                                 const char *unix_path, const char *suffix,
                                 struct gp_inifile_context **ctx_ret);
 
-NTSTATUS parse_gpt_ini(struct gp_inifile_context *ctx,
+NTSTATUS parse_gpt_ini(TALLOC_CTX *ctx,
                       const char *filename,
                       uint32_t *version,
                       char **display_name);

diff --git a/source3/Makefile.in b/source3/Makefile.in
index ccb5a6e6fa3302d0328d3bf5b0dd606e6aad463f..51a469b2b9b6ba06dbb50895397adb1060f9d235 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -411,7 +411,7 @@ LIBADDNS_OBJ = $(LIBADDNS_OBJ0) $(SOCKET_WRAPPER_OBJ)
 
 GPEXT_OBJ = ../libgpo/gpext/gpext.o @GPEXT_STATIC@
 
-LIBGPO_OBJ0 = ../libgpo/gpo_ldap.o libgpo/gpo_ini.o ../libgpo/gpo_util.o \
+LIBGPO_OBJ0 = ../libgpo/gpo_ldap.o ../libgpo/gpo_ini.o ../libgpo/gpo_util.o \
              ../libgpo/gpo_fetch.o libgpo/gpo_filesync.o ../libgpo/gpo_sec.o \
              libgpo/gpo_reg.o \
              $(GPEXT_OBJ)

diff --git a/source3/libgpo/gpext/scripts.c b/source3/libgpo/gpext/scripts.c
index ddea35c644481f3159e1d3e13fc492e96aa5400f..4ced3abda581dc30af15e47f653e0914b72b339d 100644 (file)
--- 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, &parameters);
+               if (!NT_STATUS_IS_OK(result)) {
+                       break;
+               }
 
                {
                        struct gp_registry_entry *entry = NULL;

diff --git a/source3/libgpo/gpext/security.c b/source3/libgpo/gpext/security.c
index 6aeb354c41ff3eed52d5f17f15ddb8bbf8ce93a0..8adeb59ead0dcb00ee7f14dd817242038b6c75f6 100644 (file)
--- a/source3/libgpo/gpext/security.c
+++ b/source3/libgpo/gpext/security.c
@@ -56,27 +56,30 @@ struct gpttmpl_table {
 #define GPTTMPL_VALUE_CHICAGO "$CHICAGO$" /* whatever this is good for... */
 #define GPTTMPL_PARAMETER_UNICODE "Unicode"
 
-static NTSTATUS gpttmpl_parse_header(dictionary *dict,
+static NTSTATUS gpttmpl_parse_header(struct gp_inifile_context *ini_ctx,
                                     uint32_t *version_out)
 {
        const char *signature = NULL;
+       NTSTATUS result;
        uint32_t version;
+       int is_unicode;
 
-       if (!dict) {
+       if (!ini_ctx) {
                return NT_STATUS_INVALID_PARAMETER;
        }
 
-       if ((signature = iniparser_getstring(dict, GPTTMPL_SECTION_VERSION
-                       ":"GPTTMPL_PARAMETER_SIGNATURE, NULL)) == NULL) {
+       result = gp_inifile_getstring(ini_ctx, GPTTMPL_SECTION_VERSION
+                       ":"GPTTMPL_PARAMETER_SIGNATURE, &signature);
+       if (!NT_STATUS_IS_OK(result)) {
                return NT_STATUS_INTERNAL_DB_CORRUPTION;
        }
 
        if (!strequal(signature, GPTTMPL_VALUE_CHICAGO)) {
                return NT_STATUS_INTERNAL_DB_CORRUPTION;
        }
-
-       if ((version = iniparser_getint(dict, GPTTMPL_SECTION_VERSION
-                       ":"GPTTMPL_PARAMETER_REVISION, Undefined)) == Undefined) {
+       result = gp_inifile_getint(ini_ctx, GPTTMPL_SECTION_VERSION
+                       ":"GPTTMPL_PARAMETER_REVISION, &version);
+       if (!NT_STATUS_IS_OK(result))
                return NT_STATUS_INTERNAL_DB_CORRUPTION;
        }
 
@@ -84,9 +87,9 @@ static NTSTATUS gpttmpl_parse_header(dictionary *dict,
                *version_out = version;
        }
 
-       /* treat that as boolean */
-       if ((!iniparser_getboolean(dict, GPTTMPL_SECTION_UNICODE
-                       ":"GPTTMPL_PARAMETER_UNICODE, Undefined)) == Undefined) {
+       result = gp_inifile_getint(ini_ctx, GPTTMPL_SECTION_UNICODE
+                       ":"GPTTMPL_PARAMETER_UNICODE, is_unicode);
+       if (!NT_STATUS_IS_OK(result) || !is_unicode) {
                return NT_STATUS_INTERNAL_DB_CORRUPTION;
        }
 
@@ -109,7 +112,7 @@ static NTSTATUS gpttmpl_init_context(TALLOC_CTX *mem_ctx,
                                         GPTTMPL_UNIX_PATH, &tmp_ctx);
        NT_STATUS_NOT_OK_RETURN(status);
 
-       status = gpttmpl_parse_header(tmp_ctx->dict, &version);
+       status = gpttmpl_parse_header(tmp_ctx, &version);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(1,("gpttmpl_init_context: failed: %s\n",
                        nt_errstr(status)));