summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/registry/common/reg_interface.c2
-rw-r--r--source4/lib/registry/common/reg_util.c2
-rw-r--r--source4/lib/registry/reg_backend_nt4.c32
-rw-r--r--source4/lib/registry/registry.h136
-rw-r--r--source4/lib/registry/tools/regdiff.c2
-rw-r--r--source4/lib/registry/tools/regpatch.c2
-rw-r--r--source4/lib/registry/tools/regshell.c16
-rw-r--r--source4/lib/registry/tools/regtree.c2
8 files changed, 186 insertions, 8 deletions
diff --git a/source4/lib/registry/common/reg_interface.c b/source4/lib/registry/common/reg_interface.c
index ddd4ecbe93..74f158b027 100644
--- a/source4/lib/registry/common/reg_interface.c
+++ b/source4/lib/registry/common/reg_interface.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "dlinklist.h"
-#include "registry.h"
+#include "lib/registry/registry.h"
/* List of available backends */
static struct reg_init_function_entry *backends = NULL;
diff --git a/source4/lib/registry/common/reg_util.c b/source4/lib/registry/common/reg_util.c
index a0d4db6f57..ae30839cca 100644
--- a/source4/lib/registry/common/reg_util.c
+++ b/source4/lib/registry/common/reg_util.c
@@ -19,7 +19,7 @@
*/
#include "includes.h"
-#include "registry.h"
+#include "lib/registry/registry.h"
#include "librpc/gen_ndr/winreg.h"
static const struct {
diff --git a/source4/lib/registry/reg_backend_nt4.c b/source4/lib/registry/reg_backend_nt4.c
index cf67abb322..4fc458dee4 100644
--- a/source4/lib/registry/reg_backend_nt4.c
+++ b/source4/lib/registry/reg_backend_nt4.c
@@ -376,7 +376,11 @@ static struct registry_key *regf_get_key (TALLOC_CTX *ctx, struct regf_data *reg
ret->name = talloc_steal(ret, nk->key_name);
ret->last_mod = nk->last_change;
- ret->class_name = NULL; /* FIXME: get somehow using clsname_offset */
+
+ if (nk->clsname_offset != -1) {
+ DATA_BLOB data = hbin_get(regf, nk->clsname_offset);
+ ret->class_name = talloc_strndup(ret, (char*)data.data, nk->clsname_length);
+ }
ret->backend_data = nk;
return ret;
@@ -581,6 +585,30 @@ static WERROR regf_add_key (TALLOC_CTX *ctx, struct registry_key *parent, const
return WERR_OK;
}
+static WERROR regf_set_value (struct registry_key *key, const char *name, uint32_t type, DATA_BLOB data)
+{
+ /* FIXME */
+
+ return WERR_NOT_SUPPORTED;
+}
+
+static WERROR regf_save(struct registry_hive *hive, const char *location)
+{
+ struct regf_data *regf = hive->backend_data;
+ struct tdr_push *push = talloc_zero(regf, struct tdr_push);
+ int i;
+
+ tdr_push_regf_hdr(push, regf->header);
+
+ for (i = 0; regf->hbins[i]; i++) {
+ tdr_push_hbin_block(push, regf->hbins[i]);
+ }
+
+ file_save(location, push->data.data, push->data.length);
+
+ return WERR_OK;
+}
+
static WERROR nt_open_hive (struct registry_hive *h, struct registry_key **key)
{
struct regf_data *regf;
@@ -676,6 +704,8 @@ static struct hive_operations reg_backend_nt4 = {
.get_value_by_index = regf_get_value,
.key_get_sec_desc = regf_get_sec_desc,
.add_key = regf_add_key,
+ .set_value = regf_set_value,
+ .save_hive = regf_save,
};
NTSTATUS registry_nt4_init(void)
diff --git a/source4/lib/registry/registry.h b/source4/lib/registry/registry.h
new file mode 100644
index 0000000000..f9e8a7698c
--- /dev/null
+++ b/source4/lib/registry/registry.h
@@ -0,0 +1,136 @@
+/*
+ Unix SMB/CIFS implementation.
+ Registry interface
+ Copyright (C) Gerald Carter 2002.
+ Copyright (C) Jelmer Vernooij 2003-2004.
+
+ 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 2 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_H /* _REGISTRY_H */
+#define _REGISTRY_H
+
+/* Handles for the predefined keys */
+#define HKEY_CLASSES_ROOT 0x80000000
+#define HKEY_CURRENT_USER 0x80000001
+#define HKEY_LOCAL_MACHINE 0x80000002
+#define HKEY_USERS 0x80000003
+#define HKEY_PERFORMANCE_DATA 0x80000004
+#define HKEY_CURRENT_CONFIG 0x80000005
+#define HKEY_DYN_DATA 0x80000006
+#define HKEY_PERFORMANCE_TEXT 0x80000050
+#define HKEY_PERFORMANCE_NLSTEXT 0x80000060
+
+#define REG_DELETE -1
+
+/*
+ * The general idea here is that every backend provides a 'hive'. Combining
+ * various hives gives you a complete registry like windows has
+ */
+
+#define REGISTRY_INTERFACE_VERSION 1
+
+/* structure to store the registry handles */
+struct registry_key {
+ char *name; /* Name of the key */
+ const char *path; /* Full path to the key */
+ char *class_name; /* Name of key class */
+ NTTIME last_mod; /* Time last modified */
+ struct registry_hive *hive;
+ void *backend_data;
+};
+
+struct registry_value {
+ char *name;
+ unsigned int data_type;
+ DATA_BLOB data;
+};
+
+/* FIXME */
+typedef void (*key_notification_function) (void);
+typedef void (*value_notification_function) (void);
+
+/*
+ * Container for function pointers to enumeration routines
+ * for virtual registry view
+ *
+ * Backends can provide :
+ * - just one hive (example: nt4, w95)
+ * - several hives (example: rpc).
+ *
+ * Backends should always do case-insensitive compares
+ * (everything is case-insensitive but case-preserving,
+ * just like the FS)
+ */
+
+struct hive_operations {
+ const char *name;
+
+ /* Implement this one */
+ WERROR (*open_hive) (struct registry_hive *, struct registry_key **);
+ WERROR (*save_hive) (struct registry_hive *, const char *location);
+
+ /* Or this one */
+ WERROR (*open_key) (TALLOC_CTX *, struct registry_key *, const char *name, struct registry_key **);
+
+ WERROR (*num_subkeys) (struct registry_key *, uint32_t *count);
+ WERROR (*num_values) (struct registry_key *, uint32_t *count);
+ WERROR (*get_subkey_by_index) (TALLOC_CTX *, struct registry_key *, int idx, struct registry_key **);
+
+ /* Can not contain more then one level */
+ WERROR (*get_subkey_by_name) (TALLOC_CTX *, struct registry_key *, const char *name, struct registry_key **);
+ WERROR (*get_value_by_index) (TALLOC_CTX *, struct registry_key *, int idx, struct registry_value **);
+
+ /* Can not contain more then one level */
+ WERROR (*get_value_by_name) (TALLOC_CTX *, struct registry_key *, const char *name, struct registry_value **);
+
+ /* Security control */
+ WERROR (*key_get_sec_desc) (TALLOC_CTX *, struct registry_key *, struct security_descriptor **);
+ WERROR (*key_set_sec_desc) (struct registry_key *, struct security_descriptor *);
+
+ /* Notification */
+ WERROR (*request_key_change_notify) (struct registry_key *, key_notification_function);
+ WERROR (*request_value_change_notify) (struct registry_value *, value_notification_function);
+
+ /* Key management */
+ WERROR (*add_key)(TALLOC_CTX *, struct registry_key *, const char *name, uint32_t access_mask, struct security_descriptor *, struct registry_key **);
+ WERROR (*del_key)(struct registry_key *, const char *name);
+ WERROR (*flush_key) (struct registry_key *);
+
+ /* Value management */
+ WERROR (*set_value)(struct registry_key *, const char *name, uint32_t type, DATA_BLOB data);
+ WERROR (*del_value)(struct registry_key *, const char *valname);
+};
+
+struct registry_hive {
+ const struct hive_operations *functions;
+ struct registry_key *root;
+ void *backend_data;
+ const char *location;
+};
+
+/* Handle to a full registry
+ * contains zero or more hives */
+struct registry_context {
+ void *backend_data;
+ WERROR (*get_predefined_key) (struct registry_context *, uint32_t hkey, struct registry_key **);
+};
+
+struct reg_init_function_entry {
+ const struct hive_operations *hive_functions;
+ struct reg_init_function_entry *prev, *next;
+};
+
+#endif /* _REGISTRY_H */
diff --git a/source4/lib/registry/tools/regdiff.c b/source4/lib/registry/tools/regdiff.c
index 307ec3793e..3d8201330e 100644
--- a/source4/lib/registry/tools/regdiff.c
+++ b/source4/lib/registry/tools/regdiff.c
@@ -21,7 +21,7 @@
#include "includes.h"
#include "dynconfig.h"
-#include "registry.h"
+#include "lib/registry/registry.h"
#include "lib/cmdline/popt_common.h"
static void writediff(struct registry_key *oldkey, struct registry_key *newkey, FILE *out)
diff --git a/source4/lib/registry/tools/regpatch.c b/source4/lib/registry/tools/regpatch.c
index 5f7d4376d4..887f53df37 100644
--- a/source4/lib/registry/tools/regpatch.c
+++ b/source4/lib/registry/tools/regpatch.c
@@ -22,7 +22,7 @@
#include "includes.h"
#include "dynconfig.h"
-#include "registry.h"
+#include "lib/registry/registry.h"
#include "lib/cmdline/popt_common.h"
#include "system/filesys.h"
#include "librpc/gen_ndr/winreg.h"
diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c
index 496b9dc7e5..08da5ae2fd 100644
--- a/source4/lib/registry/tools/regshell.c
+++ b/source4/lib/registry/tools/regshell.c
@@ -21,9 +21,10 @@
#include "includes.h"
#include "dynconfig.h"
-#include "registry.h"
+#include "lib/registry/registry.h"
#include "lib/cmdline/popt_common.h"
#include "system/time.h"
+#include "librpc/gen_ndr/ndr_security.h"
/*
* ck/cd - change key
@@ -33,19 +34,30 @@
* mkkey/mkdir - make key
* ch - change hive
* info - show key info
+ * save - save hive
* help
* exit
*/
static struct registry_key *cmd_info(TALLOC_CTX *mem_ctx, struct registry_context *ctx,struct registry_key *cur, int argc, char **argv)
{
+ struct security_descriptor *sec_desc = NULL;
time_t last_mod;
+ WERROR error;
+
printf("Name: %s\n", cur->name);
printf("Full path: %s\n", cur->path);
printf("Key Class: %s\n", cur->class_name);
last_mod = nt_time_to_unix(cur->last_mod);
printf("Time Last Modified: %s\n", ctime(&last_mod));
- /* FIXME: Security info */
+
+ error = reg_get_sec_desc(mem_ctx, cur, &sec_desc);
+ if (!W_ERROR_IS_OK(error)) {
+ printf("Error getting security descriptor\n");
+ } else {
+ ndr_print_debug((ndr_print_fn_t)ndr_print_security_descriptor, "Security", sec_desc);
+ }
+ talloc_free(sec_desc);
return cur;
}
diff --git a/source4/lib/registry/tools/regtree.c b/source4/lib/registry/tools/regtree.c
index 38dffed85d..c24e66412f 100644
--- a/source4/lib/registry/tools/regtree.c
+++ b/source4/lib/registry/tools/regtree.c
@@ -21,7 +21,7 @@
#include "includes.h"
#include "dynconfig.h"
-#include "registry.h"
+#include "lib/registry/registry.h"
#include "lib/cmdline/popt_common.h"
static void print_tree(int l, struct registry_key *p, int fullpath, int novals)