Rev 11336: Merge more upstream fixes. in file:///home/jelmer/bzr.samba/4.0-debian/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 11336
revision-id: jelmer at samba.org-20070313220806-dy2c6heftmkku0tt
parent: jelmer at samba.org-20070313215137-pson6l45px6pza3m
parent: svn-v2:21834 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 4.0-debian
timestamp: Tue 2007-03-13 23:08:06 +0100
message:
  Merge more upstream fixes.
modified:
  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
    ------------------------------------------------------------
    revno: 11321.1.416
    merged: svn-v2:21834 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    parent: svn-v2:21833 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    parent: jelmer at samba.org-20070313220203-uwjbux2sufas9eo9
    committer: jelmer
    timestamp: Tue 2007-03-13 22:03:04 +0000
    message:
      Remove unnecessary includes
    ------------------------------------------------------------
    revno: 11321.1.415.1.1
    merged: jelmer at samba.org-20070313220203-uwjbux2sufas9eo9
    parent: svn-v2:21833 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: SAMBA_4_0
    timestamp: Tue 2007-03-13 23:02:03 +0100
    message:
      Remove unnecessary includes
=== modified file 'source/lib/registry/tools/regdiff.c'
--- a/source/lib/registry/tools/regdiff.c	2006-09-16 16:59:37 +0000
+++ b/source/lib/registry/tools/regdiff.c	2007-03-13 22:03:04 +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"
 
 int main(int argc, char **argv)

=== modified file 'source/lib/registry/tools/regpatch.c'
--- a/source/lib/registry/tools/regpatch.c	2006-09-16 16:59:37 +0000
+++ b/source/lib/registry/tools/regpatch.c	2007-03-13 22:03:04 +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	2006-09-16 16:59:37 +0000
+++ b/source/lib/registry/tools/regshell.c	2007-03-13 22:03:04 +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	2006-09-16 16:59:37 +0000
+++ b/source/lib/registry/tools/regtree.c	2007-03-13 22:03:04 +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)