Merge hive.h into registry.h
authorJelmer Vernooij <jelmer@samba.org>
Wed, 2 Apr 2008 11:59:48 +0000 (13:59 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 2 Apr 2008 11:59:48 +0000 (13:59 +0200)
source/lib/registry/dir.c
source/lib/registry/hive.c
source/lib/registry/hive.h [deleted file]
source/lib/registry/regf.c
source/lib/registry/registry.h
source/lib/registry/registry.i
source/lib/registry/registry_wrap.c

index dc3717e88614e80e312df946033bf00a2a33d866..449ee0f6eefa6277de797f10de933949f02891c8 100644 (file)
@@ -18,7 +18,7 @@
 */
 
 #include "includes.h"
-#include "hive.h"
+#include "registry.h"
 #include "system/dir.h"
 #include "system/filesys.h"
 
index fc2d0fe869e91a281ba9ed70ce98f015aa3bf02f..2a9b1a59ceff6d91cfaf679b16d7c94f7a03abc0 100644 (file)
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "hive.h"
+#include "registry.h"
 #include "system/filesys.h"
 #include "param/param.h"
 
diff --git a/source/lib/registry/hive.h b/source/lib/registry/hive.h
deleted file mode 100644 (file)
index 2410885..0000000
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-   Registry hive interface
-   Copyright (C) Jelmer Vernooij                                         2003-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, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#ifndef __REGISTRY_HIVE_H__
-#define __REGISTRY_HIVE_H__
-
-#include <talloc.h>
-#include "libcli/util/werror.h"
-#include "librpc/gen_ndr/security.h"
-#include "libcli/util/ntstatus.h"
-
-/**
- * This file contains the hive API. This API is generally used for
- * reading a specific file that contains just one hive.
- *
- * Good examples are .DAT (NTUSER.DAT) files.
- *
- * This API does not have any notification support (that
- * should be provided by the registry implementation), nor
- * does it understand what predefined keys are.
- */
-
-struct hive_key {
-       const struct hive_operations *ops;
-};
-
-struct hive_operations {
-       const char *name;
-
-       /**
-        * Open a specific subkey
-        */
-       WERROR (*enum_key) (TALLOC_CTX *mem_ctx,
-                           const struct hive_key *key, uint32_t idx,
-                           const char **name,
-                           const char **classname,
-                           NTTIME *last_mod_time);
-
-       /**
-        * Open a subkey by name
-        */
-       WERROR (*get_key_by_name) (TALLOC_CTX *mem_ctx,
-                                  const struct hive_key *key, const char *name,
-                                  struct hive_key **subkey);
-
-       /**
-        * Add a new key.
-        */
-       WERROR (*add_key) (TALLOC_CTX *ctx,
-                          const struct hive_key *parent_key, const char *name,
-                          const char *classname,
-                          struct security_descriptor *desc,
-                          struct hive_key **key);
-       /**
-        * Remove an existing key.
-        */
-       WERROR (*del_key) (const struct hive_key *key, const char *name);
-
-       /**
-        * Force write of a key to disk.
-        */
-       WERROR (*flush_key) (struct hive_key *key);
-
-       /**
-        * Retrieve a registry value with a specific index.
-        */
-       WERROR (*enum_value) (TALLOC_CTX *mem_ctx,
-                             struct hive_key *key, int idx,
-                             const char **name, uint32_t *type,
-                             DATA_BLOB *data);
-
-       /**
-        * Retrieve a registry value with the specified name
-        */
-       WERROR (*get_value_by_name) (TALLOC_CTX *mem_ctx,
-                                    struct hive_key *key, const char *name,
-                                    uint32_t *type, DATA_BLOB *data);
-
-       /**
-        * Set a value on the specified registry key.
-        */
-       WERROR (*set_value) (struct hive_key *key, const char *name,
-                            uint32_t type, const DATA_BLOB data);
-
-       /**
-        * Remove a value.
-        */
-       WERROR (*delete_value) (struct hive_key *key, const char *name);
-
-       /* Security Descriptors */
-
-       /**
-        * Change the security descriptor on a registry key.
-        *
-        * This should return WERR_NOT_SUPPORTED if the underlying
-        * format does not have a mechanism for storing
-        * security descriptors.
-        */
-       WERROR (*set_sec_desc) (struct hive_key *key,
-                               const struct security_descriptor *desc);
-
-       /**
-        * Retrieve the security descriptor on a registry key.
-        *
-        * This should return WERR_NOT_SUPPORTED if the underlying
-        * format does not have a mechanism for storing
-        * security descriptors.
-        */
-       WERROR (*get_sec_desc) (TALLOC_CTX *ctx,
-                               const struct hive_key *key,
-                               struct security_descriptor **desc);
-
-       /**
-        * Retrieve general information about a key.
-        */
-       WERROR (*get_key_info) (TALLOC_CTX *mem_ctx,
-                               const struct hive_key *key,
-                               const char **classname,
-                               uint32_t *num_subkeys,
-                               uint32_t *num_values,
-                               NTTIME *last_change_time,
-                               uint32_t *max_subkeynamelen,
-                               uint32_t *max_valnamelen,
-                               uint32_t *max_valbufsize);
-};
-
-struct cli_credentials;
-struct auth_session_info;
-
-WERROR reg_open_hive(TALLOC_CTX *parent_ctx, const char *location,
-                    struct auth_session_info *session_info,
-                    struct cli_credentials *credentials,
-                    struct loadparm_context *lp_ctx,
-                    struct hive_key **root);
-WERROR hive_key_get_info(TALLOC_CTX *mem_ctx, const struct hive_key *key,
-                        const char **classname, uint32_t *num_subkeys,
-                        uint32_t *num_values, NTTIME *last_change_time,
-                        uint32_t *max_subkeynamelen,
-                        uint32_t *max_valnamelen, uint32_t *max_valbufsize);
-WERROR hive_key_add_name(TALLOC_CTX *ctx, const struct hive_key *parent_key,
-                        const char *name, const char *classname,
-                        struct security_descriptor *desc,
-                        struct hive_key **key);
-WERROR hive_key_del(const struct hive_key *key, const char *name);
-WERROR hive_get_key_by_name(TALLOC_CTX *mem_ctx,
-                           const struct hive_key *key, const char *name,
-                           struct hive_key **subkey);
-WERROR hive_enum_key(TALLOC_CTX *mem_ctx,
-                    const struct hive_key *key, uint32_t idx,
-                    const char **name,
-                    const char **classname,
-                    NTTIME *last_mod_time);
-
-WERROR hive_key_set_value(struct hive_key *key, const char *name,
-                     uint32_t type, const DATA_BLOB data);
-
-WERROR hive_get_value(TALLOC_CTX *mem_ctx,
-                     struct hive_key *key, const char *name,
-                     uint32_t *type, DATA_BLOB *data);
-WERROR hive_get_value_by_index(TALLOC_CTX *mem_ctx,
-                              struct hive_key *key, uint32_t idx,
-                              const char **name,
-                              uint32_t *type, DATA_BLOB *data);
-
-WERROR hive_key_del_value(struct hive_key *key, const char *name);
-
-WERROR hive_key_flush(struct hive_key *key);
-
-
-/* Individual backends */
-WERROR reg_open_directory(TALLOC_CTX *parent_ctx,
-                         const char *location, struct hive_key **key);
-WERROR reg_open_regf_file(TALLOC_CTX *parent_ctx,
-                         const char *location, struct smb_iconv_convenience *iconv_convenience,
-                         struct hive_key **key);
-WERROR reg_open_ldb_file(TALLOC_CTX *parent_ctx, const char *location,
-                        struct auth_session_info *session_info,
-                        struct cli_credentials *credentials,
-                        struct loadparm_context *lp_ctx,
-                        struct hive_key **k);
-
-
-WERROR reg_create_directory(TALLOC_CTX *parent_ctx,
-                           const char *location, struct hive_key **key);
-WERROR reg_create_regf_file(TALLOC_CTX *parent_ctx,
-                           struct smb_iconv_convenience *iconv_convenience,
-                           const char *location,
-                           int major_version,
-                           struct hive_key **key);
-
-
-#endif /* __REGISTRY_HIVE_H__ */
index a192f3be4ddc14c656435552d22ce3b0ed7d356a..46ccca922b8903d7892c908326ee4eff21a31319 100644 (file)
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "includes.h"
-#include "lib/registry/hive.h"
 #include "system/filesys.h"
 #include "system/time.h"
 #include "lib/registry/tdr_regf.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/winreg.h"
 #include "param/param.h"
+#include "lib/registry/registry.h"
 
 static struct hive_operations reg_backend_regf;
 
index b76f2c4bcc06e6834c8d83a9a8ad93b87f6f43c5..ff03f71eb2161f48334fd2b4f0a39c5fb2a7efa6 100644 (file)
 struct registry_context;
 
 #include <talloc.h>
+#include "libcli/util/werror.h"
 #include "librpc/gen_ndr/security.h"
-#include "lib/registry/hive.h"
 #include "libcli/util/ntstatus.h"
 
+/**
+ * The hive API. This API is generally used for
+ * reading a specific file that contains just one hive.
+ *
+ * Good examples are .DAT (NTUSER.DAT) files.
+ *
+ * This API does not have any notification support (that
+ * should be provided by the registry implementation), nor
+ * does it understand what predefined keys are.
+ */
+
+struct hive_key {
+       const struct hive_operations *ops;
+};
+
+struct hive_operations {
+       const char *name;
+
+       /**
+        * Open a specific subkey
+        */
+       WERROR (*enum_key) (TALLOC_CTX *mem_ctx,
+                           const struct hive_key *key, uint32_t idx,
+                           const char **name,
+                           const char **classname,
+                           NTTIME *last_mod_time);
+
+       /**
+        * Open a subkey by name
+        */
+       WERROR (*get_key_by_name) (TALLOC_CTX *mem_ctx,
+                                  const struct hive_key *key, const char *name,
+                                  struct hive_key **subkey);
+
+       /**
+        * Add a new key.
+        */
+       WERROR (*add_key) (TALLOC_CTX *ctx,
+                          const struct hive_key *parent_key, const char *name,
+                          const char *classname,
+                          struct security_descriptor *desc,
+                          struct hive_key **key);
+       /**
+        * Remove an existing key.
+        */
+       WERROR (*del_key) (const struct hive_key *key, const char *name);
+
+       /**
+        * Force write of a key to disk.
+        */
+       WERROR (*flush_key) (struct hive_key *key);
+
+       /**
+        * Retrieve a registry value with a specific index.
+        */
+       WERROR (*enum_value) (TALLOC_CTX *mem_ctx,
+                             struct hive_key *key, int idx,
+                             const char **name, uint32_t *type,
+                             DATA_BLOB *data);
+
+       /**
+        * Retrieve a registry value with the specified name
+        */
+       WERROR (*get_value_by_name) (TALLOC_CTX *mem_ctx,
+                                    struct hive_key *key, const char *name,
+                                    uint32_t *type, DATA_BLOB *data);
+
+       /**
+        * Set a value on the specified registry key.
+        */
+       WERROR (*set_value) (struct hive_key *key, const char *name,
+                            uint32_t type, const DATA_BLOB data);
+
+       /**
+        * Remove a value.
+        */
+       WERROR (*delete_value) (struct hive_key *key, const char *name);
+
+       /* Security Descriptors */
+
+       /**
+        * Change the security descriptor on a registry key.
+        *
+        * This should return WERR_NOT_SUPPORTED if the underlying
+        * format does not have a mechanism for storing
+        * security descriptors.
+        */
+       WERROR (*set_sec_desc) (struct hive_key *key,
+                               const struct security_descriptor *desc);
+
+       /**
+        * Retrieve the security descriptor on a registry key.
+        *
+        * This should return WERR_NOT_SUPPORTED if the underlying
+        * format does not have a mechanism for storing
+        * security descriptors.
+        */
+       WERROR (*get_sec_desc) (TALLOC_CTX *ctx,
+                               const struct hive_key *key,
+                               struct security_descriptor **desc);
+
+       /**
+        * Retrieve general information about a key.
+        */
+       WERROR (*get_key_info) (TALLOC_CTX *mem_ctx,
+                               const struct hive_key *key,
+                               const char **classname,
+                               uint32_t *num_subkeys,
+                               uint32_t *num_values,
+                               NTTIME *last_change_time,
+                               uint32_t *max_subkeynamelen,
+                               uint32_t *max_valnamelen,
+                               uint32_t *max_valbufsize);
+};
+
+struct cli_credentials;
+struct auth_session_info;
+
+WERROR reg_open_hive(TALLOC_CTX *parent_ctx, const char *location,
+                    struct auth_session_info *session_info,
+                    struct cli_credentials *credentials,
+                    struct loadparm_context *lp_ctx,
+                    struct hive_key **root);
+WERROR hive_key_get_info(TALLOC_CTX *mem_ctx, const struct hive_key *key,
+                        const char **classname, uint32_t *num_subkeys,
+                        uint32_t *num_values, NTTIME *last_change_time,
+                        uint32_t *max_subkeynamelen,
+                        uint32_t *max_valnamelen, uint32_t *max_valbufsize);
+WERROR hive_key_add_name(TALLOC_CTX *ctx, const struct hive_key *parent_key,
+                        const char *name, const char *classname,
+                        struct security_descriptor *desc,
+                        struct hive_key **key);
+WERROR hive_key_del(const struct hive_key *key, const char *name);
+WERROR hive_get_key_by_name(TALLOC_CTX *mem_ctx,
+                           const struct hive_key *key, const char *name,
+                           struct hive_key **subkey);
+WERROR hive_enum_key(TALLOC_CTX *mem_ctx,
+                    const struct hive_key *key, uint32_t idx,
+                    const char **name,
+                    const char **classname,
+                    NTTIME *last_mod_time);
+
+WERROR hive_key_set_value(struct hive_key *key, const char *name,
+                     uint32_t type, const DATA_BLOB data);
+
+WERROR hive_get_value(TALLOC_CTX *mem_ctx,
+                     struct hive_key *key, const char *name,
+                     uint32_t *type, DATA_BLOB *data);
+WERROR hive_get_value_by_index(TALLOC_CTX *mem_ctx,
+                              struct hive_key *key, uint32_t idx,
+                              const char **name,
+                              uint32_t *type, DATA_BLOB *data);
+
+WERROR hive_key_del_value(struct hive_key *key, const char *name);
+
+WERROR hive_key_flush(struct hive_key *key);
+
+
+/* Individual backends */
+WERROR reg_open_directory(TALLOC_CTX *parent_ctx,
+                         const char *location, struct hive_key **key);
+WERROR reg_open_regf_file(TALLOC_CTX *parent_ctx,
+                         const char *location, struct smb_iconv_convenience *iconv_convenience,
+                         struct hive_key **key);
+WERROR reg_open_ldb_file(TALLOC_CTX *parent_ctx, const char *location,
+                        struct auth_session_info *session_info,
+                        struct cli_credentials *credentials,
+                        struct loadparm_context *lp_ctx,
+                        struct hive_key **k);
+
+
+WERROR reg_create_directory(TALLOC_CTX *parent_ctx,
+                           const char *location, struct hive_key **key);
+WERROR reg_create_regf_file(TALLOC_CTX *parent_ctx,
+                           struct smb_iconv_convenience *iconv_convenience,
+                           const char *location,
+                           int major_version,
+                           struct hive_key **key);
+
+
+
 /* Handles for the predefined keys */
 #define HKEY_CLASSES_ROOT              0x80000000
 #define HKEY_CURRENT_USER              0x80000001
index 20ae671c75b5f1653e3f5b5619c638cc746f9c97..8ab402d57d133d8929cc6cf9d8eee3bf937c0e4c 100644 (file)
@@ -26,7 +26,6 @@
 #include "includes.h"
 #include "registry.h"
 #include "param/param.h"
-#include "hive.h"
 
 typedef struct registry_context reg;
 typedef struct hive_key hive_key;
index 51c255e9f7034de850d10340fa5856dcfdf9d786..ded3acbbe65bff0b6c7b6ecf9618ec023481d5cc 100644 (file)
@@ -2529,7 +2529,7 @@ static swig_module_info swig_module = {swig_types, 25, 0, 0, 0, 0};
 #include "includes.h"
 #include "registry.h"
 #include "param/param.h"
-#include "hive.h"
+#include "registry.h"
 
 typedef struct registry_context reg;
 typedef struct hive_key hive_key;