summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2004-05-31 17:14:27 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:56:22 -0500
commit9fba08b621432861b52d5af0b7d994ba0e0100f0 (patch)
tree01c025a1437d90d1cdaaced25daed9fdbe51d8be /source4/lib
parent50b21753ba816ef23ddaf59dcbf698869e22d986 (diff)
downloadsamba-9fba08b621432861b52d5af0b7d994ba0e0100f0.tar.gz
samba-9fba08b621432861b52d5af0b7d994ba0e0100f0.tar.bz2
samba-9fba08b621432861b52d5af0b7d994ba0e0100f0.zip
r955: Update debian package rules... builds now
(This used to be commit 3df8ff6cf111c6601554bffb411506bd43f726c7)
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/module.c4
-rw-r--r--source4/lib/registry/TODO3
-rw-r--r--source4/lib/registry/common/reg_interface.c8
-rw-r--r--source4/lib/registry/config.m42
-rw-r--r--source4/lib/registry/reg_backend_ldb/reg_backend_ldb.c8
5 files changed, 18 insertions, 7 deletions
diff --git a/source4/lib/module.c b/source4/lib/module.c
index 15f92db59e..f03e19d924 100644
--- a/source4/lib/module.c
+++ b/source4/lib/module.c
@@ -2,7 +2,7 @@
Unix SMB/CIFS implementation.
module loading system
- Copyright (C) Jelmer Vernooij 2002-2003
+ Copyright (C) Jelmer Vernooij 2002-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
@@ -133,7 +133,7 @@ NTSTATUS register_subsystem(const char *name, register_backend_function callback
while(t) {
if(!strcmp(name, t->name)) {
/* its already registered! */
- DEBUG(0,("SUBSYSTEM '%s' for type already registered\n", name));
+ DEBUG(0,("Subsystem '%s' already registered\n", name));
return NT_STATUS_OBJECT_NAME_COLLISION;
}
t = t->next;
diff --git a/source4/lib/registry/TODO b/source4/lib/registry/TODO
index 9b0dbe4c71..695f786b69 100644
--- a/source4/lib/registry/TODO
+++ b/source4/lib/registry/TODO
@@ -24,6 +24,9 @@ reg_backend_wine.c:
regshell:
- support for security descriptors
+
+ regdiff:
+ - fix
gregedit.c:
- support for editing values / adding values / deleting values
diff --git a/source4/lib/registry/common/reg_interface.c b/source4/lib/registry/common/reg_interface.c
index 6d305e61bf..6ad7ee69cb 100644
--- a/source4/lib/registry/common/reg_interface.c
+++ b/source4/lib/registry/common/reg_interface.c
@@ -64,8 +64,12 @@ static struct reg_init_function_entry *reg_find_backend_entry(const char *name)
if(reg_first_init) {
status = register_subsystem("registry", registry_register);
- if (!NT_STATUS_IS_OK(status))
+ if (NT_STATUS_IS_ERR(status)) {
+ DEBUG(0, ("Error registering registry subsystem: %s\n", nt_errstr(status)));
+ /* Don't try the initialisation again */
+ reg_first_init = False;
return NULL;
+ }
static_init_registry;
reg_first_init = False;
@@ -83,7 +87,7 @@ static struct reg_init_function_entry *reg_find_backend_entry(const char *name)
BOOL reg_has_backend(const char *backend)
{
- return reg_find_backend_entry(backend)?True:False;
+ return reg_find_backend_entry(backend) != NULL?True:False;
}
/* Open a registry file/host/etc */
diff --git a/source4/lib/registry/config.m4 b/source4/lib/registry/config.m4
index 331b9c2df1..a1dc9a45bc 100644
--- a/source4/lib/registry/config.m4
+++ b/source4/lib/registry/config.m4
@@ -27,7 +27,7 @@ SMB_MODULE_MK(registry_w95, REGISTRY, STATIC, lib/registry/config.mk)
SMB_MODULE_MK(registry_dir, REGISTRY, STATIC, lib/registry/config.mk)
SMB_MODULE_MK(registry_rpc, REGISTRY, STATIC, lib/registry/config.mk)
SMB_MODULE_MK(registry_gconf, REGISTRY, STATIC, lib/registry/config.mk)
-SMB_MODULE_MK(registry_ldb, REGISTRY, NOT, lib/registry/config.mk)
+SMB_MODULE_MK(registry_ldb, REGISTRY, STATIC, lib/registry/config.mk)
SMB_SUBSYSTEM_MK(REGISTRY,lib/registry/config.mk)
diff --git a/source4/lib/registry/reg_backend_ldb/reg_backend_ldb.c b/source4/lib/registry/reg_backend_ldb/reg_backend_ldb.c
index 498dc6991b..7b574069e9 100644
--- a/source4/lib/registry/reg_backend_ldb/reg_backend_ldb.c
+++ b/source4/lib/registry/reg_backend_ldb/reg_backend_ldb.c
@@ -39,6 +39,7 @@ static char *reg_path_to_ldb(TALLOC_CTX *mem_ctx, const char *path)
}
ret[strlen(ret)-1] = ')';
+ printf("Doing search for : %s\n", ret);
return ret;
}
@@ -85,9 +86,12 @@ static WERROR ldb_fetch_subkeys(REG_KEY *k, int *count, REG_KEY ***subkeys)
return WERR_OK;
}
+static WERROR ldb_get_hive(REG_HANDLE *h, int num, REG_KEY **key)
+{
+ /* FIXME */
+}
-
-static WERROR ldb_open_key(REG_HANDLE *h, const char *name, REG_KEY **key)
+static WERROR ldb_open_key(REG_HANDLE *h, int num, const char *name, REG_KEY **key)
{
struct ldb_context *c = h->backend_data;
char *path;