summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2013-12-18 15:43:23 +0100
committerAndreas Schneider <asn@samba.org>2014-01-07 16:59:38 +0100
commitc39425f14bd58537aed1079335a62bbac8af7fb6 (patch)
treef82cc9d62ae4a0a4700271234d1bdb162eed9bf4
parent69997e2911e1c720fc5b87dae24b9a9c82b87eb7 (diff)
downloadsamba-c39425f14bd58537aed1079335a62bbac8af7fb6.tar.gz
libgpo: prefix some more calls with gpext_.
Guenther Signed-off-by: Günther Deschner <gd@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org>
-rw-r--r--libgpo/gpext/gpext.c52
-rw-r--r--libgpo/gpext/gpext.h43
-rw-r--r--libgpo/gpo_util.c6
-rw-r--r--source3/libgpo/gpext/registry.c14
-rw-r--r--source3/libgpo/gpext/scripts.c14
-rw-r--r--source3/libgpo/gpext/security.c14
6 files changed, 72 insertions, 71 deletions
diff --git a/libgpo/gpext/gpext.c b/libgpo/gpext/gpext.c
index 49d08c82c7b..e817f48fd2a 100644
--- a/libgpo/gpext/gpext.c
+++ b/libgpo/gpext/gpext.c
@@ -32,7 +32,7 @@ static struct gp_extension *extensions = NULL;
/****************************************************************
****************************************************************/
-struct gp_extension *get_gp_extension_list(void)
+struct gp_extension *gpext_get_gp_extension_list(void)
{
return extensions;
}
@@ -101,7 +101,7 @@ static struct gp_extension_methods *get_methods_by_name(struct gp_extension *be,
/****************************************************************
****************************************************************/
-NTSTATUS unregister_gp_extension(const char *name)
+NTSTATUS gpext_unregister_gp_extension(const char *name)
{
struct gp_extension *ext;
@@ -121,11 +121,11 @@ NTSTATUS unregister_gp_extension(const char *name)
/****************************************************************
****************************************************************/
-NTSTATUS register_gp_extension(TALLOC_CTX *gpext_ctx,
- int version,
- const char *name,
- const char *guid,
- struct gp_extension_methods *methods)
+NTSTATUS gpext_register_gp_extension(TALLOC_CTX *gpext_ctx,
+ int version,
+ const char *name,
+ const char *guid,
+ struct gp_extension_methods *methods)
{
struct gp_extension_methods *test;
struct gp_extension *entry;
@@ -340,11 +340,11 @@ static NTSTATUS gp_ext_info_add_reg_table(TALLOC_CTX *mem_ctx,
/****************************************************************
****************************************************************/
-NTSTATUS gp_ext_info_add_entry(TALLOC_CTX *mem_ctx,
- const char *module,
- const char *ext_guid,
- struct gp_extension_reg_table *table,
- struct gp_extension_reg_info *info)
+NTSTATUS gpext_info_add_entry(TALLOC_CTX *mem_ctx,
+ const char *module,
+ const char *ext_guid,
+ struct gp_extension_reg_table *table,
+ struct gp_extension_reg_info *info)
{
NTSTATUS status;
struct gp_extension_reg_info_entry *entry = NULL;
@@ -538,7 +538,7 @@ static NTSTATUS gp_glob_ext_list(TALLOC_CTX *mem_ctx,
/****************************************************************
****************************************************************/
-NTSTATUS shutdown_gp_extensions(void)
+NTSTATUS gpext_shutdown_gp_extensions(void)
{
struct gp_extension *ext = NULL;
@@ -554,7 +554,7 @@ NTSTATUS shutdown_gp_extensions(void)
/****************************************************************
****************************************************************/
-NTSTATUS init_gp_extensions(TALLOC_CTX *mem_ctx)
+NTSTATUS gpext_init_gp_extensions(TALLOC_CTX *mem_ctx)
{
NTSTATUS status;
WERROR werr;
@@ -564,7 +564,7 @@ NTSTATUS init_gp_extensions(TALLOC_CTX *mem_ctx)
struct gp_extension *gpext = NULL;
struct gp_registry_context *reg_ctx = NULL;
- if (get_gp_extension_list()) {
+ if (gpext_get_gp_extension_list()) {
return NT_STATUS_OK;
}
@@ -637,7 +637,7 @@ NTSTATUS init_gp_extensions(TALLOC_CTX *mem_ctx)
/****************************************************************
****************************************************************/
-NTSTATUS free_gp_extensions(void)
+NTSTATUS gpext_free_gp_extensions(void)
{
struct gp_extension *ext, *ext_next = NULL;
@@ -678,13 +678,15 @@ void gpext_debug_header(int lvl,
TALLOC_FREE(flags_str);
}
-NTSTATUS process_gpo_list_with_extension(
- TALLOC_CTX *mem_ctx,
- uint32_t flags,
- const struct security_token *token,
- struct GROUP_POLICY_OBJECT *gpo_list,
- const char *extension_guid,
- const char *snapin_guid)
+/****************************************************************
+****************************************************************/
+
+NTSTATUS gpext_process_gpo_list_with_extension(TALLOC_CTX *mem_ctx,
+ uint32_t flags,
+ const struct security_token *token,
+ struct GROUP_POLICY_OBJECT *gpo_list,
+ const char *extension_guid,
+ const char *snapin_guid)
{
return NT_STATUS_OK;
}
@@ -705,9 +707,9 @@ NTSTATUS gpext_process_extension(TALLOC_CTX *mem_ctx,
struct GUID guid;
bool cse_found = false;
- status = init_gp_extensions(mem_ctx);
+ status = gpext_init_gp_extensions(mem_ctx);
if (!NT_STATUS_IS_OK(status)) {
- DEBUG(1,("init_gp_extensions failed: %s\n",
+ DEBUG(1,("gpext_init_gp_extensions failed: %s\n",
nt_errstr(status)));
return status;
}
diff --git a/libgpo/gpext/gpext.h b/libgpo/gpext/gpext.h
index b76f7001205..c8024a25e86 100644
--- a/libgpo/gpext/gpext.h
+++ b/libgpo/gpext/gpext.h
@@ -77,34 +77,33 @@ struct gp_extension_methods {
/* The following definitions come from libgpo/gpext/gpext.c */
-struct gp_extension *get_gp_extension_list(void);
-NTSTATUS unregister_gp_extension(const char *name);
-NTSTATUS register_gp_extension(TALLOC_CTX *gpext_ctx,
- int version,
- const char *name,
- const char *guid,
- struct gp_extension_methods *methods);
-NTSTATUS gp_ext_info_add_entry(TALLOC_CTX *mem_ctx,
- const char *module,
- const char *ext_guid,
- struct gp_extension_reg_table *table,
- struct gp_extension_reg_info *info);
-NTSTATUS shutdown_gp_extensions(void);
-NTSTATUS init_gp_extensions(TALLOC_CTX *mem_ctx);
-NTSTATUS free_gp_extensions(void);
+struct gp_extension *gpext_get_gp_extension_list(void);
+NTSTATUS gpext_unregister_gp_extension(const char *name);
+NTSTATUS gpext_register_gp_extension(TALLOC_CTX *gpext_ctx,
+ int version,
+ const char *name,
+ const char *guid,
+ struct gp_extension_methods *methods);
+NTSTATUS gpext_info_add_entry(TALLOC_CTX *mem_ctx,
+ const char *module,
+ const char *ext_guid,
+ struct gp_extension_reg_table *table,
+ struct gp_extension_reg_info *info);
+NTSTATUS gpext_shutdown_gp_extensions(void);
+NTSTATUS gpext_init_gp_extensions(TALLOC_CTX *mem_ctx);
+NTSTATUS gpext_free_gp_extensions(void);
void gpext_debug_header(int lvl,
const char *name,
uint32_t flags,
struct GROUP_POLICY_OBJECT *gpo,
const char *extension_guid,
const char *snapin_guid);
-NTSTATUS process_gpo_list_with_extension(
- TALLOC_CTX *mem_ctx,
- uint32_t flags,
- const struct security_token *token,
- struct GROUP_POLICY_OBJECT *gpo_list,
- const char *extension_guid,
- const char *snapin_guid);
+NTSTATUS gpext_process_gpo_list_with_extension(TALLOC_CTX *mem_ctx,
+ uint32_t flags,
+ const struct security_token *token,
+ struct GROUP_POLICY_OBJECT *gpo_list,
+ const char *extension_guid,
+ const char *snapin_guid);
NTSTATUS gpext_process_extension(TALLOC_CTX *mem_ctx,
uint32_t flags,
const struct security_token *token,
diff --git a/libgpo/gpo_util.c b/libgpo/gpo_util.c
index 7378cfcd6e6..8689f2c4cd7 100644
--- a/libgpo/gpo_util.c
+++ b/libgpo/gpo_util.c
@@ -549,12 +549,12 @@ NTSTATUS gpo_process_gpo_list(TALLOC_CTX *mem_ctx,
struct gp_registry_context *reg_ctx = NULL;
WERROR werr;
- status = init_gp_extensions(mem_ctx);
+ status = gpext_init_gp_extensions(mem_ctx);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
- gp_ext_list = get_gp_extension_list();
+ gp_ext_list = gpext_get_gp_extension_list();
if (!gp_ext_list) {
return NT_STATUS_DLL_INIT_FAILED;
}
@@ -607,7 +607,7 @@ NTSTATUS gpo_process_gpo_list(TALLOC_CTX *mem_ctx,
done:
talloc_free(reg_ctx);
talloc_free(root_key);
- free_gp_extensions();
+ gpext_free_gp_extensions();
return status;
}
diff --git a/source3/libgpo/gpext/registry.c b/source3/libgpo/gpext/registry.c
index a7580c4ca9f..ec6dcdf4c22 100644
--- a/source3/libgpo/gpext/registry.c
+++ b/source3/libgpo/gpext/registry.c
@@ -329,9 +329,9 @@ static NTSTATUS registry_get_reg_config(TALLOC_CTX *mem_ctx,
info = talloc_zero(mem_ctx, struct gp_extension_reg_info);
NT_STATUS_HAVE_NO_MEMORY(info);
- status = gp_ext_info_add_entry(mem_ctx, GP_EXT_NAME,
- GP_EXT_GUID_REGISTRY,
- table, info);
+ status = gpext_info_add_entry(mem_ctx, GP_EXT_NAME,
+ GP_EXT_GUID_REGISTRY,
+ table, info);
NT_STATUS_NOT_OK_RETURN(status);
*reg_info = info;
@@ -354,7 +354,7 @@ static NTSTATUS registry_shutdown(void)
{
NTSTATUS status;
- status = unregister_gp_extension(GP_EXT_NAME);
+ status = gpext_unregister_gp_extension(GP_EXT_NAME);
if (NT_STATUS_IS_OK(status)) {
return status;
}
@@ -384,9 +384,9 @@ NTSTATUS gpext_registry_init(void)
ctx = talloc_init("gpext_registry_init");
NT_STATUS_HAVE_NO_MEMORY(ctx);
- status = register_gp_extension(ctx, SMB_GPEXT_INTERFACE_VERSION,
- GP_EXT_NAME, GP_EXT_GUID_REGISTRY,
- &registry_methods);
+ status = gpext_register_gp_extension(ctx, SMB_GPEXT_INTERFACE_VERSION,
+ GP_EXT_NAME, GP_EXT_GUID_REGISTRY,
+ &registry_methods);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(ctx);
}
diff --git a/source3/libgpo/gpext/scripts.c b/source3/libgpo/gpext/scripts.c
index fc2d3316dfc..2ac11db310e 100644
--- a/source3/libgpo/gpext/scripts.c
+++ b/source3/libgpo/gpext/scripts.c
@@ -65,9 +65,9 @@ static NTSTATUS scripts_get_reg_config(TALLOC_CTX *mem_ctx,
info = talloc_zero(mem_ctx, struct gp_extension_reg_info);
NT_STATUS_HAVE_NO_MEMORY(info);
- status = gp_ext_info_add_entry(mem_ctx, GP_EXT_NAME,
- GP_EXT_GUID_SCRIPTS,
- table, info);
+ status = gpext_info_add_entry(mem_ctx, GP_EXT_NAME,
+ GP_EXT_GUID_SCRIPTS,
+ table, info);
NT_STATUS_NOT_OK_RETURN(status);
*reg_info = info;
@@ -412,7 +412,7 @@ static NTSTATUS scripts_shutdown(void)
{
NTSTATUS status;
- status = unregister_gp_extension(GP_EXT_NAME);
+ status = gpext_unregister_gp_extension(GP_EXT_NAME);
if (NT_STATUS_IS_OK(status)) {
return status;
}
@@ -442,9 +442,9 @@ NTSTATUS gpext_scripts_init(void)
ctx = talloc_init("gpext_scripts_init");
NT_STATUS_HAVE_NO_MEMORY(ctx);
- status = register_gp_extension(ctx, SMB_GPEXT_INTERFACE_VERSION,
- GP_EXT_NAME, GP_EXT_GUID_SCRIPTS,
- &scripts_methods);
+ status = gpext_register_gp_extension(ctx, SMB_GPEXT_INTERFACE_VERSION,
+ GP_EXT_NAME, GP_EXT_GUID_SCRIPTS,
+ &scripts_methods);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(ctx);
}
diff --git a/source3/libgpo/gpext/security.c b/source3/libgpo/gpext/security.c
index f43079b74ba..8226491827b 100644
--- a/source3/libgpo/gpext/security.c
+++ b/source3/libgpo/gpext/security.c
@@ -204,9 +204,9 @@ static NTSTATUS security_get_reg_config(TALLOC_CTX *mem_ctx,
info = talloc_zero(mem_ctx, struct gp_extension_reg_info);
NT_STATUS_HAVE_NO_MEMORY(info);
- status = gp_ext_info_add_entry(mem_ctx, GP_EXT_NAME,
- GP_EXT_GUID_SECURITY,
- table, info);
+ status = gpext_info_add_entry(mem_ctx, GP_EXT_NAME,
+ GP_EXT_GUID_SECURITY,
+ table, info);
NT_STATUS_NOT_OK_RETURN(status);
*reg_info = info;
@@ -230,7 +230,7 @@ static NTSTATUS security_shutdown(void)
{
NTSTATUS status;
- status = unregister_gp_extension(GP_EXT_NAME);
+ status = gpext_unregister_gp_extension(GP_EXT_NAME);
if (NT_STATUS_IS_OK(status)) {
return status;
}
@@ -260,9 +260,9 @@ NTSTATUS gpext_security_init(void)
ctx = talloc_init("gpext_security_init");
NT_STATUS_HAVE_NO_MEMORY(ctx);
- status = register_gp_extension(ctx, SMB_GPEXT_INTERFACE_VERSION,
- GP_EXT_NAME, GP_EXT_GUID_SECURITY,
- &security_methods);
+ status = gpext_register_gp_extension(ctx, SMB_GPEXT_INTERFACE_VERSION,
+ GP_EXT_NAME, GP_EXT_GUID_SECURITY,
+ &security_methods);
if (!NT_STATUS_IS_OK(status)) {
TALLOC_FREE(ctx);
}