Rev 11170: Fix more build issues. in file:///home/jelmer/bzr.samba/4.0-regwrite/

[Jelmer Vernooij]

At file:///home/jelmer/bzr.samba/4.0-regwrite/

------------------------------------------------------------
revno: 11170
revision-id: jelmer at samba.org-20070212235354-htyicol9aj4sbk5l
parent: jelmer at samba.org-20070212210746-y5062ss2jjup80c0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 4.0-regwrite
timestamp: Tue 2007-02-13 00:53:54 +0100
message:
  Fix more build issues.
removed:
  source/gtk/                    svn-v2:1432 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fgtk
  source/gtk/tools/              svn-v2:1432 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fgtk%2ftools
modified:
  source/lib/registry/dir.c      svn-v2:4132 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fregistry%2freg_backend_dir.c
  source/lib/registry/regf.c     svn-v2:4132 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fregistry%2freg_backend_nt4.c
  source/lib/registry/rpc.c      svn-v2:4132 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fregistry%2freg_backend_rpc.c
  source/lib/registry/tests/generic.c svn-v2:10594 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2ftorture%2flocal%2fregistry.c
  source/lib/registry/tools/regdiff.c svn-v2:20 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fregistry%2ftools%2fregdiff.c
  source/lib/registry/tools/regpatch.c svn-v2:20 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fregistry%2ftools%2fregpatch.c
  source/lib/registry/tools/regshell.c svn-v2:20 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fregistry%2ftools%2fregshell.c
  source/lib/registry/tools/regtree.c svn-v2:20 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fregistry%2ftools%2fregtree.c
=== removed directory 'source/gtk'
=== removed directory 'source/gtk/tools'
=== modified file 'source/lib/registry/dir.c'
--- a/source/lib/registry/dir.c	2007-02-10 15:02:22 +0000
+++ b/source/lib/registry/dir.c	2007-02-12 23:53:54 +0000
@@ -123,7 +123,7 @@
 {
 	if(!location) return WERR_INVALID_PARAM;
 
-	*key = talloc(h, struct registry_key);
+	*key = talloc(parent_ctx, struct registry_key);
 	(*key)->backend_data = talloc_strdup(*key, location);
 	return WERR_OK;
 }

=== modified file 'source/lib/registry/regf.c'
--- a/source/lib/registry/regf.c	2007-02-08 17:18:35 +0000
+++ b/source/lib/registry/regf.c	2007-02-12 23:53:54 +0000
@@ -1692,7 +1692,7 @@
 	return WERR_OK;
 }
 
-static struct hive_operations reg_backend_regf = {
+static struct reg_key_operations reg_backend_regf = {
 	.name = "regf",
 	.num_subkeys = regf_num_subkeys,
 	.num_values = regf_num_values,

=== modified file 'source/lib/registry/rpc.c'
--- a/source/lib/registry/rpc.c	2007-02-10 15:02:22 +0000
+++ b/source/lib/registry/rpc.c	2007-02-12 23:53:54 +0000
@@ -21,7 +21,7 @@
 #include "registry.h"
 #include "librpc/gen_ndr/ndr_winreg_c.h"
 
-static struct hive_operations reg_backend_rpc;
+static struct reg_key_operations reg_backend_rpc;
 
 /**
  * This is the RPC backend for the registry library.

=== modified file 'source/lib/registry/tests/generic.c'
--- a/source/lib/registry/tests/generic.c	2007-02-12 21:00:15 +0000
+++ b/source/lib/registry/tests/generic.c	2007-02-12 23:53:54 +0000
@@ -46,11 +46,6 @@
 	const struct test_backend_settings *backend = test_data;
 	TALLOC_CTX *mem_ctx = tctx;
 
-	if (!reg_has_backend(backend->name)) {
-		torture_skip(tctx, talloc_asprintf(tctx, 
-						"Backend '%s' support not compiled in", backend->name));
-	}
-
 	error = reg_open_hive(mem_ctx, backend->name, 
 						  backend->location, NULL, cmdline_credentials, &root);
 	torture_assert_werr_ok(tctx, error, "reg_open_hive()");

=== modified file 'source/lib/registry/tools/regdiff.c'
--- a/source/lib/registry/tools/regdiff.c	2007-02-12 21:00:15 +0000
+++ b/source/lib/registry/tools/regdiff.c	2007-02-12 23:53:54 +0000
@@ -23,7 +23,6 @@
 #include "includes.h"
 #include "lib/registry/registry.h"
 #include "lib/events/events.h"
-#include "lib/registry/reg_backend_rpc.h"
 #include "lib/cmdline/popt_common.h"
 
 int main(int argc, const char **argv)

=== modified file 'source/lib/registry/tools/regpatch.c'
--- a/source/lib/registry/tools/regpatch.c	2007-02-12 21:00:15 +0000
+++ b/source/lib/registry/tools/regpatch.c	2007-02-12 23:53:54 +0000
@@ -23,7 +23,6 @@
 #include "lib/events/events.h"
 #include "lib/registry/registry.h"
 #include "lib/cmdline/popt_common.h"
-#include "lib/registry/reg_backend_rpc.h"
 
 int main(int argc, char **argv)
 {

=== modified file 'source/lib/registry/tools/regshell.c'
--- a/source/lib/registry/tools/regshell.c	2007-02-12 21:00:15 +0000
+++ b/source/lib/registry/tools/regshell.c	2007-02-12 23:53:54 +0000
@@ -23,7 +23,6 @@
 #include "lib/registry/registry.h"
 #include "lib/cmdline/popt_common.h"
 #include "lib/events/events.h"
-#include "lib/registry/reg_backend_rpc.h"
 #include "system/time.h"
 #include "lib/smbreadline/smbreadline.h"
 #include "librpc/gen_ndr/ndr_security.h"

=== modified file 'source/lib/registry/tools/regtree.c'
--- a/source/lib/registry/tools/regtree.c	2007-02-12 21:00:15 +0000
+++ b/source/lib/registry/tools/regtree.c	2007-02-12 23:53:54 +0000
@@ -22,7 +22,6 @@
 #include "includes.h"
 #include "lib/registry/registry.h"
 #include "lib/events/events.h"
-#include "lib/registry/reg_backend_rpc.h"
 #include "lib/cmdline/popt_common.h"
 
 static void print_tree(int l, struct registry_key *p, int fullpath, int novals)