r25026: Move param/param.h out of includes.h

(This used to be commit abe8349f9b4387961ff3665d8c589d61cd2edf31)

59 files changed, 60 insertions, 2 deletions

diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c
index 8c510efab4..b6b1d021dc 100644
--- a/source4/torture/basic/base.c
+++ b/source4/torture/basic/base.c
@@ -29,6 +29,7 @@
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "lib/events/events.h"
 #include "lib/cmdline/popt_common.h"
+#include "param/param.h"
 
 
 #define CHECK_MAX_FAILURES(label) do { if (++failures >= torture_failures) goto label; } while (0)
diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c
index d72e3ca1cd..d493aa819e 100644
--- a/source4/torture/basic/misc.c
+++ b/source4/torture/basic/misc.c
@@ -33,6 +33,7 @@
 #include "torture/util.h"
 #include "libcli/smb_composite/smb_composite.h"
 #include "libcli/composite/composite.h"
+#include "param/param.h"
 
 extern struct cli_credentials *cmdline_credentials;
 	
diff --git a/source4/torture/basic/secleak.c b/source4/torture/basic/secleak.c
index cb6cc84152..030a4f5f67 100644
--- a/source4/torture/basic/secleak.c
+++ b/source4/torture/basic/secleak.c
@@ -27,6 +27,7 @@
 #include "system/time.h"
 #include "libcli/smb_composite/smb_composite.h"
 #include "auth/credentials/credentials.h"
+#include "param/param.h"
 
 static BOOL try_failed_login(struct smbcli_state *cli)
 {
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index d232f49016..6a1c077fd5 100644
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -26,6 +26,7 @@
 #include "librpc/gen_ndr/security.h"
 #include "auth/credentials/credentials.h"
 #include "auth/gensec/gensec.h"
+#include "param/param.h"
 
 #define NSERVERS 2
 #define NINSTANCES 2
diff --git a/source4/torture/libnet/domain.c b/source4/torture/libnet/domain.c
index 17b8a94f42..cfd3c10968 100644
--- a/source4/torture/libnet/domain.c
+++ b/source4/torture/libnet/domain.c
@@ -23,6 +23,7 @@
 #include "lib/events/events.h"
 #include "libnet/libnet.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
+#include "param/param.h"
 
 static BOOL test_domainopen(struct libnet_context *net_ctx, TALLOC_CTX *mem_ctx,
 			    struct lsa_String *domname,
diff --git a/source4/torture/libnet/groupinfo.c b/source4/torture/libnet/groupinfo.c
index 0dca1519de..9be2511565 100644
--- a/source4/torture/libnet/groupinfo.c
+++ b/source4/torture/libnet/groupinfo.c
@@ -23,6 +23,7 @@
 #include "libnet/libnet.h"
 #include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
+#include "param/param.h"
 
 #define TEST_GROUPNAME  "libnetgroupinfotest"
 
diff --git a/source4/torture/libnet/libnet_domain.c b/source4/torture/libnet/libnet_domain.c
index 675ab9f099..1bcbfbbe4f 100644
--- a/source4/torture/libnet/libnet_domain.c
+++ b/source4/torture/libnet/libnet_domain.c
@@ -30,6 +30,7 @@
 #include "librpc/rpc/dcerpc.h"
 #include "torture/torture.h"
 #include "torture/rpc/rpc.h"
+#include "param/param.h"
 
 
 static BOOL test_opendomain_samr(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
diff --git a/source4/torture/libnet/libnet_group.c b/source4/torture/libnet/libnet_group.c
index 1f4725d6dd..bc51c4242a 100644
--- a/source4/torture/libnet/libnet_group.c
+++ b/source4/torture/libnet/libnet_group.c
@@ -26,6 +26,7 @@
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 #include "torture/torture.h"
 #include "torture/rpc/rpc.h"
+#include "param/param.h"
 
 
 #define TEST_GROUPNAME  "libnetgrouptest"
diff --git a/source4/torture/libnet/libnet_lookup.c b/source4/torture/libnet/libnet_lookup.c
index 116816a40a..a98781bc17 100644
--- a/source4/torture/libnet/libnet_lookup.c
+++ b/source4/torture/libnet/libnet_lookup.c
@@ -26,6 +26,7 @@
 #include "libcli/libcli.h"
 #include "torture/rpc/rpc.h"
 #include "torture/torture.h"
+#include "param/param.h"
 
 
 BOOL torture_lookup(struct torture_context *torture)
diff --git a/source4/torture/libnet/libnet_rpc.c b/source4/torture/libnet/libnet_rpc.c
index 07c586ebf3..1509324b65 100644
--- a/source4/torture/libnet/libnet_rpc.c
+++ b/source4/torture/libnet/libnet_rpc.c
@@ -30,6 +30,7 @@
 #include "librpc/rpc/dcerpc.h"
 #include "torture/rpc/rpc.h"
 #include "torture/torture.h"
+#include "param/param.h"
 
 
 static BOOL test_connect_service(struct libnet_context *ctx,
diff --git a/source4/torture/libnet/libnet_user.c b/source4/torture/libnet/libnet_user.c
index 7a3b9f19c1..186bd98aa5 100644
--- a/source4/torture/libnet/libnet_user.c
+++ b/source4/torture/libnet/libnet_user.c
@@ -27,6 +27,7 @@
 #include "torture/torture.h"
 #include "torture/rpc/rpc.h"
 #include "torture/libnet/usertest.h"
+#include "param/param.h"
 
 
 static BOOL test_cleanup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
diff --git a/source4/torture/libnet/userinfo.c b/source4/torture/libnet/userinfo.c
index ad35e84861..95975e630e 100644
--- a/source4/torture/libnet/userinfo.c
+++ b/source4/torture/libnet/userinfo.c
@@ -23,6 +23,7 @@
 #include "libnet/libnet.h"
 #include "libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
+#include "param/param.h"
 
 #define TEST_USERNAME  "libnetuserinfotest"
 
diff --git a/source4/torture/libnet/userman.c b/source4/torture/libnet/userman.c
index 90b3f41959..deebfd9014 100644
--- a/source4/torture/libnet/userman.c
+++ b/source4/torture/libnet/userman.c
@@ -23,6 +23,7 @@
 #include "torture/libnet/usertest.h"
 #include "libnet/libnet.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
+#include "param/param.h"
 
 
 static BOOL test_opendomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
diff --git a/source4/torture/local/iconv.c b/source4/torture/local/iconv.c
index c543aa7c8f..8c2d5a3054 100644
--- a/source4/torture/local/iconv.c
+++ b/source4/torture/local/iconv.c
@@ -25,6 +25,7 @@
 #include "system/iconv.h"
 #include "system/time.h"
 #include "libcli/raw/libcliraw.h"
+#include "param/param.h"
 #include "torture/util.h"
 
 #if HAVE_NATIVE_ICONV
diff --git a/source4/torture/local/irpc.c b/source4/torture/local/irpc.c
index f21a050396..7c5de2dd56 100644
--- a/source4/torture/local/irpc.c
+++ b/source4/torture/local/irpc.c
@@ -25,6 +25,7 @@
 #include "librpc/gen_ndr/ndr_echo.h"
 #include "torture/torture.h"
 #include "cluster/cluster.h"
+#include "param/param.h"
 
 const uint32_t MSG_ID1 = 1, MSG_ID2 = 2;
 
diff --git a/source4/torture/local/messaging.c b/source4/torture/local/messaging.c
index 724e2a54c7..e70fd7c24d 100644
--- a/source4/torture/local/messaging.c
+++ b/source4/torture/local/messaging.c
@@ -24,6 +24,7 @@
 #include "lib/messaging/irpc.h"
 #include "torture/torture.h"
 #include "cluster/cluster.h"
+#include "param/param.h"
 
 
 static uint32_t msg_pong;
diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c
index ba0ba344d9..4f0bfa8e06 100644
--- a/source4/torture/locktest.c
+++ b/source4/torture/locktest.c
@@ -24,6 +24,7 @@
 #include "auth/credentials/credentials.h"
 #include "auth/gensec/gensec.h"
 #include "libcli/libcli.h"
+#include "param/param.h"
 
 static int numops = 1000;
 static BOOL showall;
diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c
index 3eac50cbca..53cceb9699 100644
--- a/source4/torture/masktest.c
+++ b/source4/torture/masktest.c
@@ -26,6 +26,7 @@
 #include "pstring.h"
 #include "auth/credentials/credentials.h"
 #include "auth/gensec/gensec.h"
+#include "param/param.h"
 
 static struct cli_credentials *credentials;
 static BOOL showall = False;
diff --git a/source4/torture/nbt/dgram.c b/source4/torture/nbt/dgram.c
index c4515ea797..e3bfaa6db3 100644
--- a/source4/torture/nbt/dgram.c
+++ b/source4/torture/nbt/dgram.c
@@ -30,6 +30,7 @@
 #include "libcli/resolve/resolve.h"
 #include "system/network.h"
 #include "lib/socket/netif.h"
+#include "param/param.h"
 
 #define TEST_NAME "TORTURE_TEST"
 
diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c
index 69ef56231b..c829b36e8e 100644
--- a/source4/torture/nbt/winsreplication.c
+++ b/source4/torture/nbt/winsreplication.c
@@ -30,6 +30,7 @@
 #include "librpc/gen_ndr/ndr_nbt.h"
 #include "torture/torture.h"
 #include "torture/nbt/proto.h"
+#include "param/param.h"
 
 #define CHECK_STATUS(tctx, status, correct) \
 	torture_assert_ntstatus_equal(tctx, status, correct, \
diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c
index e66ebcde02..ea5c09c335 100644
--- a/source4/torture/raw/composite.c
+++ b/source4/torture/raw/composite.c
@@ -30,6 +30,7 @@
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "lib/cmdline/popt_common.h"
 #include "torture/util.h"
+#include "param/param.h"
 
 #define BASEDIR "\\composite"
 
diff --git a/source4/torture/raw/context.c b/source4/torture/raw/context.c
index 11cb91768b..79771a004d 100644
--- a/source4/torture/raw/context.c
+++ b/source4/torture/raw/context.c
@@ -27,6 +27,7 @@
 #include "libcli/libcli.h"
 #include "torture/util.h"
 #include "auth/credentials/credentials.h"
+#include "param/param.h"
 
 #define BASEDIR "\\rawcontext"
 
diff --git a/source4/torture/raw/eas.c b/source4/torture/raw/eas.c
index b6eedbc586..5e80564380 100644
--- a/source4/torture/raw/eas.c
+++ b/source4/torture/raw/eas.c
@@ -25,6 +25,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
+#include "param/param.h"
 
 #define BASEDIR "\\testeas"
 
diff --git a/source4/torture/raw/lock.c b/source4/torture/raw/lock.c
index 533974c9a9..e4ab9d9e4a 100644
--- a/source4/torture/raw/lock.c
+++ b/source4/torture/raw/lock.c
@@ -27,6 +27,7 @@
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
 #include "lib/cmdline/popt_common.h"
+#include "param/param.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \
diff --git a/source4/torture/raw/lockbench.c b/source4/torture/raw/lockbench.c
index 44b60b8695..6ef33be759 100644
--- a/source4/torture/raw/lockbench.c
+++ b/source4/torture/raw/lockbench.c
@@ -30,6 +30,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
+#include "param/param.h"
 
 #define BASEDIR "\\benchlock"
 #define FNAME BASEDIR "\\lock.dat"
diff --git a/source4/torture/raw/mkdir.c b/source4/torture/raw/mkdir.c
index 071783a277..c4d7bc2534 100644
--- a/source4/torture/raw/mkdir.c
+++ b/source4/torture/raw/mkdir.c
@@ -22,6 +22,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
+#include "param/param.h"
 
 #define BASEDIR "\\mkdirtest"
 
diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c
index 7d0d46d3d1..d744a891e5 100644
--- a/source4/torture/raw/notify.c
+++ b/source4/torture/raw/notify.c
@@ -23,6 +23,7 @@
 #include "libcli/libcli.h"
 #include "system/filesys.h"
 #include "torture/util.h"
+#include "param/param.h"
 
 #define BASEDIR "\\test_notify"
 
diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c
index f8fa4ff8fe..104a2056e3 100644
--- a/source4/torture/raw/open.c
+++ b/source4/torture/raw/open.c
@@ -28,6 +28,7 @@
 #include "torture/util.h"
 #include "auth/credentials/credentials.h"
 #include "lib/cmdline/popt_common.h"
+#include "param/param.h"
 
 /* enum for whether reads/writes are possible on a file */
 enum rdwr_mode {RDWR_NONE, RDWR_RDONLY, RDWR_WRONLY, RDWR_RDWR};
diff --git a/source4/torture/raw/openbench.c b/source4/torture/raw/openbench.c
index fffb572d50..d412a0406c 100644
--- a/source4/torture/raw/openbench.c
+++ b/source4/torture/raw/openbench.c
@@ -30,6 +30,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
+#include "param/param.h"
 
 #define BASEDIR "\\benchopen"
 
diff --git a/source4/torture/raw/pingpong.c b/source4/torture/raw/pingpong.c
index 027034275a..6841253c91 100755
--- a/source4/torture/raw/pingpong.c
+++ b/source4/torture/raw/pingpong.c
@@ -50,6 +50,7 @@
 #include "system/filesys.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
+#include "param/param.h"
 
 
 
diff --git a/source4/torture/raw/read.c b/source4/torture/raw/read.c
index 3c108dce2d..b00b377c7f 100644
--- a/source4/torture/raw/read.c
+++ b/source4/torture/raw/read.c
@@ -24,6 +24,7 @@
 #include "system/filesys.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
+#include "param/param.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \
diff --git a/source4/torture/raw/samba3misc.c b/source4/torture/raw/samba3misc.c
index 57595dab44..74c32728a1 100644
--- a/source4/torture/raw/samba3misc.c
+++ b/source4/torture/raw/samba3misc.c
@@ -25,6 +25,7 @@
 #include "libcli/libcli.h"
 #include "torture/util.h"
 #include "lib/events/events.h"
+#include "param/param.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \
diff --git a/source4/torture/raw/unlink.c b/source4/torture/raw/unlink.c
index 860a09727d..59e1aeb27c 100644
--- a/source4/torture/raw/unlink.c
+++ b/source4/torture/raw/unlink.c
@@ -23,6 +23,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
+#include "param/param.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \
diff --git a/source4/torture/rpc/bench.c b/source4/torture/rpc/bench.c
index 48fd0609f0..be00e0b7a6 100644
--- a/source4/torture/rpc/bench.c
+++ b/source4/torture/rpc/bench.c
@@ -23,6 +23,7 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_srvsvc_c.h"
 #include "torture/rpc/rpc.h"
+#include "param/param.h"
 
 /**************************/
 /* srvsvc_NetShare        */
diff --git a/source4/torture/rpc/countcalls.c b/source4/torture/rpc/countcalls.c
index e2e222d2ec..c1fdc069cb 100644
--- a/source4/torture/rpc/countcalls.c
+++ b/source4/torture/rpc/countcalls.c
@@ -25,6 +25,7 @@
 #include "librpc/ndr/libndr.h"
 #include "librpc/ndr/ndr_table.h"
 #include "torture/rpc/rpc.h"
+#include "param/param.h"
 
 
 	
diff --git a/source4/torture/rpc/dfs.c b/source4/torture/rpc/dfs.c
index 7dc600ae93..19df14c772 100644
--- a/source4/torture/rpc/dfs.c
+++ b/source4/torture/rpc/dfs.c
@@ -487,7 +487,7 @@ bool torture_rpc_dfs(struct torture_context *torture)
 	struct dcerpc_pipe *p;
 	BOOL ret = True;
 	enum dfs_ManagerVersion version;
-	const char *host = lp_parm_string(-1, "torture", "host");
+	const char *host = torture_setting_string(torture, "host", NULL);
 
 	status = torture_rpc_connection(torture, &p, &ndr_table_netdfs);
 	torture_assert_ntstatus_ok(torture, status, "Unable to connect");
diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c
index 08420d0d17..c3ec54cbcd 100644
--- a/source4/torture/rpc/drsuapi.c
+++ b/source4/torture/rpc/drsuapi.c
@@ -26,6 +26,7 @@
 #include "librpc/gen_ndr/ndr_drsuapi_c.h"
 #include "torture/rpc/rpc.h"
 #include "dlinklist.h"
+#include "param/param.h"
 
 #define TEST_MACHINE_NAME "torturetest"
 
diff --git a/source4/torture/rpc/drsuapi_cracknames.c b/source4/torture/rpc/drsuapi_cracknames.c
index b1a65179aa..08c102c400 100644
--- a/source4/torture/rpc/drsuapi_cracknames.c
+++ b/source4/torture/rpc/drsuapi_cracknames.c
@@ -447,7 +447,7 @@ bool test_DsCrackNames(struct torture_context *tctx,
 				.comment = "display name for Microsoft Support Account",
 				.status = DRSUAPI_DS_NAME_STATUS_OK,
 				.alternate_status = DRSUAPI_DS_NAME_STATUS_NOT_UNIQUE,
-				.skip = lp_parm_bool(-1, "torture", "samba4", False)
+				.skip = torture_setting_bool(tctx, "samba4", False)
 			},
 			{
 				.format_offered	= DRSUAPI_DS_NAME_FORMAT_GUID,
diff --git a/source4/torture/rpc/dssync.c b/source4/torture/rpc/dssync.c
index 6357fa9ee5..bf3e59c380 100644
--- a/source4/torture/rpc/dssync.c
+++ b/source4/torture/rpc/dssync.c
@@ -32,6 +32,7 @@
 #include "auth/credentials/credentials.h"
 #include "libcli/auth/libcli_auth.h"
 #include "auth/gensec/gensec.h"
+#include "param/param.h"
 
 struct DsSyncBindInfo {
 	struct dcerpc_pipe *pipe;
diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index cfdf483f8d..46660231f8 100644
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -27,6 +27,7 @@
 #include "libcli/security/security.h"
 #include "libcli/auth/libcli_auth.h"
 #include "torture/rpc/rpc.h"
+#include "param/param.h"
 
 static void init_lsa_String(struct lsa_String *name, const char *s)
 {
diff --git a/source4/torture/rpc/mgmt.c b/source4/torture/rpc/mgmt.c
index 6d0c3d56c9..40a3438492 100644
--- a/source4/torture/rpc/mgmt.c
+++ b/source4/torture/rpc/mgmt.c
@@ -24,6 +24,7 @@
 #include "auth/gensec/gensec.h"
 #include "librpc/ndr/ndr_table.h"
 #include "torture/rpc/rpc.h"
+#include "param/param.h"
 
 
 /*
diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 7a94ef7645..907772ac8a 100644
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -30,6 +30,7 @@
 #include "libcli/auth/libcli_auth.h"
 #include "librpc/gen_ndr/ndr_netlogon_c.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
+#include "param/param.h"
 
 #define TEST_MACHINE_NAME "torturetest"
 
diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index 72eba40344..73bb12de87 100644
--- a/source4/torture/rpc/samba3rpc.c
+++ b/source4/torture/rpc/samba3rpc.c
@@ -48,6 +48,7 @@
 #include "libcli/auth/libcli_auth.h"
 #include "lib/crypto/crypto.h"
 #include "libcli/security/proto.h"
+#include "param/param.h"
 
 static struct cli_credentials *create_anon_creds(TALLOC_CTX *mem_ctx)
 {
diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c
index da74067336..b149af1859 100644
--- a/source4/torture/rpc/samlogon.c
+++ b/source4/torture/rpc/samlogon.c
@@ -31,6 +31,7 @@
 #include "torture/rpc/rpc.h"
 #include "auth/gensec/schannel_proto.h"
 #include "libcli/auth/libcli_auth.h"
+#include "param/param.h"
 
 #define TEST_MACHINE_NAME "samlogontest"
 #define TEST_USER_NAME "samlogontestuser"
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index dada316a39..757142003a 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -28,6 +28,7 @@
 #include "libcli/auth/libcli_auth.h"
 #include "libcli/security/security.h"
 #include "torture/rpc/rpc.h"
+#include "param/param.h"
 
 #define TEST_ACCOUNT_NAME "samrtorturetest"
 #define TEST_ALIASNAME "samrtorturetestalias"
diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index 358bf8791a..baf4edca98 100644
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -36,6 +36,7 @@
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "param/param.h"
 
 #define TEST_MACHINE_NAME "samsynctest"
 #define TEST_WKSTA_MACHINE_NAME "samsynctest2"
diff --git a/source4/torture/rpc/scanner.c b/source4/torture/rpc/scanner.c
index e1d7c69676..c070a47754 100644
--- a/source4/torture/rpc/scanner.c
+++ b/source4/torture/rpc/scanner.c
@@ -24,6 +24,7 @@
 #include "librpc/gen_ndr/ndr_mgmt_c.h"
 #include "librpc/ndr/ndr_table.h"
 #include "torture/rpc/rpc.h"
+#include "param/param.h"
 
 /*
   work out how many calls there are for an interface
diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c
index e6bc00312a..2494fbefff 100644
--- a/source4/torture/rpc/schannel.c
+++ b/source4/torture/rpc/schannel.c
@@ -30,6 +30,7 @@
 #include "libcli/auth/libcli_auth.h"
 #include "libcli/security/security.h"
 #include "system/filesys.h"
+#include "param/param.h"
 
 #define TEST_MACHINE_NAME "schannel"
 
diff --git a/source4/torture/rpc/session_key.c b/source4/torture/rpc/session_key.c
index d35d9fd4fc..0e1c2666f8 100644
--- a/source4/torture/rpc/session_key.c
+++ b/source4/torture/rpc/session_key.c
@@ -26,6 +26,7 @@
 #include "libcli/auth/libcli_auth.h"
 #include "torture/rpc/rpc.h"
 #include "lib/cmdline/popt_common.h"
+#include "param/param.h"
 
 static void init_lsa_String(struct lsa_String *name, const char *s)
 {
diff --git a/source4/torture/rpc/spoolss_notify.c b/source4/torture/rpc/spoolss_notify.c
index 43955888f5..c6fb71c465 100644
--- a/source4/torture/rpc/spoolss_notify.c
+++ b/source4/torture/rpc/spoolss_notify.c
@@ -31,6 +31,7 @@
 #include "lib/socket/netif.h"
 #include "dlinklist.h"
 #include "ntvfs/ntvfs.h"
+#include "param/param.h"
 
 static NTSTATUS spoolss__op_bind(struct dcesrv_call_state *dce_call, const struct dcesrv_interface *iface)
 {
diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index 56a0fccde4..e20699cc04 100644
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/torture/rpc/testjoin.c
@@ -36,6 +36,7 @@
 #include "libcli/auth/libcli_auth.h"
 #include "torture/rpc/rpc.h"
 #include "libcli/security/security.h"
+#include "param/param.h"
 
 struct test_join {
 	struct dcerpc_pipe *p;
diff --git a/source4/torture/smb2/connect.c b/source4/torture/smb2/connect.c
index 62d273e623..fdfc4378ab 100644
--- a/source4/torture/smb2/connect.c
+++ b/source4/torture/smb2/connect.c
@@ -25,6 +25,7 @@
 #include "libcli/smb2/smb2_calls.h"
 #include "torture/torture.h"
 #include "torture/smb2/proto.h"
+#include "param/param.h"
 
 /*
   send a close
diff --git a/source4/torture/smb2/getinfo.c b/source4/torture/smb2/getinfo.c
index fc59d1ac30..c5182fb553 100644
--- a/source4/torture/smb2/getinfo.c
+++ b/source4/torture/smb2/getinfo.c
@@ -26,6 +26,8 @@
 #include "torture/torture.h"
 #include "torture/smb2/proto.h"
 
+#include "param/param.h"
+
 static struct {
 	const char *name;
 	uint16_t level;
diff --git a/source4/torture/smb2/util.c b/source4/torture/smb2/util.c
index 5e680fbcec..caa3a5fd52 100644
--- a/source4/torture/smb2/util.c
+++ b/source4/torture/smb2/util.c
@@ -26,6 +26,7 @@
 #include "lib/events/events.h"
 #include "system/time.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "param/param.h"
 
 
 /*
diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c
index babfb42fd8..a148081fb3 100644
--- a/source4/torture/smbtorture.c
+++ b/source4/torture/smbtorture.c
@@ -34,6 +34,7 @@
 #include "build.h"
 #include "lib/util/dlinklist.h"
 #include "librpc/rpc/dcerpc.h"
+#include "param/param.h"
 
 static bool run_matching(struct torture_context *torture,
 						 const char *prefix, 
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index aa3dc14d55..2a1e731303 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -25,6 +25,7 @@
 #include "lib/util/dlinklist.h"
 #include "auth/credentials/credentials.h"
 #include "lib/cmdline/popt_common.h"
+#include "param/param.h"
 
 _PUBLIC_ int torture_numops=10;
 _PUBLIC_ int torture_entries=1000;
diff --git a/source4/torture/ui.c b/source4/torture/ui.c
index bd0fb7c2bb..6a1c2a31f3 100644
--- a/source4/torture/ui.c
+++ b/source4/torture/ui.c
@@ -22,6 +22,7 @@
 #include "torture/ui.h"
 #include "torture/torture.h"
 #include "lib/util/dlinklist.h"
+#include "param/param.h"
 
 void torture_comment(struct torture_context *context, const char *comment, ...)
 {
diff --git a/source4/torture/unix/whoami.c b/source4/torture/unix/whoami.c
index 8322e57bd1..80431f5ac5 100644
--- a/source4/torture/unix/whoami.c
+++ b/source4/torture/unix/whoami.c
@@ -24,6 +24,7 @@
 #include "libcli/raw/interfaces.h"
 #include "lib/cmdline/popt_common.h"
 #include "auth/credentials/credentials.h"
+#include "param/param.h"
 
 /* Size (in bytes) of the required fields in the SMBwhoami response. */
 #define WHOAMI_REQUIRED_SIZE	40
diff --git a/source4/torture/util_smb.c b/source4/torture/util_smb.c
index 8e4f3b56ee..01826dccfc 100644
--- a/source4/torture/util_smb.c
+++ b/source4/torture/util_smb.c
@@ -31,6 +31,7 @@
 #include "torture/torture.h"
 #include "util/dlinklist.h"
 #include "auth/credentials/credentials.h"
+#include "param/param.h"
 
 
 /**