r17930: Merge noinclude branch:

 * Move dlinklist.h, smb.h to subsystem-specific directories
 * Clean up ads.h and move what is left of it to dsdb/
   (only place where it's used)
(This used to be commit f7afa1cb77f3cfa7020b57de12e6003db7cfcc42)

12 files changed, 7 insertions, 12 deletions

diff --git a/source4/torture/basic/aliases.c b/source4/torture/basic/aliases.c
index 8fdb2999ea..3643d098ba 100644
--- a/source4/torture/basic/aliases.c
+++ b/source4/torture/basic/aliases.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "dlinklist.h"
+#include "lib/util/dlinklist.h"
 #include "libcli/raw/libcliraw.h"
 #include "torture/torture.h"
 #include "libcli/libcli.h"
diff --git a/source4/torture/ldap/schema.c b/source4/torture/ldap/schema.c
index e7e50105fb..69750826ce 100644
--- a/source4/torture/ldap/schema.c
+++ b/source4/torture/ldap/schema.c
@@ -27,7 +27,7 @@
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
 #include "dsdb/samdb/samdb.h"
-#include "dlinklist.h"
+#include "lib/util/dlinklist.h"
 
 #include "torture/torture.h"
 #include "torture/ldap/proto.h"
diff --git a/source4/torture/nbench/nbio.c b/source4/torture/nbench/nbio.c
index 1deefe4bb3..34ca4e8653 100644
--- a/source4/torture/nbench/nbio.c
+++ b/source4/torture/nbench/nbio.c
@@ -21,7 +21,7 @@
 #include "includes.h"
 #include "system/time.h"
 #include "system/filesys.h"
-#include "dlinklist.h"
+#include "lib/util/dlinklist.h"
 #include "libcli/libcli.h"
 #include "libcli/raw/libcliraw.h"
 #include "torture/torture.h"
diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 386d4d2378..5b6575893d 100644
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -26,7 +26,6 @@
 #include "torture/torture.h"
 #include "lib/events/events.h"
 #include "auth/auth.h"
-#include "smb.h"
 #include "lib/cmdline/popt_common.h"
 #include "torture/rpc/rpc.h"
 #include "libcli/auth/libcli_auth.h"
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 79924b1ac7..fc86db22e5 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -25,7 +25,6 @@
 #include "system/time.h"
 #include "librpc/gen_ndr/lsa.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
-#include "smb.h"
 #include "lib/crypto/crypto.h"
 #include "libcli/auth/libcli_auth.h"
 #include "libcli/security/security.h"
diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index dd1180c27d..91e02d54e3 100644
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -25,7 +25,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "auth/auth.h"
-#include "dlinklist.h"
+#include "lib/util/dlinklist.h"
 #include "lib/crypto/crypto.h"
 #include "system/time.h"
 #include "torture/rpc/rpc.h"
diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index c83fda79ab..fb3c6c3d2a 100644
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/torture/rpc/testjoin.c
@@ -31,7 +31,6 @@
 #include "lib/crypto/crypto.h"
 #include "libnet/libnet.h"
 #include "lib/cmdline/popt_common.h"
-#include "smb.h"
 #include "lib/ldb/include/ldb.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 
diff --git a/source4/torture/smb2/connect.c b/source4/torture/smb2/connect.c
index 7d2773ebb6..9f36e4d707 100644
--- a/source4/torture/smb2/connect.c
+++ b/source4/torture/smb2/connect.c
@@ -21,7 +21,6 @@
 */
 
 #include "includes.h"
-#include "smb.h"
 #include "librpc/gen_ndr/security.h"
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c
index a77cc5cfdb..8d7552e075 100644
--- a/source4/torture/smbtorture.c
+++ b/source4/torture/smbtorture.c
@@ -30,7 +30,7 @@
 
 #include "torture/torture.h"
 #include "build.h"
-#include "dlinklist.h"
+#include "lib/util/dlinklist.h"
 #include "librpc/rpc/dcerpc.h"
 
 #define MAX_COLS 80 /* FIXME: Determine this at run-time */
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index bd27cf1081..aa29051c7f 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -23,7 +23,7 @@
 #include "system/time.h"
 #include "torture/torture.h"
 #include "build.h"
-#include "dlinklist.h"
+#include "lib/util/dlinklist.h"
 
 _PUBLIC_ int torture_nprocs=4;
 _PUBLIC_ int torture_numops=10;
diff --git a/source4/torture/ui.c b/source4/torture/ui.c
index 8e1a2a1c93..7ebaf2b7e9 100644
--- a/source4/torture/ui.c
+++ b/source4/torture/ui.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "torture/ui.h"
-#include "dlinklist.h"
+#include "lib/util/dlinklist.h"
 
 void torture_comment(struct torture_context *context, const char *comment, ...)
 {
diff --git a/source4/torture/util_smb.c b/source4/torture/util_smb.c
index f292165a0c..c1e4edc5e6 100644
--- a/source4/torture/util_smb.c
+++ b/source4/torture/util_smb.c
@@ -19,7 +19,6 @@
 */
 
 #include "includes.h"
-#include "smb.h"
 #include "lib/cmdline/popt_common.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/ioctl.h"