r3464: split out registry.h, rap.h and ldap_server.h

(This used to be commit 70d2090f6bf2c7e0caf1e9c020f330de88871f8e)

diff --git a/source4/gtk/tools/gregedit.c b/source4/gtk/tools/gregedit.c
index c2ae0438925bbac467deb4bffef626ff2599dc91..10d9a127c44e7515e1119ec6ae379abb281935e3 100644 (file)
--- a/source4/gtk/tools/gregedit.c
+++ b/source4/gtk/tools/gregedit.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "registry.h"
 #include "lib/cmdline/popt_common.h"
 #include "gtk/common/select.h"
 #include "gtk/common/gtk-smb.h"

diff --git a/source4/include/includes.h b/source4/include/includes.h
index 0721ef4879f25535f5ec0e1aee6a6dc353a46066..86222679e48a8b99e722e53acaf1a588e0bdeb49 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -225,9 +225,6 @@ extern int errno;
 #include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 #include "cli_context.h"
-#include "registry.h"
-#include "rap.h"
-#include "ldap_server/ldap_server.h"
 
 #include "libnet/libnet.h"
 #include "utils/net/net.h"

diff --git a/source4/include/structs.h b/source4/include/structs.h
index 4820551b259493b37d4fdf29fc3d6034de76ede7..c6b81259390f7f155500a718a720d1f5b347362d 100644 (file)
--- a/source4/include/structs.h
+++ b/source4/include/structs.h
@@ -68,3 +68,12 @@ typedef NTSTATUS (*gensec_password_callback)(struct gensec_security *gensec_secu
 
 struct asn1_data;
 
+struct ldapsrv_call;
+struct ldapsrv_connection;
+struct rw_buffer;
+struct registry_context;
+struct registry_key;
+struct registry_value;
+
+struct rap_NetShareEnum;
+struct rap_NetServerEnum2;

diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c
index c4d44888c4f04b3623d22f0c082f8e3d5c5b28d1..8a26c3fd8f16408446110e708062172aa51ddcfe 100644 (file)
--- a/source4/ldap_server/ldap_backend.c
+++ b/source4/ldap_server/ldap_backend.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "ldap_server/ldap_server.h"
 #include "dlinklist.h"
 
 

diff --git a/source4/ldap_server/ldap_bind.c b/source4/ldap_server/ldap_bind.c
index 840ff5d4e8abe7d6fd956353118cd8471d0e1b03..b87919628fac10e287f42ab2feb22b77fc446201 100644 (file)
--- a/source4/ldap_server/ldap_bind.c
+++ b/source4/ldap_server/ldap_bind.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "ldap_server/ldap_server.h"
 
 
 static NTSTATUS ldapsrv_BindSimple(struct ldapsrv_call *call)

diff --git a/source4/ldap_server/ldap_rootdse.c b/source4/ldap_server/ldap_rootdse.c
index 4bbbdad71f45ce0ee095d038be1f17f6a89651f3..db8be0546783d645ec85180556f8fbaa408eee3d 100644 (file)
--- a/source4/ldap_server/ldap_rootdse.c
+++ b/source4/ldap_server/ldap_rootdse.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "ldap_server/ldap_server.h"
 #include "system/time.h"
 
 #define ATTR_BLOB_CONST(val) data_blob_talloc(mem_ctx, val, sizeof(val)-1)

diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index 0ef3a523e8d8afc8a128440d21ca030f32cab8bf..c9812d1d2ff23691ef905af720292acdcf5e1582 100644 (file)
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -23,6 +23,7 @@
 #include "auth/auth.h"
 #include "dlinklist.h"
 #include "asn_1.h"
+#include "ldap_server/ldap_server.h"
 
 /*
   close the socket and shutdown a server_context

diff --git a/source4/ldap_server/ldap_simple_ldb.c b/source4/ldap_server/ldap_simple_ldb.c
index e368d4bd5296ec63435d6fa59b3a97e17d11d028..8f40636a5c3e8120f9bc4ef7050e8ac5e9fbba3d 100644 (file)
--- a/source4/ldap_server/ldap_simple_ldb.c
+++ b/source4/ldap_server/ldap_simple_ldb.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "ldap_server/ldap_server.h"
 #include "ldap_parse.h"
 
 /* TODO: samdb_context is not a pulblic struct */

diff --git a/source4/lib/registry/common/reg_interface.c b/source4/lib/registry/common/reg_interface.c
index 76a1d04b086893e7aeed05bfd3459d92abcff289..b2d659258dae7f20d289517e2d6bca3c70fc506e 100644 (file)
--- a/source4/lib/registry/common/reg_interface.c
+++ b/source4/lib/registry/common/reg_interface.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "dlinklist.h"
+#include "registry.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

diff --git a/source4/lib/registry/common/reg_util.c b/source4/lib/registry/common/reg_util.c
index c7354fe9092ac98999edeaf2656fb62c21f5a07f..052ccc347be46a576cff3470d1c8b1b07d2702e2 100644 (file)
--- a/source4/lib/registry/common/reg_util.c
+++ b/source4/lib/registry/common/reg_util.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "registry.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

diff --git a/source4/lib/registry/reg_backend_dir/reg_backend_dir.c b/source4/lib/registry/reg_backend_dir/reg_backend_dir.c
index 2273a867712fd0fc183feba8436289bf2ab42dc2..247d7232526eb8b64df82cd4fb1041492a127a5e 100644 (file)
--- a/source4/lib/registry/reg_backend_dir/reg_backend_dir.c
+++ b/source4/lib/registry/reg_backend_dir/reg_backend_dir.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "registry.h"
 #include "system/dir.h"
 
 static WERROR reg_dir_add_key(TALLOC_CTX *mem_ctx, struct registry_key *parent, const char *name, uint32_t access_mask, SEC_DESC *desc, struct registry_key **result)

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 bd3afbdedf2e197be55846f40202807dd56c3ce6..22c81018c741f1daf883612e64d1189b7572b68b 100644 (file)
--- a/source4/lib/registry/reg_backend_ldb/reg_backend_ldb.c
+++ b/source4/lib/registry/reg_backend_ldb/reg_backend_ldb.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "registry.h"
 
 static char *reg_path_to_ldb(TALLOC_CTX *mem_ctx, const char *path, const char *add)
 {

diff --git a/source4/lib/registry/reg_backend_nt4/reg_backend_nt4.c b/source4/lib/registry/reg_backend_nt4/reg_backend_nt4.c
index a8d175207027d2d2716ff7c9ef7f787195577c61..c1b9b43445bd4e1fcf7839368af1789b6dc2efac 100644 (file)
--- a/source4/lib/registry/reg_backend_nt4/reg_backend_nt4.c
+++ b/source4/lib/registry/reg_backend_nt4/reg_backend_nt4.c
@@ -304,6 +304,7 @@ Hope this helps....  (Although it was "fun" for me to uncover this things,
 *************************************************************************/
 
 #include "includes.h"
+#include "registry.h"
 #include "system/shmem.h"
 
 #define REG_KEY_LIST_SIZE 10

diff --git a/source4/lib/registry/reg_backend_rpc/reg_backend_rpc.c b/source4/lib/registry/reg_backend_rpc/reg_backend_rpc.c
index f90b123bfc5681defb85b14c2fea29767362f915..954e7684bbe9cf70d9114f7d62805355928869b2 100644 (file)
--- a/source4/lib/registry/reg_backend_rpc/reg_backend_rpc.c
+++ b/source4/lib/registry/reg_backend_rpc/reg_backend_rpc.c
@@ -18,6 +18,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
  
 #include "includes.h"
+#include "registry.h"
 #include "librpc/gen_ndr/ndr_winreg.h"
 
 /**

diff --git a/source4/lib/registry/reg_backend_w95/reg_backend_w95.c b/source4/lib/registry/reg_backend_w95/reg_backend_w95.c
index 448af66eec8ac24ae7263bf7cb5d42faa42cef6b..72ec882b8a65ca933b057a6c16256042cb9b2266 100644 (file)
--- a/source4/lib/registry/reg_backend_w95/reg_backend_w95.c
+++ b/source4/lib/registry/reg_backend_w95/reg_backend_w95.c
@@ -20,6 +20,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "includes.h"
+#include "registry.h"
 #include "system/shmem.h"
 
 /**

diff --git a/source4/lib/registry/tools/regdiff.c b/source4/lib/registry/tools/regdiff.c
index 1d69734f218424dd61740f9233e232db24b47e4a..c1b8d2949ed8ed7b59511729b4f1b1b8f632f287 100644 (file)
--- a/source4/lib/registry/tools/regdiff.c
+++ b/source4/lib/registry/tools/regdiff.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "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 298a922fbfdca7b2b75aae2260bbe602a5dbca42..ae4d331e3c9562b374098cfddf8f525e06b9bcf7 100644 (file)
--- a/source4/lib/registry/tools/regpatch.c
+++ b/source4/lib/registry/tools/regpatch.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "registry.h"
 #include "lib/cmdline/popt_common.h"
 
 /*

diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c
index fcc72044231f60794db9510cec70e7990db35ed7..583624fbab6171830225d4a94883a3e9d863aa30 100644 (file)
--- a/source4/lib/registry/tools/regshell.c
+++ b/source4/lib/registry/tools/regshell.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "registry.h"
 #include "lib/cmdline/popt_common.h"
 #include "system/time.h"
 

diff --git a/source4/lib/registry/tools/regtree.c b/source4/lib/registry/tools/regtree.c
index 64948b06fea557736b3fabab14d46099eeb36199..8fd73aef85b1de23505f4ae24b0076283762b6fa 100644 (file)
--- a/source4/lib/registry/tools/regtree.c
+++ b/source4/lib/registry/tools/regtree.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "registry.h"
 #include "lib/cmdline/popt_common.h"
 
 static void print_tree(int l, struct registry_key *p, int fullpath, int novals)

diff --git a/source4/ntvfs/ipc/ipc_rap.c b/source4/ntvfs/ipc/ipc_rap.c
index 840c389d6cf1a54a5e521ba35de26bde9edfac4f..4fc5e182cab780d78c9a3ebcff05a634530f2d63 100644 (file)
--- a/source4/ntvfs/ipc/ipc_rap.c
+++ b/source4/ntvfs/ipc/ipc_rap.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "rap.h"
 
 #define NERR_Success 0
 #define NERR_badpass 86

diff --git a/source4/ntvfs/ipc/rap_server.c b/source4/ntvfs/ipc/rap_server.c
index b414b40d7ec88414980ce4d6f05c1be98bacfdc7..70b65442ff63e08d20d196e835f58abb15792629 100644 (file)
--- a/source4/ntvfs/ipc/rap_server.c
+++ b/source4/ntvfs/ipc/rap_server.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "rap.h"
 
 /* At this moment these are just dummy functions, but you might get the
  * idea. */

diff --git a/source4/rpc_server/winreg/rpc_winreg.c b/source4/rpc_server/winreg/rpc_winreg.c
index 39e5fe7ee5b8b6b087cad913ddf449a5fd0e9d8b..c0242f8072b90e6767790375331af20fbc4cbd00 100644 (file)
--- a/source4/rpc_server/winreg/rpc_winreg.c
+++ b/source4/rpc_server/winreg/rpc_winreg.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "registry.h"
 #include "librpc/gen_ndr/ndr_winreg.h"
 #include "rpc_server/common/common.h"
 

diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index 1ae92a603487d7a32b738079b174afb6cf78bcac..d7cbd9f750f1e0598eb18a41fa8aca65069d98f5 100644 (file)
--- a/source4/torture/rap/rap.c
+++ b/source4/torture/rap/rap.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "rap.h"
 
 struct rap_call {
        TALLOC_CTX *mem_ctx;