From 933482e64869f5aee2ca0356abb721facfd65943 Mon Sep 17 00:00:00 2001 From: Wilco Baan Hofman Date: Mon, 20 Apr 2009 14:57:33 +0200 Subject: Move gpo_ini stuff to the main libgpo. Make gpo_ini use a common parser. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It now makes use of lib/util/param.c to parse ini files. Signed-off-by: Günther Deschner --- source3/libgpo/gpo_ini.c | 245 ----------------------------------------------- source3/libgpo/gpo_ini.h | 33 ------- 2 files changed, 278 deletions(-) delete mode 100644 source3/libgpo/gpo_ini.c delete mode 100644 source3/libgpo/gpo_ini.h (limited to 'source3') diff --git a/source3/libgpo/gpo_ini.c b/source3/libgpo/gpo_ini.c deleted file mode 100644 index edca85530b..0000000000 --- a/source3/libgpo/gpo_ini.c +++ /dev/null @@ -1,245 +0,0 @@ -/* - * Unix SMB/CIFS implementation. - * Group Policy Support - * Copyright (C) Guenther Deschner 2007 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - */ - -#include "includes.h" -#include "gpo_ini.h" - -/**************************************************************** -****************************************************************/ - -static int gp_inifile_free_context(struct gp_inifile_context *ctx) -{ - if (!ctx) { - return 0; - } - - if (ctx->generated_filename) { - unlink(ctx->generated_filename); - ctx->generated_filename = NULL; - } - - if (ctx->dict) { - iniparser_freedict(ctx->dict); - ctx->dict = NULL; - } - - ctx = NULL; - - return 0; -} - -/**************************************************************** -****************************************************************/ - -static NTSTATUS convert_file_from_ucs2(TALLOC_CTX *mem_ctx, - const char *filename_in, - char **filename_out) -{ - int tmp_fd = -1; - uint8 *data_in = NULL; - uint8 *data_out = NULL; - char *tmp_name = NULL; - NTSTATUS status; - size_t n = 0; - size_t converted_size; - - if (!filename_out) { - return NT_STATUS_INVALID_PARAMETER; - } - - data_in = (uint8 *)file_load(filename_in, &n, 0, NULL); - if (!data_in) { - status = NT_STATUS_NO_SUCH_FILE; - goto out; - } - - tmp_name = talloc_asprintf(mem_ctx, "%s/convert_file_from_ucs2.XXXXXX", - tmpdir()); - if (!tmp_name) { - status = NT_STATUS_NO_MEMORY; - goto out; - } - - tmp_fd = smb_mkstemp(tmp_name); - if (tmp_fd == -1) { - status = NT_STATUS_ACCESS_DENIED; - goto out; - } - - if (!convert_string_talloc(mem_ctx, CH_UTF16LE, CH_UNIX, data_in, n, - (void **)&data_out, &converted_size, False)) - { - status = NT_STATUS_INVALID_BUFFER_SIZE; - goto out; - } - - /* skip utf8 BOM */ - DEBUG(11,("convert_file_from_ucs2: " - "data_out[0]: 0x%x, data_out[1]: 0x%x, data_out[2]: 0x%x\n", - data_out[0], data_out[1], data_out[2])); - - if ((data_out[0] == 0xef) && (data_out[1] == 0xbb) && - (data_out[2] == 0xbf)) { - DEBUG(11,("convert_file_from_ucs2: " - "%s skipping utf8 BOM\n", tmp_name)); - data_out += 3; - converted_size -= 3; - } - - if (sys_write(tmp_fd, data_out, converted_size) != converted_size) { - status = map_nt_error_from_unix(errno); - goto out; - } - - *filename_out = tmp_name; - - status = NT_STATUS_OK; - - out: - if (tmp_fd != -1) { - close(tmp_fd); - } - - TALLOC_FREE(data_in); - - return status; -} - -/**************************************************************** -****************************************************************/ - - 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) -{ - struct gp_inifile_context *ctx = NULL; - NTSTATUS status; - dictionary *dict = NULL; - char *tmp_filename = NULL; - const char *ini_filename = NULL; - - if (!unix_path || !ctx_ret) { - return NT_STATUS_INVALID_PARAMETER; - } - - ctx = TALLOC_ZERO_P(mem_ctx, struct gp_inifile_context); - NT_STATUS_HAVE_NO_MEMORY(ctx); - - talloc_set_destructor(ctx, gp_inifile_free_context); - - status = gp_find_file(mem_ctx, flags, unix_path, suffix, - &ini_filename); - - if (!NT_STATUS_IS_OK(status)) { - goto failed; - } - - status = convert_file_from_ucs2(mem_ctx, ini_filename, - &tmp_filename); - if (!NT_STATUS_IS_OK(status)) { - goto failed; - } - - dict = iniparser_load(tmp_filename); - if (!dict) { - status = NT_STATUS_NO_SUCH_FILE; - goto failed; - } - - ctx->generated_filename = tmp_filename; - ctx->dict = dict; - ctx->mem_ctx = mem_ctx; - - *ctx_ret = ctx; - - return NT_STATUS_OK; - - failed: - - DEBUG(1,("gp_inifile_init_context failed: %s\n", - nt_errstr(status))); - - TALLOC_FREE(ctx); - - return status; -} - -/**************************************************************** - parse the local gpt.ini file -****************************************************************/ - -#define GPT_INI_SECTION_GENERAL "General" -#define GPT_INI_PARAMETER_VERSION "Version" -#define GPT_INI_PARAMETER_DISPLAYNAME "displayName" - -NTSTATUS parse_gpt_ini(TALLOC_CTX *mem_ctx, - const char *filename, - uint32_t *version, - char **display_name) -{ - NTSTATUS result; - uint32_t v = 0; - char *name = NULL; - dictionary *dict = NULL; - - if (!filename) { - return NT_STATUS_INVALID_PARAMETER; - } - - dict = iniparser_load(filename); - if (!dict) { - return NT_STATUS_NO_SUCH_FILE; - } - - if ((name = iniparser_getstring(dict, GPT_INI_SECTION_GENERAL - ":"GPT_INI_PARAMETER_DISPLAYNAME, NULL)) == NULL) { - /* the default domain policy and the default domain controller - * policy never have a displayname in their gpt.ini file */ - DEBUG(10,("parse_gpt_ini: no name in %s\n", filename)); - } - - if (name && display_name) { - *display_name = talloc_strdup(mem_ctx, name); - if (*display_name == NULL) { - result = NT_STATUS_NO_MEMORY; - goto out; - } - } - - if ((v = iniparser_getint(dict, GPT_INI_SECTION_GENERAL - ":"GPT_INI_PARAMETER_VERSION, Undefined)) == Undefined) { - DEBUG(10,("parse_gpt_ini: no version\n")); - result = NT_STATUS_INTERNAL_DB_CORRUPTION; - goto out; - } - - if (version) { - *version = v; - } - - result = NT_STATUS_OK; - out: - if (dict) { - iniparser_freedict(dict); - } - - return result; -} diff --git a/source3/libgpo/gpo_ini.h b/source3/libgpo/gpo_ini.h deleted file mode 100644 index fa03dbaaaa..0000000000 --- a/source3/libgpo/gpo_ini.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Unix SMB/CIFS implementation. - * Group Policy Support - * Copyright (C) Guenther Deschner 2007 - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, see . - */ - -/* FIXME: get rid of iniparser */ -#include - -struct gp_inifile_context { - TALLOC_CTX *mem_ctx; - dictionary *dict; - const char *generated_filename; -}; - -/* prototypes */ - -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); -- cgit