r5307: removed db_wrap.h from includes.h

diff --git a/source/dsdb/samdb/samdb.c b/source/dsdb/samdb/samdb.c
index 1af80c12bdd0c1a58302784b6286294d39214616..9c05e26f220fbe8804a1b2ca396f8737ce3efeb6 100644 (file)
--- a/source/dsdb/samdb/samdb.c
+++ b/source/dsdb/samdb/samdb.c
@@ -25,6 +25,7 @@
 #include "lib/ldb/include/ldb.h"
 #include "system/time.h"
 #include "system/filesys.h"
 #include "lib/ldb/include/ldb.h"
 #include "system/time.h"
 #include "system/filesys.h"

+#include "db_wrap.h"

 
 /*
   connect to the SAM database
 
 /*
   connect to the SAM database

diff --git a/source/include/includes.h b/source/include/includes.h
index 338710239367d2241161aca7f7febfea78039414..32a1946e51f77593631a739d1a9672dd458c4da6 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -113,7 +113,6 @@ extern int errno;
 #include "lib/talloc/talloc.h"
 #include "nt_status.h"
 #include "structs.h"
 #include "lib/talloc/talloc.h"
 #include "nt_status.h"
 #include "structs.h"

-#include "db_wrap.h"

 #include "trans2.h"
 #include "nterr.h"
 #include "charset.h"
 #include "trans2.h"
 #include "nterr.h"
 #include "charset.h"

diff --git a/source/include/structs.h b/source/include/structs.h
index 034ad20b64f70d1255fbfb31f40bf3f58d69b998..bccbe36efb8b0e5a9093aeb4a9f5737b44703789 100644 (file)
--- a/source/include/structs.h
+++ b/source/include/structs.h
@@ -136,6 +136,7 @@ struct netr_LMSessionKey;
 
 struct ldb_val;
 struct ldb_message;
 
 struct ldb_val;
 struct ldb_message;

+struct ldb_context;

 
 struct dom_sid;
 struct security_token;
 
 struct dom_sid;
 struct security_token;

diff --git a/source/ldap_server/ldap_hacked_ldb.c b/source/ldap_server/ldap_hacked_ldb.c
index cb0ca50ca3e1986811847d4a79cf539adf2458ee..419a00c45898888b32da1ff03dc4f1ada51f7489 100644 (file)
--- a/source/ldap_server/ldap_hacked_ldb.c
+++ b/source/ldap_server/ldap_hacked_ldb.c
@@ -27,6 +27,7 @@
 #include "ldap_parse.h"
 #include "lib/ldb/include/ldb.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "ldap_parse.h"
 #include "lib/ldb/include/ldb.h"
 #include "librpc/gen_ndr/ndr_security.h"

+#include "db_wrap.h"

 
 
 #define VALID_DN_SYNTAX(dn,i) do {\
 
 
 #define VALID_DN_SYNTAX(dn,i) do {\

diff --git a/source/ldap_server/ldap_simple_ldb.c b/source/ldap_server/ldap_simple_ldb.c
index 41431e091b3522f67643d583867364a9b81665fa..7fd86269cc2a852e37c41e37e97403289ae36d1f 100644 (file)
--- a/source/ldap_server/ldap_simple_ldb.c
+++ b/source/ldap_server/ldap_simple_ldb.c
@@ -23,6 +23,7 @@
 #include "ldap_server/ldap_server.h"
 #include "ldap_parse.h"
 #include "lib/ldb/include/ldb.h"
 #include "ldap_server/ldap_server.h"
 #include "ldap_parse.h"
 #include "lib/ldb/include/ldb.h"

+#include "db_wrap.h"

 
 #define VALID_DN_SYNTAX(dn,i) do {\
        if (!(dn)) {\
 
 #define VALID_DN_SYNTAX(dn,i) do {\
        if (!(dn)) {\

diff --git a/source/lib/db_wrap.c b/source/lib/db_wrap.c
index 60281593774f5d9393108bd577e25d38bbd08389..0ec1e378e60b5243f3a04dc385c2b2ba16880088 100644 (file)
--- a/source/lib/db_wrap.c
+++ b/source/lib/db_wrap.c
@@ -31,6 +31,7 @@
 #include "dlinklist.h"
 #include "lib/tdb/include/tdb.h"
 #include "lib/ldb/include/ldb.h"
 #include "dlinklist.h"
 #include "lib/tdb/include/tdb.h"
 #include "lib/ldb/include/ldb.h"

+#include "db_wrap.h"

 
 static struct ldb_wrap *ldb_list;
 static struct tdb_wrap *tdb_list;
 
 static struct ldb_wrap *ldb_list;
 static struct tdb_wrap *tdb_list;

diff --git a/source/lib/gencache.c b/source/lib/gencache.c
index 1a6159942d84e47ed6ce152c2d11f10921d28913..b6d62977ad12fa194bd96d8cdfff28476fbc3c5f 100644 (file)
--- a/source/lib/gencache.c
+++ b/source/lib/gencache.c
@@ -25,6 +25,7 @@
 #include "lib/tdb/include/tdbutil.h"
 #include "system/time.h"
 #include "system/filesys.h"
 #include "lib/tdb/include/tdbutil.h"
 #include "system/time.h"
 #include "system/filesys.h"

+#include "db_wrap.h"

 
 #undef  DBGC_CLASS
 #define DBGC_CLASS DBGC_TDB
 
 #undef  DBGC_CLASS
 #define DBGC_CLASS DBGC_TDB

diff --git a/source/lib/registry/reg_backend_ldb.c b/source/lib/registry/reg_backend_ldb.c
index c7b7bf587f59b5a9f5075b83c73f671de7663ea6..9f44f92888b56dbead0e358fbdf2a0608faca358 100644 (file)
--- a/source/lib/registry/reg_backend_ldb.c
+++ b/source/lib/registry/reg_backend_ldb.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "registry.h"
 #include "lib/ldb/include/ldb.h"
 #include "includes.h"
 #include "registry.h"
 #include "lib/ldb/include/ldb.h"

+#include "db_wrap.h"

 
 struct ldb_key_data 
 {
 
 struct ldb_key_data 
 {

diff --git a/source/ntvfs/common/brlock.c b/source/ntvfs/common/brlock.c
index e693d57ca0cc08d6dd1ec8bf39660bf8a237c213..5e404768e092a1048e84627e28307ecfd6dad6e0 100644 (file)
--- a/source/ntvfs/common/brlock.c
+++ b/source/ntvfs/common/brlock.c
@@ -29,6 +29,7 @@
 #include "system/filesys.h"
 #include "lib/tdb/include/tdb.h"
 #include "messages.h"
 #include "system/filesys.h"
 #include "lib/tdb/include/tdb.h"
 #include "messages.h"

+#include "db_wrap.h"

 
 /*
   in this module a "DATA_BLOB *file_key" is a blob that uniquely identifies
 
 /*
   in this module a "DATA_BLOB *file_key" is a blob that uniquely identifies

diff --git a/source/ntvfs/common/opendb.c b/source/ntvfs/common/opendb.c
index 231576b3d5e3c3b77543876f9a59657092d977a2..4109992bc0e0e4bc45171a580e64c36fa12ff64a 100644 (file)
--- a/source/ntvfs/common/opendb.c
+++ b/source/ntvfs/common/opendb.c
@@ -43,6 +43,7 @@
 #include "lib/tdb/include/tdb.h"
 #include "messages.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "lib/tdb/include/tdb.h"
 #include "messages.h"
 #include "librpc/gen_ndr/ndr_security.h"

+#include "db_wrap.h"

 
 struct odb_context {
        struct tdb_wrap *w;
 
 struct odb_context {
        struct tdb_wrap *w;

diff --git a/source/ntvfs/posix/xattr_tdb.c b/source/ntvfs/posix/xattr_tdb.c
index 29971ebeb55ae542551b8451656c73c47d97da8a..f488569ca55c2dcf9a44c5ad7ac2a891f7e4ad05 100644 (file)
--- a/source/ntvfs/posix/xattr_tdb.c
+++ b/source/ntvfs/posix/xattr_tdb.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "vfs_posix.h"
 #include "lib/tdb/include/tdb.h"
 #include "includes.h"
 #include "vfs_posix.h"
 #include "lib/tdb/include/tdb.h"

+#include "db_wrap.h"

 
 #define XATTR_LIST_ATTR ".xattr_list"
 
 
 #define XATTR_LIST_ATTR ".xattr_list"
 

diff --git a/source/passdb/secrets.c b/source/passdb/secrets.c
index afc26aed46f6fa471e9cb87b66b7287acdd09a66..d202326d5c47ea50f991a67774d70582938c1e74 100644 (file)
--- a/source/passdb/secrets.c
+++ b/source/passdb/secrets.c
@@ -27,6 +27,7 @@
 #include "secrets.h"
 #include "system/filesys.h"
 #include "pstring.h"
 #include "secrets.h"
 #include "system/filesys.h"
 #include "pstring.h"

+#include "db_wrap.h"

 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB

diff --git a/source/rpc_server/lsa/dcesrv_lsa.c b/source/rpc_server/lsa/dcesrv_lsa.c
index c23bbe94d0f873e896d325719fc057f91a1e3d62..a8f2af12edf1fc0764160f84fdf10a477ee2337c 100644 (file)
--- a/source/rpc_server/lsa/dcesrv_lsa.c
+++ b/source/rpc_server/lsa/dcesrv_lsa.c
@@ -29,6 +29,7 @@
 #include "lib/ldb/include/ldb.h"
 #include "auth/auth.h"
 #include "system/time.h"
 #include "lib/ldb/include/ldb.h"
 #include "auth/auth.h"
 #include "system/time.h"

+#include "db_wrap.h"

 
 /*
   this type allows us to distinguish handle types
 
 /*
   this type allows us to distinguish handle types

diff --git a/source/rpc_server/netlogon/schannel_state.c b/source/rpc_server/netlogon/schannel_state.c
index a0bffcce065cadc7371d8697a3d49a66bcc654e9..8f5f80e25693aac305fce4da6b1bc8c265108e41 100644 (file)
--- a/source/rpc_server/netlogon/schannel_state.c
+++ b/source/rpc_server/netlogon/schannel_state.c
@@ -24,6 +24,7 @@
 #include "system/time.h"
 #include "auth/auth.h"
 #include "lib/ldb/include/ldb.h"
 #include "system/time.h"
 #include "auth/auth.h"
 #include "lib/ldb/include/ldb.h"

+#include "db_wrap.h"

 
 /* a reasonable amount of time to keep credentials live */
 #define SCHANNEL_CREDENTIALS_EXPIRY 600
 
 /* a reasonable amount of time to keep credentials live */
 #define SCHANNEL_CREDENTIALS_EXPIRY 600