[PATCH 07/26] gpo: move s3 gpo_proto.h to libgpo

abartlet at samba.org abartlet at samba.org
Thu Jun 5 04:07:12 MDT 2014


From: Garming Sam <garming at catalyst.net.nz>

Note that the only difference between the two files is the removal of the parse_gpt_ini header
from b756e02ac49bf23b07a0e2b8565177555481418a

Signed-off-by: Garming Sam <garming at catalyst.net.nz>
---
 libgpo/gpo_proto.h         |  7 ----
 source3/libgpo/gpo_proto.h | 94 ----------------------------------------------
 2 files changed, 101 deletions(-)
 delete mode 100644 source3/libgpo/gpo_proto.h

diff --git a/libgpo/gpo_proto.h b/libgpo/gpo_proto.h
index fa2f873..32a61ea 100644
--- a/libgpo/gpo_proto.h
+++ b/libgpo/gpo_proto.h
@@ -32,13 +32,6 @@ NTSTATUS gpo_sync_directories(TALLOC_CTX *mem_ctx,
 			      const char *nt_path,
 			      const char *local_path);
 
-/* The following definitions come from libgpo/gpo_ini.c  */
-
-NTSTATUS parse_gpt_ini(TALLOC_CTX *mem_ctx,
-		       const char *filename,
-		       uint32_t *version,
-		       char **display_name);
-
 /* The following definitions come from libgpo/gpo_reg.c  */
 
 struct security_token *registry_create_system_token(TALLOC_CTX *mem_ctx);
diff --git a/source3/libgpo/gpo_proto.h b/source3/libgpo/gpo_proto.h
deleted file mode 100644
index 32a61ea..0000000
--- a/source3/libgpo/gpo_proto.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- *  Unix SMB/CIFS implementation.
- *  Group Policy Object Support
- *
- *  Copyright (C) Guenther Deschner 2006-2008
- *
- *  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 <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _LIBGPO_GPO_PROTO_H_
-#define _LIBGPO_GPO_PROTO_H_
-
-/* The following definitions come from libgpo/gpo_filesync.c  */
-
-NTSTATUS gpo_copy_file(TALLOC_CTX *mem_ctx,
-		       struct cli_state *cli,
-		       const char *nt_path,
-		       const char *unix_path);
-NTSTATUS gpo_sync_directories(TALLOC_CTX *mem_ctx,
-			      struct cli_state *cli,
-			      const char *nt_path,
-			      const char *local_path);
-
-/* The following definitions come from libgpo/gpo_reg.c  */
-
-struct security_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 security_token *token,
-		       struct gp_registry_context **reg_ctx);
-void gp_free_reg_ctx(struct gp_registry_context *reg_ctx);
-WERROR gp_store_reg_subkey(TALLOC_CTX *mem_ctx,
-			   const char *subkeyname,
-			   struct registry_key *curr_key,
-			   struct registry_key **new_key);
-WERROR gp_read_reg_subkey(TALLOC_CTX *mem_ctx,
-			  struct gp_registry_context *reg_ctx,
-			  const char *subkeyname,
-			  struct registry_key **key);
-WERROR gp_store_reg_val_sz(TALLOC_CTX *mem_ctx,
-			   struct registry_key *key,
-			   const char *val_name,
-			   const char *val);
-WERROR gp_read_reg_val_sz(TALLOC_CTX *mem_ctx,
-			  struct registry_key *key,
-			  const char *val_name,
-			  const char **val);
-WERROR gp_reg_state_store(TALLOC_CTX *mem_ctx,
-			  uint32_t flags,
-			  const char *dn,
-			  const struct security_token *token,
-			  struct GROUP_POLICY_OBJECT *gpo_list);
-WERROR gp_reg_state_read(TALLOC_CTX *mem_ctx,
-			 uint32_t flags,
-			 const struct dom_sid *sid,
-			 struct GROUP_POLICY_OBJECT **gpo_list);
-WERROR gp_secure_key(TALLOC_CTX *mem_ctx,
-		     uint32_t flags,
-		     struct registry_key *key,
-		     const struct dom_sid *sid);
-void dump_reg_val(int lvl, const char *direction,
-		  const char *key, const char *subkey,
-		  struct registry_value *val);
-void dump_reg_entry(uint32_t flags,
-		    const char *dir,
-		    struct gp_registry_entry *entry);
-void dump_reg_entries(uint32_t flags,
-		      const char *dir,
-		      struct gp_registry_entry *entries,
-		      size_t num_entries);
-bool add_gp_registry_entry_to_array(TALLOC_CTX *mem_ctx,
-				    struct gp_registry_entry *entry,
-				    struct gp_registry_entry **entries,
-				    size_t *num);
-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 security_token *token,
-				uint32_t flags);
-
-#endif /* _LIBGPO_GPO_PROTO_H_ */
-- 
1.9.3



More information about the samba-technical mailing list