s3:registry: move the reg_api prototypes to their own header.

[amitay/samba.git] / source3 / libgpo / gpo_reg.c

diff --git a/source3/libgpo/gpo_reg.c b/source3/libgpo/gpo_reg.c
index 9821dd2178795181c87874312af0daa5424e4384..851fddcf20a71233abc18cb66d83b8cfb91c4b5f 100644 (file)
--- a/source3/libgpo/gpo_reg.c
+++ b/source3/libgpo/gpo_reg.c
@@ -21,23 +21,25 @@
 #include "../libgpo/gpo.h"
 #include "libgpo/gpo_proto.h"
 #include "registry.h"
+#include "registry/reg_api.h"
 #include "registry/reg_backend_db.h"
+#include "registry/reg_api_util.h"
 
 
 /****************************************************************
 ****************************************************************/
 
-struct nt_user_token *registry_create_system_token(TALLOC_CTX *mem_ctx)
+struct security_token *registry_create_system_token(TALLOC_CTX *mem_ctx)
 {
-       struct nt_user_token *token = NULL;
+       struct security_token *token = NULL;
 
-       token = TALLOC_ZERO_P(mem_ctx, struct nt_user_token);
+       token = TALLOC_ZERO_P(mem_ctx, struct security_token);
        if (!token) {
                DEBUG(1,("talloc failed\n"));
                return NULL;
        }
 
-       token->privilege_mask = se_priv_all;
+       token->privilege_mask = SE_ALL_PRIVS;
 
        if (!NT_STATUS_IS_OK(add_sid_to_array(token, &global_sid_System,
                         &token->sids, &token->num_sids))) {
@@ -54,7 +56,7 @@ struct nt_user_token *registry_create_system_token(TALLOC_CTX *mem_ctx)
 WERROR gp_init_reg_ctx(TALLOC_CTX *mem_ctx,
                       const char *initial_path,
                       uint32_t desired_access,
-                      const struct nt_user_token *token,
+                      const struct security_token *token,
                       struct gp_registry_context **reg_ctx)
 {
        struct gp_registry_context *tmp_ctx;
@@ -314,7 +316,7 @@ static const char *gp_reg_groupmembership_path(TALLOC_CTX *mem_ctx,
 
 static WERROR gp_reg_del_groupmembership(TALLOC_CTX *mem_ctx,
                                         struct registry_key *key,
-                                        const struct nt_user_token *token,
+                                        const struct security_token *token,
                                         uint32_t flags)
 {
        const char *path = NULL;
@@ -332,7 +334,7 @@ static WERROR gp_reg_del_groupmembership(TALLOC_CTX *mem_ctx,
 
 static WERROR gp_reg_store_groupmembership(TALLOC_CTX *mem_ctx,
                                           struct gp_registry_context *reg_ctx,
-                                          const struct nt_user_token *token,
+                                          const struct security_token *token,
                                           uint32_t flags)
 {
        struct registry_key *key = NULL;
@@ -377,7 +379,7 @@ static WERROR gp_reg_store_groupmembership(TALLOC_CTX *mem_ctx,
 static WERROR gp_reg_read_groupmembership(TALLOC_CTX *mem_ctx,
                                          struct gp_registry_context *reg_ctx,
                                          const struct dom_sid *object_sid,
-                                         struct nt_user_token **token,
+                                         struct security_token **token,
                                          uint32_t flags)
 {
        struct registry_key *key = NULL;
@@ -388,9 +390,9 @@ static WERROR gp_reg_read_groupmembership(TALLOC_CTX *mem_ctx,
        const char *path = NULL;
        uint32_t count = 0;
        int num_token_sids = 0;
-       struct nt_user_token *tmp_token = NULL;
+       struct security_token *tmp_token = NULL;
 
-       tmp_token = TALLOC_ZERO_P(mem_ctx, struct nt_user_token);
+       tmp_token = TALLOC_ZERO_P(mem_ctx, struct security_token);
        W_ERROR_HAVE_NO_MEMORY(tmp_token);
 
        path = gp_reg_groupmembership_path(mem_ctx, object_sid, flags);
@@ -453,7 +455,7 @@ static WERROR gp_del_reg_state(TALLOC_CTX *mem_ctx,
 WERROR gp_reg_state_store(TALLOC_CTX *mem_ctx,
                          uint32_t flags,
                          const char *dn,
-                         const struct nt_user_token *token,
+                         const struct security_token *token,
                          struct GROUP_POLICY_OBJECT *gpo_list)
 {
        struct gp_registry_context *reg_ctx = NULL;
@@ -950,7 +952,7 @@ WERROR reg_apply_registry_entry(TALLOC_CTX *mem_ctx,
                                struct registry_key *root_key,
                                struct gp_registry_context *reg_ctx,
                                struct gp_registry_entry *entry,
-                               const struct nt_user_token *token,
+                               const struct security_token *token,
                                uint32_t flags)
 {
        WERROR werr;