summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-09-08 12:42:09 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:05:38 -0500
commitffeee68e4b72dd94fee57366bd8d38b8c284c3d4 (patch)
treea34ba763c0c9d4dc10a58484ed8277f2a6cbfa2f
parent1dfe79de91858d7568a1131d010a383e459dd8f9 (diff)
downloadsamba-ffeee68e4b72dd94fee57366bd8d38b8c284c3d4.tar.gz
samba-ffeee68e4b72dd94fee57366bd8d38b8c284c3d4.tar.bz2
samba-ffeee68e4b72dd94fee57366bd8d38b8c284c3d4.zip
r25026: Move param/param.h out of includes.h
(This used to be commit abe8349f9b4387961ff3665d8c589d61cd2edf31)
-rw-r--r--source4/auth/auth.c1
-rw-r--r--source4/auth/auth_sam.c1
-rw-r--r--source4/auth/auth_unix.c1
-rw-r--r--source4/auth/auth_util.c1
-rw-r--r--source4/auth/credentials/credentials.c1
-rw-r--r--source4/auth/credentials/credentials_files.c1
-rw-r--r--source4/auth/gensec/gensec.c1
-rw-r--r--source4/auth/gensec/gensec_gssapi.c1
-rw-r--r--source4/auth/gensec/gensec_krb5.c1
-rw-r--r--source4/auth/gensec/schannel_state.c1
-rw-r--r--source4/auth/kerberos/krb5_init_context.c1
-rw-r--r--source4/auth/ntlm_check.c1
-rw-r--r--source4/auth/ntlmssp/ntlmssp_client.c1
-rw-r--r--source4/auth/ntlmssp/ntlmssp_server.c1
-rw-r--r--source4/auth/sam.c1
-rw-r--r--source4/cldap_server/cldap_server.c1
-rw-r--r--source4/cldap_server/netlogon.c1
-rw-r--r--source4/client/cifsdd.c1
-rw-r--r--source4/client/client.c1
-rw-r--r--source4/cluster/ctdb/ctdb_cluster.c1
-rw-r--r--source4/cluster/ctdb/opendb_ctdb.c1
-rw-r--r--source4/cluster/local.c1
-rw-r--r--source4/dsdb/repl/drepl_service.c1
-rw-r--r--source4/dsdb/samdb/ldb_modules/password_hash.c1
-rw-r--r--source4/dsdb/samdb/samdb.c1
-rw-r--r--source4/include/includes.h1
-rw-r--r--source4/kdc/hdb-ldb.c1
-rw-r--r--source4/kdc/kdc.c1
-rw-r--r--source4/ldap_server/ldap_backend.c1
-rw-r--r--source4/ldap_server/ldap_server.c1
-rw-r--r--source4/lib/charset/charcnv.c1
-rw-r--r--source4/lib/charset/iconv.c1
-rw-r--r--source4/lib/cmdline/popt_common.c1
-rw-r--r--source4/lib/cmdline/popt_credentials.c1
-rw-r--r--source4/lib/db_wrap.c1
-rw-r--r--source4/lib/dbwrap/dbwrap.c1
-rw-r--r--source4/lib/dbwrap/dbwrap_tdb.c1
-rw-r--r--source4/lib/events/events.c1
-rw-r--r--source4/lib/ldb/tools/ad2oLschema.c1
-rw-r--r--source4/lib/messaging/messaging.c1
-rw-r--r--source4/lib/registry/samba.c1
-rw-r--r--source4/lib/socket/connect.c1
-rw-r--r--source4/lib/socket/connect_multi.c1
-rw-r--r--source4/lib/socket/interface.c1
-rw-r--r--source4/lib/socket/socket.c1
-rw-r--r--source4/libcli/cldap/cldap.c1
-rw-r--r--source4/libcli/cliconnect.c1
-rw-r--r--source4/libcli/dgram/browse.c1
-rw-r--r--source4/libcli/dgram/mailslot.c1
-rw-r--r--source4/libcli/dgram/netlogon.c1
-rw-r--r--source4/libcli/dgram/ntlogon.c1
-rw-r--r--source4/libcli/finddcs.c1
-rw-r--r--source4/libcli/nbt/namequery.c1
-rw-r--r--source4/libcli/nbt/namerefresh.c1
-rw-r--r--source4/libcli/nbt/nameregister.c1
-rw-r--r--source4/libcli/nbt/namerelease.c1
-rw-r--r--source4/libcli/nbt/nbtsocket.c1
-rw-r--r--source4/libcli/raw/clisocket.c1
-rw-r--r--source4/libcli/raw/clitransport.c1
-rw-r--r--source4/libcli/raw/clitree.c1
-rw-r--r--source4/libcli/raw/rawnegotiate.c1
-rw-r--r--source4/libcli/raw/smb_signing.c1
-rw-r--r--source4/libcli/resolve/nbtlist.c1
-rw-r--r--source4/libcli/resolve/resolve.c1
-rw-r--r--source4/libcli/resolve/wins.c1
-rw-r--r--source4/libcli/smb2/connect.c1
-rw-r--r--source4/libcli/smb_composite/connect.c1
-rw-r--r--source4/libcli/smb_composite/sesssetup.c1
-rw-r--r--source4/libcli/util/errormap.c1
-rw-r--r--source4/libnet/libnet.c1
-rw-r--r--source4/libnet/libnet_become_dc.c1
-rw-r--r--source4/libnet/libnet_join.c1
-rw-r--r--source4/libnet/libnet_samsync_ldb.c1
-rw-r--r--source4/librpc/rpc/dcerpc_connect.c1
-rw-r--r--source4/librpc/rpc/dcerpc_sock.c1
-rw-r--r--source4/librpc/rpc/dcerpc_util.c1
-rw-r--r--source4/nbt_server/dgram/netlogon.c1
-rw-r--r--source4/nbt_server/dgram/ntlogon.c1
-rw-r--r--source4/nbt_server/dgram/request.c1
-rw-r--r--source4/nbt_server/interfaces.c1
-rw-r--r--source4/nbt_server/packet.c1
-rw-r--r--source4/nbt_server/query.c1
-rw-r--r--source4/nbt_server/register.c1
-rw-r--r--source4/nbt_server/wins/wins_hook.c1
-rw-r--r--source4/nbt_server/wins/wins_ldb.c1
-rw-r--r--source4/nbt_server/wins/winsclient.c1
-rw-r--r--source4/nbt_server/wins/winsdb.c1
-rw-r--r--source4/nbt_server/wins/winsserver.c1
-rw-r--r--source4/nsswitch/wbinfo.c1
-rw-r--r--source4/ntptr/ntptr_base.c1
-rw-r--r--source4/ntptr/simple_ldb/ntptr_simple_ldb.c1
-rw-r--r--source4/ntvfs/cifs/vfs_cifs.c1
-rw-r--r--source4/ntvfs/common/opendb.c1
-rw-r--r--source4/ntvfs/common/opendb_tdb.c1
-rw-r--r--source4/ntvfs/ntvfs_base.c1
-rw-r--r--source4/ntvfs/posix/pvfs_shortname.c1
-rw-r--r--source4/ntvfs/print/vfs_print.c1
-rw-r--r--source4/ntvfs/sysdep/inotify.c1
-rw-r--r--source4/ntvfs/sysdep/sys_notify.c1
-rw-r--r--source4/param/loadparm.c1
-rw-r--r--source4/param/share.c1
-rw-r--r--source4/param/share_classic.c1
-rw-r--r--source4/param/share_ldb.c1
-rw-r--r--source4/param/util.c3
-rw-r--r--source4/rpc_server/common/server_info.c1
-rw-r--r--source4/rpc_server/dcerpc_server.c1
-rw-r--r--source4/rpc_server/lsa/dcesrv_lsa.c1
-rw-r--r--source4/rpc_server/netlogon/dcerpc_netlogon.c1
-rw-r--r--source4/rpc_server/remote/dcesrv_remote.c5
-rw-r--r--source4/rpc_server/samr/dcesrv_samr.c1
-rw-r--r--source4/rpc_server/service_rpc.c1
-rw-r--r--source4/rpc_server/spoolss/dcesrv_spoolss.c1
-rw-r--r--source4/rpc_server/srvsvc/dcesrv_srvsvc.c1
-rw-r--r--source4/scripting/ejs/smbcalls.c1
-rw-r--r--source4/scripting/ejs/smbcalls.h1
-rw-r--r--source4/scripting/ejs/smbcalls_cli.c1
-rw-r--r--source4/scripting/ejs/smbcalls_config.c1
-rw-r--r--source4/scripting/ejs/smbcalls_param.c2
-rw-r--r--source4/smb_server/smb/negprot.c1
-rw-r--r--source4/smb_server/smb/receive.c1
-rw-r--r--source4/smb_server/smb/service.c2
-rw-r--r--source4/smb_server/smb/sesssetup.c1
-rw-r--r--source4/smb_server/smb/signing.c1
-rw-r--r--source4/smb_server/smb2/receive.c1
-rw-r--r--source4/smb_server/smb_server.c1
-rw-r--r--source4/smbd/pidfile.c1
-rw-r--r--source4/smbd/process_model.c1
-rw-r--r--source4/smbd/server.c1
-rw-r--r--source4/smbd/service_stream.c1
-rw-r--r--source4/torture/basic/base.c1
-rw-r--r--source4/torture/basic/misc.c1
-rw-r--r--source4/torture/basic/secleak.c1
-rw-r--r--source4/torture/gentest.c1
-rw-r--r--source4/torture/libnet/domain.c1
-rw-r--r--source4/torture/libnet/groupinfo.c1
-rw-r--r--source4/torture/libnet/libnet_domain.c1
-rw-r--r--source4/torture/libnet/libnet_group.c1
-rw-r--r--source4/torture/libnet/libnet_lookup.c1
-rw-r--r--source4/torture/libnet/libnet_rpc.c1
-rw-r--r--source4/torture/libnet/libnet_user.c1
-rw-r--r--source4/torture/libnet/userinfo.c1
-rw-r--r--source4/torture/libnet/userman.c1
-rw-r--r--source4/torture/local/iconv.c1
-rw-r--r--source4/torture/local/irpc.c1
-rw-r--r--source4/torture/local/messaging.c1
-rw-r--r--source4/torture/locktest.c1
-rw-r--r--source4/torture/masktest.c1
-rw-r--r--source4/torture/nbt/dgram.c1
-rw-r--r--source4/torture/nbt/winsreplication.c1
-rw-r--r--source4/torture/raw/composite.c1
-rw-r--r--source4/torture/raw/context.c1
-rw-r--r--source4/torture/raw/eas.c1
-rw-r--r--source4/torture/raw/lock.c1
-rw-r--r--source4/torture/raw/lockbench.c1
-rw-r--r--source4/torture/raw/mkdir.c1
-rw-r--r--source4/torture/raw/notify.c1
-rw-r--r--source4/torture/raw/open.c1
-rw-r--r--source4/torture/raw/openbench.c1
-rwxr-xr-xsource4/torture/raw/pingpong.c1
-rw-r--r--source4/torture/raw/read.c1
-rw-r--r--source4/torture/raw/samba3misc.c1
-rw-r--r--source4/torture/raw/unlink.c1
-rw-r--r--source4/torture/rpc/bench.c1
-rw-r--r--source4/torture/rpc/countcalls.c1
-rw-r--r--source4/torture/rpc/dfs.c2
-rw-r--r--source4/torture/rpc/drsuapi.c1
-rw-r--r--source4/torture/rpc/drsuapi_cracknames.c2
-rw-r--r--source4/torture/rpc/dssync.c1
-rw-r--r--source4/torture/rpc/lsa.c1
-rw-r--r--source4/torture/rpc/mgmt.c1
-rw-r--r--source4/torture/rpc/netlogon.c1
-rw-r--r--source4/torture/rpc/samba3rpc.c1
-rw-r--r--source4/torture/rpc/samlogon.c1
-rw-r--r--source4/torture/rpc/samr.c1
-rw-r--r--source4/torture/rpc/samsync.c1
-rw-r--r--source4/torture/rpc/scanner.c1
-rw-r--r--source4/torture/rpc/schannel.c1
-rw-r--r--source4/torture/rpc/session_key.c1
-rw-r--r--source4/torture/rpc/spoolss_notify.c1
-rw-r--r--source4/torture/rpc/testjoin.c1
-rw-r--r--source4/torture/smb2/connect.c1
-rw-r--r--source4/torture/smb2/getinfo.c2
-rw-r--r--source4/torture/smb2/util.c1
-rw-r--r--source4/torture/smbtorture.c1
-rw-r--r--source4/torture/torture.c1
-rw-r--r--source4/torture/ui.c1
-rw-r--r--source4/torture/unix/whoami.c1
-rw-r--r--source4/torture/util_smb.c1
-rw-r--r--source4/utils/net/net_join.c1
-rw-r--r--source4/utils/ntlm_auth.c1
-rw-r--r--source4/utils/testparm.c1
-rw-r--r--source4/web_server/http.c1
-rw-r--r--source4/web_server/web_server.c1
-rw-r--r--source4/winbind/wb_cmd_getpwnam.c2
-rw-r--r--source4/winbind/wb_cmd_getpwuid.c2
-rw-r--r--source4/winbind/wb_dom_info.c1
-rw-r--r--source4/winbind/wb_dom_info_trusted.c1
-rw-r--r--source4/winbind/wb_init_domain.c1
-rw-r--r--source4/winbind/wb_pam_auth.c1
-rw-r--r--source4/winbind/wb_samba3_cmd.c1
-rw-r--r--source4/winbind/wb_server.c1
-rw-r--r--source4/winbind/wb_sid2domain.c1
-rw-r--r--source4/winbind/wb_utils.c1
-rw-r--r--source4/wrepl_server/wrepl_in_connection.c1
-rw-r--r--source4/wrepl_server/wrepl_server.c1
205 files changed, 209 insertions, 9 deletions
diff --git a/source4/auth/auth.c b/source4/auth/auth.c
index b74bbc3371..8cd46cd6fe 100644
--- a/source4/auth/auth.c
+++ b/source4/auth/auth.c
@@ -23,6 +23,7 @@
#include "auth/auth.h"
#include "lib/events/events.h"
#include "build.h"
+#include "param/param.h"
/***************************************************************************
Set a fixed challenge
diff --git a/source4/auth/auth_sam.c b/source4/auth/auth_sam.c
index 840db3ede6..e9b24d5f60 100644
--- a/source4/auth/auth_sam.c
+++ b/source4/auth/auth_sam.c
@@ -29,6 +29,7 @@
#include "dsdb/samdb/samdb.h"
#include "libcli/security/security.h"
#include "libcli/ldap/ldap.h"
+#include "param/param.h"
extern const char *user_attrs[];
extern const char *domain_ref_attrs[];
diff --git a/source4/auth/auth_unix.c b/source4/auth/auth_unix.c
index 61e004f592..dd000e9445 100644
--- a/source4/auth/auth_unix.c
+++ b/source4/auth/auth_unix.c
@@ -24,6 +24,7 @@
#include "system/passwd.h" /* needed by some systems for struct passwd */
#include "lib/socket/socket.h"
#include "auth/pam_errors.h"
+#include "param/param.h"
/* TODO: look at how to best fill in parms retrieveing a struct passwd info
* except in case USER_INFO_DONT_CHECK_UNIX_ACCOUNT is set
diff --git a/source4/auth/auth_util.c b/source4/auth/auth_util.c
index 693ec35f86..8398bbfaf4 100644
--- a/source4/auth/auth_util.c
+++ b/source4/auth/auth_util.c
@@ -27,6 +27,7 @@
#include "libcli/auth/libcli_auth.h"
#include "dsdb/samdb/samdb.h"
#include "auth/credentials/credentials.h"
+#include "param/param.h"
/* this default function can be used by mostly all backends
* which don't want to set a challenge
diff --git a/source4/auth/credentials/credentials.c b/source4/auth/credentials/credentials.c
index c32efb045f..2899bc5605 100644
--- a/source4/auth/credentials/credentials.c
+++ b/source4/auth/credentials/credentials.c
@@ -27,6 +27,7 @@
#include "auth/credentials/credentials_krb5.h"
#include "libcli/auth/libcli_auth.h"
#include "lib/events/events.h"
+#include "param/param.h"
/**
* Create a new credentials structure
diff --git a/source4/auth/credentials/credentials_files.c b/source4/auth/credentials/credentials_files.c
index 2b6bc4f9d6..5770dbf057 100644
--- a/source4/auth/credentials/credentials_files.c
+++ b/source4/auth/credentials/credentials_files.c
@@ -29,6 +29,7 @@
#include "db_wrap.h"
#include "auth/credentials/credentials.h"
#include "auth/credentials/credentials_krb5.h"
+#include "param/param.h"
/**
* Read a file descriptor, and parse it for a password (eg from a file or stdin)
diff --git a/source4/auth/gensec/gensec.c b/source4/auth/gensec/gensec.c
index 51d0056920..a974cd5138 100644
--- a/source4/auth/gensec/gensec.c
+++ b/source4/auth/gensec/gensec.c
@@ -27,6 +27,7 @@
#include "librpc/rpc/dcerpc.h"
#include "auth/credentials/credentials.h"
#include "auth/gensec/gensec.h"
+#include "param/param.h"
/* the list of currently registered GENSEC backends */
static struct gensec_security_ops **generic_security_ops;
diff --git a/source4/auth/gensec/gensec_gssapi.c b/source4/auth/gensec/gensec_gssapi.c
index dd9f19ac43..a3351f75a8 100644
--- a/source4/auth/gensec/gensec_gssapi.c
+++ b/source4/auth/gensec/gensec_gssapi.c
@@ -34,6 +34,7 @@
#include "auth/credentials/credentials.h"
#include "auth/credentials/credentials_krb5.h"
#include "auth/gensec/gensec.h"
+#include "param/param.h"
enum gensec_gssapi_sasl_state
{
diff --git a/source4/auth/gensec/gensec_krb5.c b/source4/auth/gensec/gensec_krb5.c
index 811e562353..81b4181ce7 100644
--- a/source4/auth/gensec/gensec_krb5.c
+++ b/source4/auth/gensec/gensec_krb5.c
@@ -36,6 +36,7 @@
#include "auth/credentials/credentials.h"
#include "auth/credentials/credentials_krb5.h"
#include "auth/gensec/gensec.h"
+#include "param/param.h"
enum GENSEC_KRB5_STATE {
GENSEC_KRB5_SERVER_START,
diff --git a/source4/auth/gensec/schannel_state.c b/source4/auth/gensec/schannel_state.c
index a911ed9288..afbbd618eb 100644
--- a/source4/auth/gensec/schannel_state.c
+++ b/source4/auth/gensec/schannel_state.c
@@ -26,6 +26,7 @@
#include "db_wrap.h"
#include "libcli/auth/libcli_auth.h"
#include "auth/auth.h"
+#include "param/param.h"
/**
connect to the schannel ldb
diff --git a/source4/auth/kerberos/krb5_init_context.c b/source4/auth/kerberos/krb5_init_context.c
index c11d93f44a..000e715305 100644
--- a/source4/auth/kerberos/krb5_init_context.c
+++ b/source4/auth/kerberos/krb5_init_context.c
@@ -29,6 +29,7 @@
#include "system/network.h"
#include "lib/events/events.h"
#include "roken.h"
+#include "param/param.h"
/*
context structure for operations on cldap packets
diff --git a/source4/auth/ntlm_check.c b/source4/auth/ntlm_check.c
index 5c5ad1f3ca..d3dbc3ce66 100644
--- a/source4/auth/ntlm_check.c
+++ b/source4/auth/ntlm_check.c
@@ -23,6 +23,7 @@
#include "lib/crypto/crypto.h"
#include "librpc/gen_ndr/netlogon.h"
#include "libcli/auth/libcli_auth.h"
+#include "param/param.h"
/****************************************************************************
Core of smb password checking routine.
diff --git a/source4/auth/ntlmssp/ntlmssp_client.c b/source4/auth/ntlmssp/ntlmssp_client.c
index 003394a21b..a98918a54b 100644
--- a/source4/auth/ntlmssp/ntlmssp_client.c
+++ b/source4/auth/ntlmssp/ntlmssp_client.c
@@ -28,6 +28,7 @@
#include "libcli/auth/libcli_auth.h"
#include "auth/credentials/credentials.h"
#include "auth/gensec/gensec.h"
+#include "param/param.h"
/*********************************************************************
Client side NTLMSSP
diff --git a/source4/auth/ntlmssp/ntlmssp_server.c b/source4/auth/ntlmssp/ntlmssp_server.c
index 52b3bfcfc5..8b6920c978 100644
--- a/source4/auth/ntlmssp/ntlmssp_server.c
+++ b/source4/auth/ntlmssp/ntlmssp_server.c
@@ -30,6 +30,7 @@
#include "auth/credentials/credentials.h"
#include "auth/gensec/gensec.h"
#include "auth/auth.h"
+#include "param/param.h"
/**
* Set a username on an NTLMSSP context - ensures it is talloc()ed
diff --git a/source4/auth/sam.c b/source4/auth/sam.c
index 6e160941d8..ed01c0bd93 100644
--- a/source4/auth/sam.c
+++ b/source4/auth/sam.c
@@ -27,6 +27,7 @@
#include "libcli/security/security.h"
#include "libcli/ldap/ldap.h"
#include "librpc/gen_ndr/ndr_netlogon.h"
+#include "param/param.h"
const char *user_attrs[] = {
/* required for the krb5 kdc */
diff --git a/source4/cldap_server/cldap_server.c b/source4/cldap_server/cldap_server.c
index a1a1414c98..fbf6f786db 100644
--- a/source4/cldap_server/cldap_server.c
+++ b/source4/cldap_server/cldap_server.c
@@ -33,6 +33,7 @@
#include "dsdb/samdb/samdb.h"
#include "db_wrap.h"
#include "auth/auth.h"
+#include "param/param.h"
/*
handle incoming cldap requests
diff --git a/source4/cldap_server/netlogon.c b/source4/cldap_server/netlogon.c
index 1dec279905..5eef4de4cd 100644
--- a/source4/cldap_server/netlogon.c
+++ b/source4/cldap_server/netlogon.c
@@ -33,6 +33,7 @@
#include "db_wrap.h"
#include "system/network.h"
#include "lib/socket/netif.h"
+#include "param/param.h"
/*
fill in the cldap netlogon union for a given version
diff --git a/source4/client/cifsdd.c b/source4/client/cifsdd.c
index 28c9059efa..2663184c83 100644
--- a/source4/client/cifsdd.c
+++ b/source4/client/cifsdd.c
@@ -24,6 +24,7 @@
#include "lib/cmdline/popt_common.h"
#include "cifsdd.h"
+#include "param/param.h"
const char * const PROGNAME = "cifsdd";
diff --git a/source4/client/client.c b/source4/client/client.c
index 0a3cb21752..eaa8fe48a0 100644
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -40,6 +40,7 @@
#include "libcli/security/security.h"
#include "lib/smbreadline/smbreadline.h"
#include "librpc/gen_ndr/ndr_nbt.h"
+#include "param/param.h"
static int io_bufsize = 64512;
diff --git a/source4/cluster/ctdb/ctdb_cluster.c b/source4/cluster/ctdb/ctdb_cluster.c
index d416a63374..693de9fef3 100644
--- a/source4/cluster/ctdb/ctdb_cluster.c
+++ b/source4/cluster/ctdb/ctdb_cluster.c
@@ -28,6 +28,7 @@
#include "include/ctdb.h"
#include "db_wrap.h"
#include "lib/util/dlinklist.h"
+#include "param/param.h"
/* a linked list of messaging handlers, allowing incoming messages
to be directed to the right messaging context */
diff --git a/source4/cluster/ctdb/opendb_ctdb.c b/source4/cluster/ctdb/opendb_ctdb.c
index f894af839e..738d8a1f0f 100644
--- a/source4/cluster/ctdb/opendb_ctdb.c
+++ b/source4/cluster/ctdb/opendb_ctdb.c
@@ -49,6 +49,7 @@
#include "ntvfs/common/ntvfs_common.h"
#include "cluster/cluster.h"
#include "include/ctdb.h"
+#include "param/param.h"
struct odb_context {
struct ctdb_context *ctdb;
diff --git a/source4/cluster/local.c b/source4/cluster/local.c
index dc4759ebae..feefe902e1 100644
--- a/source4/cluster/local.c
+++ b/source4/cluster/local.c
@@ -25,6 +25,7 @@
#include "lib/tdb/include/tdb.h"
#include "db_wrap.h"
#include "system/filesys.h"
+#include "param/param.h"
/*
server a server_id for the local node
diff --git a/source4/dsdb/repl/drepl_service.c b/source4/dsdb/repl/drepl_service.c
index b26358b3a5..e4e2aedcf7 100644
--- a/source4/dsdb/repl/drepl_service.c
+++ b/source4/dsdb/repl/drepl_service.c
@@ -31,6 +31,7 @@
#include "librpc/gen_ndr/ndr_misc.h"
#include "librpc/gen_ndr/ndr_drsuapi.h"
#include "librpc/gen_ndr/ndr_drsblobs.h"
+#include "param/param.h"
static WERROR dreplsrv_init_creds(struct dreplsrv_service *service)
{
diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index a275810b12..22d04a5519 100644
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -48,6 +48,7 @@
#include "librpc/ndr/libndr.h"
#include "librpc/gen_ndr/ndr_drsblobs.h"
#include "lib/crypto/crypto.h"
+#include "param/param.h"
/* If we have decided there is reason to work on this request, then
* setup all the password hash types correctly.
diff --git a/source4/dsdb/samdb/samdb.c b/source4/dsdb/samdb/samdb.c
index 31182a44d6..288ed2909d 100644
--- a/source4/dsdb/samdb/samdb.c
+++ b/source4/dsdb/samdb/samdb.c
@@ -35,6 +35,7 @@
#include "db_wrap.h"
#include "dsdb/samdb/samdb.h"
#include "dsdb/common/flags.h"
+#include "param/param.h"
/*
connect to the SAM database
diff --git a/source4/include/includes.h b/source4/include/includes.h
index 40cb306eb2..340d0c360f 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -115,7 +115,6 @@
#include "libcli/util/nt_status.h"
#include "charset/charset.h"
#include "util/util.h"
-#include "param/param.h"
#include "librpc/gen_ndr/misc.h"
typedef bool BOOL;
diff --git a/source4/kdc/hdb-ldb.c b/source4/kdc/hdb-ldb.c
index ddee8d19d1..93f45b8cf7 100644
--- a/source4/kdc/hdb-ldb.c
+++ b/source4/kdc/hdb-ldb.c
@@ -49,6 +49,7 @@
#include "librpc/ndr/libndr.h"
#include "librpc/gen_ndr/ndr_drsblobs.h"
#include "libcli/auth/libcli_auth.h"
+#include "param/param.h"
enum hdb_ldb_ent_type
{ HDB_LDB_ENT_TYPE_CLIENT, HDB_LDB_ENT_TYPE_SERVER,
diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index f26e5a7e9b..b3d5ccdb5e 100644
--- a/source4/kdc/kdc.c
+++ b/source4/kdc/kdc.c
@@ -38,6 +38,7 @@
#include "heimdal/kdc/windc_plugin.h"
#include "heimdal/lib/krb5/krb5_locl.h"
#include "heimdal/kdc/kdc_locl.h"
+#include "param/param.h"
/* Disgusting hack to get a mem_ctx into the hdb plugin, when used as a keytab */
diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c
index c8ae293a2a..5afcf8cd12 100644
--- a/source4/ldap_server/ldap_backend.c
+++ b/source4/ldap_server/ldap_backend.c
@@ -26,6 +26,7 @@
#include "lib/db_wrap.h"
#include "auth/credentials/credentials.h"
#include "auth/gensec/gensec.h"
+#include "param/param.h"
#define VALID_DN_SYNTAX(dn,i) do {\
if (!(dn)) {\
diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index 2ea1a96ae7..a6753d46fa 100644
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -40,6 +40,7 @@
#include "system/network.h"
#include "lib/socket/netif.h"
#include "dsdb/samdb/samdb.h"
+#include "param/param.h"
/*
close the socket and shutdown a server_context
*/
diff --git a/source4/lib/charset/charcnv.c b/source4/lib/charset/charcnv.c
index fcf29d4647..dda9f754b1 100644
--- a/source4/lib/charset/charcnv.c
+++ b/source4/lib/charset/charcnv.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
#include "system/iconv.h"
+#include "param/param.h"
/**
* @file
diff --git a/source4/lib/charset/iconv.c b/source4/lib/charset/iconv.c
index 062b4ddfc8..8510f70d96 100644
--- a/source4/lib/charset/iconv.c
+++ b/source4/lib/charset/iconv.c
@@ -22,6 +22,7 @@
#include "lib/util/dlinklist.h"
#include "system/iconv.h"
#include "system/filesys.h"
+#include "param/param.h"
/**
diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c
index 413c8e7cc3..6f91c3a26a 100644
--- a/source4/lib/cmdline/popt_common.c
+++ b/source4/lib/cmdline/popt_common.c
@@ -22,6 +22,7 @@
#include "includes.h"
#include "version.h"
#include "lib/cmdline/popt_common.h"
+#include "param/param.h"
/* Handle command line options:
* -d,--debuglevel
diff --git a/source4/lib/cmdline/popt_credentials.c b/source4/lib/cmdline/popt_credentials.c
index 259dbf8ee1..9abd7f53d2 100644
--- a/source4/lib/cmdline/popt_credentials.c
+++ b/source4/lib/cmdline/popt_credentials.c
@@ -23,6 +23,7 @@
#include "lib/cmdline/credentials.h"
#include "auth/credentials/credentials.h"
#include "auth/gensec/gensec.h"
+#include "param/param.h"
/* Handle command line options:
* -U,--user
diff --git a/source4/lib/db_wrap.c b/source4/lib/db_wrap.c
index 0e026f84e1..f91006b46c 100644
--- a/source4/lib/db_wrap.c
+++ b/source4/lib/db_wrap.c
@@ -35,6 +35,7 @@
#include "lib/ldb/samba/ldif_handlers.h"
#include "db_wrap.h"
#include "dsdb/samdb/samdb.h"
+#include "param/param.h"
static struct tdb_wrap *tdb_list;
diff --git a/source4/lib/dbwrap/dbwrap.c b/source4/lib/dbwrap/dbwrap.c
index c0bac672aa..02e82c77a7 100644
--- a/source4/lib/dbwrap/dbwrap.c
+++ b/source4/lib/dbwrap/dbwrap.c
@@ -23,6 +23,7 @@
#include "includes.h"
#include "lib/tdb/include/tdb.h"
#include "lib/dbwrap/dbwrap.h"
+#include "param/param.h"
/*
open a temporary database
diff --git a/source4/lib/dbwrap/dbwrap_tdb.c b/source4/lib/dbwrap/dbwrap_tdb.c
index dedb344e0b..b6af8abadd 100644
--- a/source4/lib/dbwrap/dbwrap_tdb.c
+++ b/source4/lib/dbwrap/dbwrap_tdb.c
@@ -25,6 +25,7 @@
#include "lib/dbwrap/dbwrap.h"
#include "system/filesys.h"
#include "db_wrap.h"
+#include "param/param.h"
struct db_tdb_ctx {
struct tdb_wrap *wtdb;
diff --git a/source4/lib/events/events.c b/source4/lib/events/events.c
index 9ba3254190..77225b9ddf 100644
--- a/source4/lib/events/events.c
+++ b/source4/lib/events/events.c
@@ -57,6 +57,7 @@
#include "lib/events/events.h"
#include "lib/events/events_internal.h"
#include "lib/util/dlinklist.h"
+#include "param/param.h"
#if _SAMBA_BUILD_
#include "build.h"
#endif
diff --git a/source4/lib/ldb/tools/ad2oLschema.c b/source4/lib/ldb/tools/ad2oLschema.c
index 761339b96f..ec72d01121 100644
--- a/source4/lib/ldb/tools/ad2oLschema.c
+++ b/source4/lib/ldb/tools/ad2oLschema.c
@@ -36,6 +36,7 @@
#include "system/locale.h"
#include "tools/cmdline.h"
#include "tools/convert.h"
+#include "param/param.h"
struct schema_conv {
int count;
diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index 4b609b09e9..2ad5e3bed0 100644
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -34,6 +34,7 @@
#include "lib/util/util_tdb.h"
#include "lib/util/util_tdb.h"
#include "cluster/cluster.h"
+#include "param/param.h"
/* change the message version with any incompatible changes in the protocol */
#define MESSAGING_VERSION 1
diff --git a/source4/lib/registry/samba.c b/source4/lib/registry/samba.c
index a5d6f76459..dfb69abb33 100644
--- a/source4/lib/registry/samba.c
+++ b/source4/lib/registry/samba.c
@@ -18,6 +18,7 @@
#include "includes.h"
#include "registry.h"
+#include "param/param.h"
/**
* @file
diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index dd2440b0a8..fe8bc5cf13 100644
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -26,6 +26,7 @@
#include "lib/events/events.h"
#include "libcli/composite/composite.h"
#include "libcli/resolve/resolve.h"
+#include "param/param.h"
struct connect_state {
diff --git a/source4/lib/socket/connect_multi.c b/source4/lib/socket/connect_multi.c
index 6bf7ca4d3e..445a1da782 100644
--- a/source4/lib/socket/connect_multi.c
+++ b/source4/lib/socket/connect_multi.c
@@ -26,6 +26,7 @@
#include "lib/events/events.h"
#include "libcli/composite/composite.h"
#include "libcli/resolve/resolve.h"
+#include "param/param.h"
#define MULTI_PORT_DELAY 2000 /* microseconds */
diff --git a/source4/lib/socket/interface.c b/source4/lib/socket/interface.c
index 58d00ba614..00b1f6c635 100644
--- a/source4/lib/socket/interface.c
+++ b/source4/lib/socket/interface.c
@@ -23,6 +23,7 @@
#include "system/network.h"
#include "lib/socket/netif.h"
#include "lib/util/dlinklist.h"
+#include "param/param.h"
/** used for network interfaces */
struct interface {
diff --git a/source4/lib/socket/socket.c b/source4/lib/socket/socket.c
index 5e19485ec6..640d195d27 100644
--- a/source4/lib/socket/socket.c
+++ b/source4/lib/socket/socket.c
@@ -23,6 +23,7 @@
#include "lib/socket/socket.h"
#include "system/filesys.h"
#include "system/network.h"
+#include "param/param.h"
/*
auto-close sockets on free
diff --git a/source4/libcli/cldap/cldap.c b/source4/libcli/cldap/cldap.c
index a5c4cc66a1..4c41e13014 100644
--- a/source4/libcli/cldap/cldap.c
+++ b/source4/libcli/cldap/cldap.c
@@ -39,6 +39,7 @@
#include "lib/socket/socket.h"
#include "libcli/security/security.h"
#include "librpc/gen_ndr/ndr_nbt.h"
+#include "param/param.h"
/*
destroy a pending request
diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c
index 50fe41c2bc..a91157cf5d 100644
--- a/source4/libcli/cliconnect.c
+++ b/source4/libcli/cliconnect.c
@@ -25,6 +25,7 @@
#include "libcli/raw/libcliraw.h"
#include "libcli/auth/libcli_auth.h"
#include "libcli/smb_composite/smb_composite.h"
+#include "param/param.h"
/*
wrapper around smbcli_sock_connect()
diff --git a/source4/libcli/dgram/browse.c b/source4/libcli/dgram/browse.c
index 84a2a7e534..78bd4319ee 100644
--- a/source4/libcli/dgram/browse.c
+++ b/source4/libcli/dgram/browse.c
@@ -25,6 +25,7 @@
#include "lib/socket/socket.h"
#include "libcli/resolve/resolve.h"
#include "librpc/gen_ndr/ndr_nbt.h"
+#include "param/param.h"
NTSTATUS dgram_mailslot_browse_send(struct nbt_dgram_socket *dgmsock,
struct nbt_name *dest_name,
diff --git a/source4/libcli/dgram/mailslot.c b/source4/libcli/dgram/mailslot.c
index 14eb7b931b..7a325ebe38 100644
--- a/source4/libcli/dgram/mailslot.c
+++ b/source4/libcli/dgram/mailslot.c
@@ -36,6 +36,7 @@
#include "lib/util/dlinklist.h"
#include "libcli/dgram/libdgram.h"
#include "lib/socket/socket.h"
+#include "param/param.h"
/*
destroy a mailslot handler
diff --git a/source4/libcli/dgram/netlogon.c b/source4/libcli/dgram/netlogon.c
index df47a34a0e..79acf609f6 100644
--- a/source4/libcli/dgram/netlogon.c
+++ b/source4/libcli/dgram/netlogon.c
@@ -24,6 +24,7 @@
#include "lib/socket/socket.h"
#include "libcli/resolve/resolve.h"
#include "librpc/gen_ndr/ndr_nbt.h"
+#include "param/param.h"
/*
send a netlogon mailslot request
diff --git a/source4/libcli/dgram/ntlogon.c b/source4/libcli/dgram/ntlogon.c
index 5881dcf702..6b9b17485d 100644
--- a/source4/libcli/dgram/ntlogon.c
+++ b/source4/libcli/dgram/ntlogon.c
@@ -24,6 +24,7 @@
#include "lib/socket/socket.h"
#include "libcli/resolve/resolve.h"
#include "librpc/gen_ndr/ndr_nbt.h"
+#include "param/param.h"
/*
send a ntlogon mailslot request
diff --git a/source4/libcli/finddcs.c b/source4/libcli/finddcs.c
index a159ab6dfc..46cca36009 100644
--- a/source4/libcli/finddcs.c
+++ b/source4/libcli/finddcs.c
@@ -27,6 +27,7 @@
#include "libcli/composite/composite.h"
#include "libcli/libcli.h"
#include "libcli/resolve/resolve.h"
+#include "param/param.h"
struct finddcs_state {
struct composite_context *ctx;
diff --git a/source4/libcli/nbt/namequery.c b/source4/libcli/nbt/namequery.c
index 32de9723b9..ab26a7b2d2 100644
--- a/source4/libcli/nbt/namequery.c
+++ b/source4/libcli/nbt/namequery.c
@@ -22,6 +22,7 @@
#include "includes.h"
#include "libcli/nbt/libnbt.h"
#include "lib/socket/socket.h"
+#include "param/param.h"
/**
send a nbt name query
diff --git a/source4/libcli/nbt/namerefresh.c b/source4/libcli/nbt/namerefresh.c
index afa80d68f8..d68cdb5365 100644
--- a/source4/libcli/nbt/namerefresh.c
+++ b/source4/libcli/nbt/namerefresh.c
@@ -23,6 +23,7 @@
#include "libcli/nbt/libnbt.h"
#include "libcli/composite/composite.h"
#include "lib/socket/socket.h"
+#include "param/param.h"
/*
send a nbt name refresh request
diff --git a/source4/libcli/nbt/nameregister.c b/source4/libcli/nbt/nameregister.c
index 7b03667fec..62c4a19b29 100644
--- a/source4/libcli/nbt/nameregister.c
+++ b/source4/libcli/nbt/nameregister.c
@@ -24,6 +24,7 @@
#include "libcli/composite/composite.h"
#include "lib/socket/socket.h"
#include "librpc/gen_ndr/ndr_nbt.h"
+#include "param/param.h"
/*
send a nbt name registration request
diff --git a/source4/libcli/nbt/namerelease.c b/source4/libcli/nbt/namerelease.c
index fd3967d1e6..efc31b1501 100644
--- a/source4/libcli/nbt/namerelease.c
+++ b/source4/libcli/nbt/namerelease.c
@@ -22,6 +22,7 @@
#include "includes.h"
#include "libcli/nbt/libnbt.h"
#include "lib/socket/socket.h"
+#include "param/param.h"
/*
send a nbt name release request
diff --git a/source4/libcli/nbt/nbtsocket.c b/source4/libcli/nbt/nbtsocket.c
index bb3e15d5de..b44b50efd8 100644
--- a/source4/libcli/nbt/nbtsocket.c
+++ b/source4/libcli/nbt/nbtsocket.c
@@ -25,6 +25,7 @@
#include "libcli/nbt/libnbt.h"
#include "lib/socket/socket.h"
#include "librpc/gen_ndr/ndr_nbt.h"
+#include "param/param.h"
#define NBT_MAX_REPLIES 1000
diff --git a/source4/libcli/raw/clisocket.c b/source4/libcli/raw/clisocket.c
index 0aa6ec5616..51f631eb67 100644
--- a/source4/libcli/raw/clisocket.c
+++ b/source4/libcli/raw/clisocket.c
@@ -26,6 +26,7 @@
#include "libcli/composite/composite.h"
#include "lib/socket/socket.h"
#include "libcli/resolve/resolve.h"
+#include "param/param.h"
struct sock_connect_state {
struct composite_context *ctx;
diff --git a/source4/libcli/raw/clitransport.c b/source4/libcli/raw/clitransport.c
index 0482b04f24..90f51b2969 100644
--- a/source4/libcli/raw/clitransport.c
+++ b/source4/libcli/raw/clitransport.c
@@ -26,6 +26,7 @@
#include "lib/events/events.h"
#include "lib/stream/packet.h"
#include "librpc/gen_ndr/ndr_nbt.h"
+#include "param/param.h"
/*
diff --git a/source4/libcli/raw/clitree.c b/source4/libcli/raw/clitree.c
index a5217d74b2..6a15c25eb9 100644
--- a/source4/libcli/raw/clitree.c
+++ b/source4/libcli/raw/clitree.c
@@ -23,6 +23,7 @@
#include "includes.h"
#include "libcli/raw/libcliraw.h"
#include "libcli/smb_composite/smb_composite.h"
+#include "param/param.h"
#define SETUP_REQUEST_TREE(cmd, wct, buflen) do { \
req = smbcli_request_setup(tree, cmd, wct, buflen); \
diff --git a/source4/libcli/raw/rawnegotiate.c b/source4/libcli/raw/rawnegotiate.c
index c2dc393481..eff22ee8bc 100644
--- a/source4/libcli/raw/rawnegotiate.c
+++ b/source4/libcli/raw/rawnegotiate.c
@@ -23,6 +23,7 @@
#include "includes.h"
#include "libcli/raw/libcliraw.h"
#include "system/time.h"
+#include "param/param.h"
static const struct {
enum protocol_types prot;
diff --git a/source4/libcli/raw/smb_signing.c b/source4/libcli/raw/smb_signing.c
index a37c9a7836..1a82ea0536 100644
--- a/source4/libcli/raw/smb_signing.c
+++ b/source4/libcli/raw/smb_signing.c
@@ -23,6 +23,7 @@
#include "smb.h"
#include "libcli/raw/libcliraw.h"
#include "lib/crypto/crypto.h"
+#include "param/param.h"
/***********************************************************
SMB signing - Common code before we set a new signing implementation
diff --git a/source4/libcli/resolve/nbtlist.c b/source4/libcli/resolve/nbtlist.c
index ad331c872d..faa2962d5a 100644
--- a/source4/libcli/resolve/nbtlist.c
+++ b/source4/libcli/resolve/nbtlist.c
@@ -29,6 +29,7 @@
#include "lib/socket/netif.h"
#include "librpc/gen_ndr/ndr_nbt.h"
#include "libcli/nbt/libnbt.h"
+#include "param/param.h"
struct nbtlist_state {
struct nbt_name name;
diff --git a/source4/libcli/resolve/resolve.c b/source4/libcli/resolve/resolve.c
index ee9b8df148..9315c0f354 100644
--- a/source4/libcli/resolve/resolve.c
+++ b/source4/libcli/resolve/resolve.c
@@ -24,6 +24,7 @@
#include "libcli/composite/composite.h"
#include "libcli/resolve/resolve.h"
#include "librpc/gen_ndr/ndr_nbt.h"
+#include "param/param.h"
struct resolve_state {
struct nbt_name name;
diff --git a/source4/libcli/resolve/wins.c b/source4/libcli/resolve/wins.c
index f7bfdc3405..8c88950f53 100644
--- a/source4/libcli/resolve/wins.c
+++ b/source4/libcli/resolve/wins.c
@@ -22,6 +22,7 @@
#include "includes.h"
#include "libcli/nbt/libnbt.h"
#include "libcli/resolve/resolve.h"
+#include "param/param.h"
/*
wins name resolution method - async send
diff --git a/source4/libcli/smb2/connect.c b/source4/libcli/smb2/connect.c
index a365f25d49..0edf64c5df 100644
--- a/source4/libcli/smb2/connect.c
+++ b/source4/libcli/smb2/connect.c
@@ -25,6 +25,7 @@
#include "libcli/smb2/smb2_calls.h"
#include "libcli/composite/composite.h"
#include "libcli/resolve/resolve.h"
+#include "param/param.h"
struct smb2_connect_state {
struct cli_credentials *credentials;
diff --git a/source4/libcli/smb_composite/connect.c b/source4/libcli/smb_composite/connect.c
index 026fe0b029..27b16ecc41 100644
--- a/source4/libcli/smb_composite/connect.c
+++ b/source4/libcli/smb_composite/connect.c
@@ -28,6 +28,7 @@
#include "libcli/resolve/resolve.h"
#include "auth/credentials/credentials.h"
#include "librpc/gen_ndr/ndr_nbt.h"
+#include "param/param.h"
/* the stages of this call */
enum connect_stage {CONNECT_RESOLVE,
diff --git a/source4/libcli/smb_composite/sesssetup.c b/source4/libcli/smb_composite/sesssetup.c
index 579706261a..6a14e57ad0 100644
--- a/source4/libcli/smb_composite/sesssetup.c
+++ b/source4/libcli/smb_composite/sesssetup.c
@@ -29,6 +29,7 @@
#include "auth/gensec/gensec.h"
#include "auth/credentials/credentials.h"
#include "version.h"
+#include "param/param.h"
struct sesssetup_state {
union smb_sesssetup setup;
diff --git a/source4/libcli/util/errormap.c b/source4/libcli/util/errormap.c
index 711f02a626..347d513e9c 100644
--- a/source4/libcli/util/errormap.c
+++ b/source4/libcli/util/errormap.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "param/param.h"
/* This map was extracted by the ERRMAPEXTRACT smbtorture command.
The setup was a Samba HEAD (2002-01-03) PDC and an Win2k member
diff --git a/source4/libnet/libnet.c b/source4/libnet/libnet.c
index a628a07a99..1994b68df0 100644
--- a/source4/libnet/libnet.c
+++ b/source4/libnet/libnet.c
@@ -20,6 +20,7 @@
#include "includes.h"
#include "libnet/libnet.h"
#include "lib/events/events.h"
+#include "param/param.h"
struct libnet_context *libnet_context_init(struct event_context *ev)
{
diff --git a/source4/libnet/libnet_become_dc.c b/source4/libnet/libnet_become_dc.c
index e2f4f03c60..47a250a5f2 100644
--- a/source4/libnet/libnet_become_dc.c
+++ b/source4/libnet/libnet_become_dc.c
@@ -32,6 +32,7 @@
#include "librpc/gen_ndr/ndr_security.h"
#include "librpc/gen_ndr/ndr_drsuapi.h"
#include "auth/gensec/gensec.h"
+#include "param/param.h"
/*****************************************************************************
* Windows 2003 (w2k3) does the following steps when changing the server role
diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index 40debc63dc..9404bc874d 100644
--- a/source4/libnet/libnet_join.c
+++ b/source4/libnet/libnet_join.c
@@ -31,6 +31,7 @@
#include "auth/credentials/credentials.h"
#include "auth/credentials/credentials_krb5.h"
#include "librpc/gen_ndr/ndr_samr_c.h"
+#include "param/param.h"
/*
* complete a domain join, when joining to a AD domain:
diff --git a/source4/libnet/libnet_samsync_ldb.c b/source4/libnet/libnet_samsync_ldb.c
index 1947eadddc..2c30128b16 100644
--- a/source4/libnet/libnet_samsync_ldb.c
+++ b/source4/libnet/libnet_samsync_ldb.c
@@ -31,6 +31,7 @@
#include "db_wrap.h"
#include "libcli/security/security.h"
#include "librpc/rpc/dcerpc.h"
+#include "param/param.h"
struct samsync_ldb_secret {
struct samsync_ldb_secret *prev, *next;
diff --git a/source4/librpc/rpc/dcerpc_connect.c b/source4/librpc/rpc/dcerpc_connect.c
index 114725880c..7403dd90fe 100644
--- a/source4/librpc/rpc/dcerpc_connect.c
+++ b/source4/librpc/rpc/dcerpc_connect.c
@@ -31,6 +31,7 @@
#include "libcli/smb2/smb2_calls.h"
#include "librpc/rpc/dcerpc.h"
#include "auth/credentials/credentials.h"
+#include "param/param.h"
struct pipe_np_smb_state {
diff --git a/source4/librpc/rpc/dcerpc_sock.c b/source4/librpc/rpc/dcerpc_sock.c
index 6b47e439cf..c946d0b039 100644
--- a/source4/librpc/rpc/dcerpc_sock.c
+++ b/source4/librpc/rpc/dcerpc_sock.c
@@ -28,6 +28,7 @@
#include "libcli/composite/composite.h"
#include "librpc/rpc/dcerpc.h"
#include "libcli/resolve/resolve.h"
+#include "param/param.h"
/* transport private information used by general socket pipe transports */
struct sock_private {
diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c
index 440625715b..e82302585c 100644
--- a/source4/librpc/rpc/dcerpc_util.c
+++ b/source4/librpc/rpc/dcerpc_util.c
@@ -29,6 +29,7 @@
#include "librpc/gen_ndr/ndr_dcerpc.h"
#include "librpc/gen_ndr/ndr_misc.h"
#include "auth/credentials/credentials.h"
+#include "param/param.h"
/*
find a dcerpc call on an interface by name
diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c
index c255238913..eb06abd74a 100644
--- a/source4/nbt_server/dgram/netlogon.c
+++ b/source4/nbt_server/dgram/netlogon.c
@@ -27,6 +27,7 @@
#include "auth/auth.h"
#include "db_wrap.h"
#include "librpc/gen_ndr/ndr_nbt.h"
+#include "param/param.h"
/*
reply to a GETDC request
diff --git a/source4/nbt_server/dgram/ntlogon.c b/source4/nbt_server/dgram/ntlogon.c
index 51888ceab4..e24dffb4f4 100644
--- a/source4/nbt_server/dgram/ntlogon.c
+++ b/source4/nbt_server/dgram/ntlogon.c
@@ -23,6 +23,7 @@
#include "nbt_server/nbt_server.h"
#include "lib/socket/socket.h"
#include "librpc/gen_ndr/ndr_nbt.h"
+#include "param/param.h"
/*
reply to a SAM LOGON request
diff --git a/source4/nbt_server/dgram/request.c b/source4/nbt_server/dgram/request.c
index bea1e84213..da15340305 100644
--- a/source4/nbt_server/dgram/request.c
+++ b/source4/nbt_server/dgram/request.c
@@ -26,6 +26,7 @@
#include "libcli/resolve/resolve.h"
#include "nbt_server/dgram/proto.h"
#include "librpc/gen_ndr/ndr_nbt.h"
+#include "param/param.h"
/*
a list of mailslots that we have static handlers for
diff --git a/source4/nbt_server/interfaces.c b/source4/nbt_server/interfaces.c
index b0bc55c05b..40fa605e11 100644
--- a/source4/nbt_server/interfaces.c
+++ b/source4/nbt_server/interfaces.c
@@ -28,6 +28,7 @@
#include "nbt_server/dgram/proto.h"
#include "system/network.h"
#include "lib/socket/netif.h"
+#include "param/param.h"
/*
diff --git a/source4/nbt_server/packet.c b/source4/nbt_server/packet.c
index 09b2549956..f53d355daf 100644
--- a/source4/nbt_server/packet.c
+++ b/source4/nbt_server/packet.c
@@ -23,6 +23,7 @@
#include "nbt_server/nbt_server.h"
#include "lib/socket/socket.h"
#include "librpc/gen_ndr/ndr_nbt.h"
+#include "param/param.h"
/*
we received a badly formed packet - log it
diff --git a/source4/nbt_server/query.c b/source4/nbt_server/query.c
index 4f42ec517d..30b3c5f9ce 100644
--- a/source4/nbt_server/query.c
+++ b/source4/nbt_server/query.c
@@ -26,6 +26,7 @@
#include "nbt_server/wins/winsserver.h"
#include "librpc/gen_ndr/ndr_nbt.h"
#include "lib/socket/socket.h"
+#include "param/param.h"
/*
answer a name query
diff --git a/source4/nbt_server/register.c b/source4/nbt_server/register.c
index 6b592624c3..3b81d65bd2 100644
--- a/source4/nbt_server/register.c
+++ b/source4/nbt_server/register.c
@@ -29,6 +29,7 @@
#include "nbt_server/wins/winsserver.h"
#include "librpc/gen_ndr/ndr_nbt.h"
#include "dsdb/samdb/samdb.h"
+#include "param/param.h"
static void nbtd_start_refresh_timer(struct nbtd_iface_name *iname);
diff --git a/source4/nbt_server/wins/wins_hook.c b/source4/nbt_server/wins/wins_hook.c
index e5d8b39062..e89e6b8d26 100644
--- a/source4/nbt_server/wins/wins_hook.c
+++ b/source4/nbt_server/wins/wins_hook.c
@@ -24,6 +24,7 @@
#include "nbt_server/nbt_server.h"
#include "nbt_server/wins/winsdb.h"
#include "system/filesys.h"
+#include "param/param.h"
static const char *wins_hook_action_string(enum wins_hook_action action)
{
diff --git a/source4/nbt_server/wins/wins_ldb.c b/source4/nbt_server/wins/wins_ldb.c
index 0b8856fd3b..1fa073dc0d 100644
--- a/source4/nbt_server/wins/wins_ldb.c
+++ b/source4/nbt_server/wins/wins_ldb.c
@@ -35,6 +35,7 @@
#include "lib/ldb/include/ldb_private.h"
#include "system/network.h"
#include "lib/socket/netif.h"
+#include "param/param.h"
static int wins_ldb_verify(struct ldb_module *module, struct ldb_request *req)
{
diff --git a/source4/nbt_server/wins/winsclient.c b/source4/nbt_server/wins/winsclient.c
index 3c599022d4..279462289d 100644
--- a/source4/nbt_server/wins/winsclient.c
+++ b/source4/nbt_server/wins/winsclient.c
@@ -26,6 +26,7 @@
#include "lib/events/events.h"
#include "librpc/gen_ndr/ndr_nbt.h"
#include "smbd/service_task.h"
+#include "param/param.h"
static void nbtd_wins_refresh_handler(struct composite_context *c);
diff --git a/source4/nbt_server/wins/winsdb.c b/source4/nbt_server/wins/winsdb.c
index 7b281ff831..cfaee05020 100644
--- a/source4/nbt_server/wins/winsdb.c
+++ b/source4/nbt_server/wins/winsdb.c
@@ -30,6 +30,7 @@
#include "db_wrap.h"
#include "system/network.h"
#include "lib/socket/netif.h"
+#include "param/param.h"
uint64_t winsdb_get_maxVersion(struct winsdb_handle *h)
{
diff --git a/source4/nbt_server/wins/winsserver.c b/source4/nbt_server/wins/winsserver.c
index f75250ee41..47d2540386 100644
--- a/source4/nbt_server/wins/winsserver.c
+++ b/source4/nbt_server/wins/winsserver.c
@@ -32,6 +32,7 @@
#include "lib/socket/socket.h"
#include "lib/socket/netif.h"
#include "lib/ldb/include/ldb.h"
+#include "param/param.h"
/*
work out the ttl we will use given a client requested ttl
diff --git a/source4/nsswitch/wbinfo.c b/source4/nsswitch/wbinfo.c
index 7e674fde1f..120a475bc1 100644
--- a/source4/nsswitch/wbinfo.c
+++ b/source4/nsswitch/wbinfo.c
@@ -30,6 +30,7 @@
#include "libcli/security/security.h"
#include "lib/cmdline/popt_common.h"
#include "dynconfig.h"
+#include "param/param.h"
extern int winbindd_fd;
diff --git a/source4/ntptr/ntptr_base.c b/source4/ntptr/ntptr_base.c
index d63bdb1546..5735dbe936 100644
--- a/source4/ntptr/ntptr_base.c
+++ b/source4/ntptr/ntptr_base.c
@@ -25,6 +25,7 @@
#include "includes.h"
#include "ntptr/ntptr.h"
#include "build.h"
+#include "param/param.h"
/* the list of currently registered NTPTR backends */
static struct ntptr_backend {
diff --git a/source4/ntptr/simple_ldb/ntptr_simple_ldb.c b/source4/ntptr/simple_ldb/ntptr_simple_ldb.c
index dcdaa5e94e..f0edd47206 100644
--- a/source4/ntptr/simple_ldb/ntptr_simple_ldb.c
+++ b/source4/ntptr/simple_ldb/ntptr_simple_ldb.c
@@ -35,6 +35,7 @@
#include "dsdb/samdb/samdb.h"
#include "db_wrap.h"
#include "rpc_server/common/common.h"
+#include "param/param.h"
/*
connect to the SPOOLSS database
diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c
index 4c079b36fc..d248bd7552 100644
--- a/source4/ntvfs/cifs/vfs_cifs.c
+++ b/source4/ntvfs/cifs/vfs_cifs.c
@@ -31,6 +31,7 @@
#include "auth/credentials/credentials.h"
#include "ntvfs/ntvfs.h"
#include "lib/util/dlinklist.h"
+#include "param/param.h"
struct cvfs_file {
struct cvfs_file *prev, *next;
diff --git a/source4/ntvfs/common/opendb.c b/source4/ntvfs/common/opendb.c
index 69282dd12e..63c6abd3de 100644
--- a/source4/ntvfs/common/opendb.c
+++ b/source4/ntvfs/common/opendb.c
@@ -41,6 +41,7 @@
#include "ntvfs/ntvfs.h"
#include "ntvfs/common/ntvfs_common.h"
#include "cluster/cluster.h"
+#include "param/param.h"
static const struct opendb_ops *ops;
diff --git a/source4/ntvfs/common/opendb_tdb.c b/source4/ntvfs/common/opendb_tdb.c
index 0bfe6e4eb3..0a79b79125 100644
--- a/source4/ntvfs/common/opendb_tdb.c
+++ b/source4/ntvfs/common/opendb_tdb.c
@@ -47,6 +47,7 @@
#include "ntvfs/ntvfs.h"
#include "ntvfs/common/ntvfs_common.h"
#include "cluster/cluster.h"
+#include "param/param.h"
struct odb_context {
struct tdb_wrap *w;
diff --git a/source4/ntvfs/ntvfs_base.c b/source4/ntvfs/ntvfs_base.c
index 03c5aff01c..39e4ca73ea 100644
--- a/source4/ntvfs/ntvfs_base.c
+++ b/source4/ntvfs/ntvfs_base.c
@@ -26,6 +26,7 @@
#include "lib/util/dlinklist.h"
#include "build.h"
#include "ntvfs/ntvfs.h"
+#include "param/param.h"
/* the list of currently registered NTVFS backends, note that there
* can be more than one backend with the same name, as long as they
diff --git a/source4/ntvfs/posix/pvfs_shortname.c b/source4/ntvfs/posix/pvfs_shortname.c
index 5df4a57f9c..75e474a94e 100644
--- a/source4/ntvfs/posix/pvfs_shortname.c
+++ b/source4/ntvfs/posix/pvfs_shortname.c
@@ -22,6 +22,7 @@
#include "includes.h"
#include "system/locale.h"
#include "vfs_posix.h"
+#include "param/param.h"
/*
this mangling scheme uses the following format
diff --git a/source4/ntvfs/print/vfs_print.c b/source4/ntvfs/print/vfs_print.c
index 30bb530ee9..120f88373c 100644
--- a/source4/ntvfs/print/vfs_print.c
+++ b/source4/ntvfs/print/vfs_print.c
@@ -24,6 +24,7 @@
#include "includes.h"
#include "libcli/raw/ioctl.h"
#include "ntvfs/ntvfs.h"
+#include "param/param.h"
/*
connect to a share - used when a tree_connect operation comes
diff --git a/source4/ntvfs/sysdep/inotify.c b/source4/ntvfs/sysdep/inotify.c
index afeb319b35..6fab1018ca 100644
--- a/source4/ntvfs/sysdep/inotify.c
+++ b/source4/ntvfs/sysdep/inotify.c
@@ -27,6 +27,7 @@
#include "lib/events/events.h"
#include "lib/util/dlinklist.h"
#include "libcli/raw/smb.h"
+#include "param/param.h"
#include <linux/inotify.h>
#include <asm/unistd.h>
diff --git a/source4/ntvfs/sysdep/sys_notify.c b/source4/ntvfs/sysdep/sys_notify.c
index 8d2aed7fa0..53ac7faa7e 100644
--- a/source4/ntvfs/sysdep/sys_notify.c
+++ b/source4/ntvfs/sysdep/sys_notify.c
@@ -27,6 +27,7 @@
#include "ntvfs/sysdep/sys_notify.h"
#include "lib/events/events.h"
#include "lib/util/dlinklist.h"
+#include "param/param.h"
#include "build.h"
/* list of registered backends */
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 3d12118992..83c852ace7 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -61,6 +61,7 @@
#include "smb_server/smb_server.h"
#include "libcli/raw/signing.h"
#include "lib/util/dlinklist.h"
+#include "param/param.h"
#include "param/loadparm.h"
#include "pstring.h"
diff --git a/source4/param/share.c b/source4/param/share.c
index 26173fb876..e7c00f5b35 100644
--- a/source4/param/share.c
+++ b/source4/param/share.c
@@ -22,6 +22,7 @@
#include "includes.h"
#include "param/share.h"
#include "build.h"
+#include "param/param.h"
const char *share_string_option(struct share_config *scfg, const char *opt_name, const char *defval)
{
diff --git a/source4/param/share_classic.c b/source4/param/share_classic.c
index c38e5d78df..15f52eb9f1 100644
--- a/source4/param/share_classic.c
+++ b/source4/param/share_classic.c
@@ -21,6 +21,7 @@
#include "includes.h"
#include "param/share.h"
+#include "param/param.h"
struct sclassic_snum {
int snum;
diff --git a/source4/param/share_ldb.c b/source4/param/share_ldb.c
index fe65cb7a58..586000f503 100644
--- a/source4/param/share_ldb.c
+++ b/source4/param/share_ldb.c
@@ -25,6 +25,7 @@
#include "auth/auth.h"
#include "db_wrap.h"
#include "param/share.h"
+#include "param/param.h"
static NTSTATUS sldb_init(TALLOC_CTX *mem_ctx, const struct share_ops *ops, struct share_context **ctx)
{
diff --git a/source4/param/util.c b/source4/param/util.c
index 6e6e12596b..308d4bfc2b 100644
--- a/source4/param/util.c
+++ b/source4/param/util.c
@@ -27,6 +27,7 @@
#include "system/network.h"
#include "system/filesys.h"
#include "system/dir.h"
+#include "param/param.h"
/**
* @file
@@ -38,7 +39,7 @@
see if a string matches either our primary or one of our secondary
netbios aliases. do a case insensitive match
*/
-_PUBLIC_ BOOL is_myname(const char *name)
+_PUBLIC_ bool is_myname(const char *name)
{
const char **aliases;
int i;
diff --git a/source4/rpc_server/common/server_info.c b/source4/rpc_server/common/server_info.c
index ccd2bdbad4..7ca13fcf94 100644
--- a/source4/rpc_server/common/server_info.c
+++ b/source4/rpc_server/common/server_info.c
@@ -25,6 +25,7 @@
#include "rpc_server/dcerpc_server.h"
#include "dsdb/samdb/samdb.h"
#include "auth/auth.h"
+#include "param/param.h"
/*
Here are common server info functions used by some dcerpc server interfaces
diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index 466d35c373..c3de00d8d0 100644
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -33,6 +33,7 @@
#include "system/filesys.h"
#include "libcli/security/security.h"
#include "build.h"
+#include "param/param.h"
extern const struct dcesrv_interface dcesrv_mgmt_interface;
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index 326217e63f..144e61cd75 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -32,6 +32,7 @@
#include "param/secrets.h"
#include "db_wrap.h"
#include "librpc/gen_ndr/ndr_dssetup.h"
+#include "param/param.h"
/*
this type allows us to distinguish handle types
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index 2198dc5ebc..14a724a6f6 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -32,6 +32,7 @@
#include "libcli/auth/libcli_auth.h"
#include "auth/gensec/schannel_state.h"
#include "libcli/security/security.h"
+#include "param/param.h"
struct server_pipe_state {
struct netr_Credential client_challenge;
diff --git a/source4/rpc_server/remote/dcesrv_remote.c b/source4/rpc_server/remote/dcesrv_remote.c
index 6ddffa1d6c..e51a847ee2 100644
--- a/source4/rpc_server/remote/dcesrv_remote.c
+++ b/source4/rpc_server/remote/dcesrv_remote.c
@@ -23,6 +23,7 @@
#include "auth/auth.h"
#include "auth/credentials/credentials.h"
#include "librpc/ndr/ndr_table.h"
+#include "param/param.h"
struct dcesrv_remote_private {
@@ -114,7 +115,7 @@ static NTSTATUS remote_op_bind(struct dcesrv_call_state *dce_call, const struct
static void remote_op_unbind(struct dcesrv_connection_context *context, const struct dcesrv_interface *iface)
{
- struct dcesrv_remote_private *private = context->private;
+ struct dcesrv_remote_private *private = (struct dcesrv_remote_private *)context->private;
talloc_free(private->c_pipe);
@@ -124,7 +125,7 @@ static void remote_op_unbind(struct dcesrv_connection_context *context, const st
static NTSTATUS remote_op_ndr_pull(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct ndr_pull *pull, void **r)
{
NTSTATUS status;
- const struct ndr_interface_table *table = dce_call->context->iface->private;
+ const struct ndr_interface_table *table = (const struct ndr_interface_table *)dce_call->context->iface->private;
uint16_t opnum = dce_call->pkt.u.request.opnum;
dce_call->fault_code = 0;
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index 3ac7934313..a468dc537a 100644
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -35,6 +35,7 @@
#include "libcli/security/security.h"
#include "rpc_server/samr/proto.h"
#include "db_wrap.h"
+#include "param/param.h"
/* these query macros make samr_Query[User|Group]Info a bit easier to read */
diff --git a/source4/rpc_server/service_rpc.c b/source4/rpc_server/service_rpc.c
index 6d70dd0bae..e9c56b9c17 100644
--- a/source4/rpc_server/service_rpc.c
+++ b/source4/rpc_server/service_rpc.c
@@ -38,6 +38,7 @@
#include "system/network.h"
#include "lib/socket/netif.h"
#include "build.h"
+#include "param/param.h"
struct dcesrv_socket_context {
const struct dcesrv_endpoint *endpoint;
diff --git a/source4/rpc_server/spoolss/dcesrv_spoolss.c b/source4/rpc_server/spoolss/dcesrv_spoolss.c
index cd39bcda3d..d6c8d864aa 100644
--- a/source4/rpc_server/spoolss/dcesrv_spoolss.c
+++ b/source4/rpc_server/spoolss/dcesrv_spoolss.c
@@ -29,6 +29,7 @@
#include "smbd/service_stream.h"
#include "librpc/gen_ndr/ndr_spoolss_c.h"
#include "auth/credentials/credentials.h"
+#include "param/param.h"
enum spoolss_handle {
SPOOLSS_NOTIFY
diff --git a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
index c0e1a0d2b4..6e8732f788 100644
--- a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
+++ b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c
@@ -28,6 +28,7 @@
#include "libcli/security/security.h"
#include "system/time.h"
#include "rpc_server/srvsvc/proto.h"
+#include "param/param.h"
#define SRVSVC_CHECK_ADMIN_ACCESS do { \
struct security_token *t = dce_call->conn->auth_state.session_info->security_token; \
diff --git a/source4/scripting/ejs/smbcalls.c b/source4/scripting/ejs/smbcalls.c
index bc7994a007..08b9eac5c1 100644
--- a/source4/scripting/ejs/smbcalls.c
+++ b/source4/scripting/ejs/smbcalls.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "param/param.h"
#include "scripting/ejs/smbcalls.h"
#include "build.h"
#include "version.h"
diff --git a/source4/scripting/ejs/smbcalls.h b/source4/scripting/ejs/smbcalls.h
index 77d9dd3381..3aaf324b6e 100644
--- a/source4/scripting/ejs/smbcalls.h
+++ b/source4/scripting/ejs/smbcalls.h
@@ -38,4 +38,5 @@ struct ldb_context;
struct ldb_message;
struct cli_credentials;
+#include "param/param.h"
#include "scripting/ejs/proto.h"
diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index fc26fddfd5..02b948182a 100644
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/scripting/ejs/smbcalls_cli.c
@@ -27,6 +27,7 @@
#include "libcli/smb_composite/smb_composite.h"
#include "libcli/libcli.h"
#include "auth/credentials/credentials.h"
+#include "param/param.h"
#if 0
diff --git a/source4/scripting/ejs/smbcalls_config.c b/source4/scripting/ejs/smbcalls_config.c
index 6f15ee5a4a..b31b70bda8 100644
--- a/source4/scripting/ejs/smbcalls_config.c
+++ b/source4/scripting/ejs/smbcalls_config.c
@@ -25,6 +25,7 @@
#include "param/loadparm.h"
#include "system/network.h"
#include "lib/socket/netif.h"
+#include "param/param.h"
/*
return a list of defined services
diff --git a/source4/scripting/ejs/smbcalls_param.c b/source4/scripting/ejs/smbcalls_param.c
index afdee28a65..0e7a83457a 100644
--- a/source4/scripting/ejs/smbcalls_param.c
+++ b/source4/scripting/ejs/smbcalls_param.c
@@ -20,9 +20,9 @@
*/
#include "includes.h"
+#include "param/param.h"
#include "scripting/ejs/smbcalls.h"
#include "lib/appweb/ejs/ejs.h"
-#include "param/param.h"
/*
get parameter
diff --git a/source4/smb_server/smb/negprot.c b/source4/smb_server/smb/negprot.c
index 95411943a1..f5ae0aa507 100644
--- a/source4/smb_server/smb/negprot.c
+++ b/source4/smb_server/smb/negprot.c
@@ -27,6 +27,7 @@
#include "smb_server/service_smb_proto.h"
#include "smbd/service_stream.h"
#include "lib/stream/packet.h"
+#include "param/param.h"
/* initialise the auth_context for this server and return the cryptkey */
diff --git a/source4/smb_server/smb/receive.c b/source4/smb_server/smb/receive.c
index caa977c4f2..b29b86e6ea 100644
--- a/source4/smb_server/smb/receive.c
+++ b/source4/smb_server/smb/receive.c
@@ -26,6 +26,7 @@
#include "smb_server/service_smb_proto.h"
#include "ntvfs/ntvfs.h"
#include "system/filesys.h"
+#include "param/param.h"
/*
diff --git a/source4/smb_server/smb/service.c b/source4/smb_server/smb/service.c
index c159eb3b88..8a99223d8b 100644
--- a/source4/smb_server/smb/service.c
+++ b/source4/smb_server/smb/service.c
@@ -21,6 +21,8 @@
#include "smb_server/smb_server.h"
#include "smbd/service_stream.h"
#include "ntvfs/ntvfs.h"
+#include "param/share.h"
+#include "param/param.h"
/****************************************************************************
Make a connection, given the snum to connect to, and the vuser of the
diff --git a/source4/smb_server/smb/sesssetup.c b/source4/smb_server/smb/sesssetup.c
index 6470060286..b3664ab7fe 100644
--- a/source4/smb_server/smb/sesssetup.c
+++ b/source4/smb_server/smb/sesssetup.c
@@ -30,6 +30,7 @@
#include "smb_server/smb_server.h"
#include "smbd/service_stream.h"
#include "librpc/gen_ndr/nbt.h"
+#include "param/param.h"
/*
setup the OS, Lanman and domain portions of a session setup reply
diff --git a/source4/smb_server/smb/signing.c b/source4/smb_server/smb/signing.c
index 7b7f03f8d3..120bc01c3e 100644
--- a/source4/smb_server/smb/signing.c
+++ b/source4/smb_server/smb/signing.c
@@ -20,6 +20,7 @@
#include "includes.h"
#include "smb_server/smb_server.h"
#include "libcli/raw/libcliraw.h"
+#include "param/param.h"
/*
diff --git a/source4/smb_server/smb2/receive.c b/source4/smb_server/smb2/receive.c
index a8c0e6f786..6a36d2f365 100644
--- a/source4/smb_server/smb2/receive.c
+++ b/source4/smb_server/smb2/receive.c
@@ -28,6 +28,7 @@
#include "smbd/service_stream.h"
#include "lib/stream/packet.h"
#include "ntvfs/ntvfs.h"
+#include "param/param.h"
static int smb2srv_request_destructor(struct smb2srv_request *req)
{
diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c
index e4a9f982cd..3ac7ca5ede 100644
--- a/source4/smb_server/smb_server.c
+++ b/source4/smb_server/smb_server.c
@@ -32,6 +32,7 @@
#include "lib/socket/netif.h"
#include "param/share.h"
#include "dsdb/samdb/samdb.h"
+#include "param/param.h"
static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob)
{
diff --git a/source4/smbd/pidfile.c b/source4/smbd/pidfile.c
index fdb502d41d..167555fd28 100644
--- a/source4/smbd/pidfile.c
+++ b/source4/smbd/pidfile.c
@@ -21,6 +21,7 @@
#include "includes.h"
#include "system/filesys.h"
+#include "param/param.h"
/**
* @file
diff --git a/source4/smbd/process_model.c b/source4/smbd/process_model.c
index f83c7b784b..e11e6193fe 100644
--- a/source4/smbd/process_model.c
+++ b/source4/smbd/process_model.c
@@ -21,6 +21,7 @@
#include "includes.h"
#include "smbd/process_model.h"
#include "build.h"
+#include "param/param.h"
/*
setup the events for the chosen process model
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 78f39f7fa7..93f6f03be5 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -39,6 +39,7 @@
#include "param/secrets.h"
#include "smbd/pidfile.h"
#include "cluster/ctdb/ctdb_cluster.h"
+#include "param/param.h"
/*
recursively delete a directory tree
diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c
index 5117697f87..84aebc9ce9 100644
--- a/source4/smbd/service_stream.c
+++ b/source4/smbd/service_stream.c
@@ -28,6 +28,7 @@
#include "smbd/service_stream.h"
#include "lib/messaging/irpc.h"
#include "cluster/cluster.h"
+#include "param/param.h"
/* the range of ports to try for dcerpc over tcp endpoints */
#define SERVER_TCP_LOW_PORT 1024
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"
/**
diff --git a/source4/utils/net/net_join.c b/source4/utils/net/net_join.c
index 98bf19d234..59b35d70fa 100644
--- a/source4/utils/net/net_join.c
+++ b/source4/utils/net/net_join.c
@@ -23,6 +23,7 @@
#include "utils/net/net.h"
#include "libnet/libnet.h"
#include "libcli/security/security.h"
+#include "param/param.h"
int net_join(struct net_context *ctx, int argc, const char **argv)
{
diff --git a/source4/utils/ntlm_auth.c b/source4/utils/ntlm_auth.c
index 9659541319..8775bab2db 100644
--- a/source4/utils/ntlm_auth.c
+++ b/source4/utils/ntlm_auth.c
@@ -37,6 +37,7 @@
#include "lib/messaging/messaging.h"
#include "lib/messaging/irpc.h"
#include "auth/ntlmssp/ntlmssp.h"
+#include "param/param.h"
#define INITIAL_BUFFER_SIZE 300
#define MAX_BUFFER_SIZE 63000
diff --git a/source4/utils/testparm.c b/source4/utils/testparm.c
index 886b51300f..e0ebe48d63 100644
--- a/source4/utils/testparm.c
+++ b/source4/utils/testparm.c
@@ -36,6 +36,7 @@
#include "system/filesys.h"
#include "lib/cmdline/popt_common.h"
#include "lib/socket/socket.h"
+#include "param/param.h"
/***********************************************
diff --git a/source4/web_server/http.c b/source4/web_server/http.c
index 502d5de2d0..985f1c0408 100644
--- a/source4/web_server/http.c
+++ b/source4/web_server/http.c
@@ -32,6 +32,7 @@
#include "lib/util/dlinklist.h"
#include "lib/tls/tls.h"
#include "scripting/ejs/smbcalls.h"
+#include "param/param.h"
#define SAMBA_SESSION_KEY "SambaSessionId"
#define HTTP_PREAUTH_URI "/scripting/preauth.esp"
diff --git a/source4/web_server/web_server.c b/source4/web_server/web_server.c
index f9031433d3..efad8b6512 100644
--- a/source4/web_server/web_server.c
+++ b/source4/web_server/web_server.c
@@ -29,6 +29,7 @@
#include "system/network.h"
#include "lib/socket/netif.h"
#include "lib/tls/tls.h"
+#include "param/param.h"
/* don't allow connections to hang around forever */
#define HTTP_TIMEOUT 120
diff --git a/source4/winbind/wb_cmd_getpwnam.c b/source4/winbind/wb_cmd_getpwnam.c
index b1933aa2c5..86488d964b 100644
--- a/source4/winbind/wb_cmd_getpwnam.c
+++ b/source4/winbind/wb_cmd_getpwnam.c
@@ -27,7 +27,7 @@
#include "smbd/service_task.h"
#include "nsswitch/winbindd_nss.h"
#include "libnet/libnet_proto.h"
-#include "param/proto.h"
+#include "param/param.h"
#include "libcli/security/proto.h"
struct cmd_getpwnam_state {
diff --git a/source4/winbind/wb_cmd_getpwuid.c b/source4/winbind/wb_cmd_getpwuid.c
index 1a59b5486e..63a71b02cc 100644
--- a/source4/winbind/wb_cmd_getpwuid.c
+++ b/source4/winbind/wb_cmd_getpwuid.c
@@ -27,7 +27,7 @@
#include "smbd/service_task.h"
#include "nsswitch/winbindd_nss.h"
#include "libnet/libnet_proto.h"
-#include "param/proto.h"
+#include "param/param.h"
#include "libcli/security/proto.h"
#include "auth/credentials/credentials.h"
diff --git a/source4/winbind/wb_dom_info.c b/source4/winbind/wb_dom_info.c
index 5ec8f1a159..f07daaec9a 100644
--- a/source4/winbind/wb_dom_info.c
+++ b/source4/winbind/wb_dom_info.c
@@ -30,6 +30,7 @@
#include "librpc/gen_ndr/samr.h"
#include "lib/messaging/irpc.h"
#include "libcli/finddcs.h"
+#include "param/param.h"
struct get_dom_info_state {
struct composite_context *ctx;
diff --git a/source4/winbind/wb_dom_info_trusted.c b/source4/winbind/wb_dom_info_trusted.c
index 9982a16d74..c5e6383c5c 100644
--- a/source4/winbind/wb_dom_info_trusted.c
+++ b/source4/winbind/wb_dom_info_trusted.c
@@ -27,6 +27,7 @@
#include "smbd/service_task.h"
#include "librpc/gen_ndr/ndr_netlogon_c.h"
#include "libcli/libcli.h"
+#include "param/param.h"
struct trusted_dom_info_state {
struct composite_context *ctx;
diff --git a/source4/winbind/wb_init_domain.c b/source4/winbind/wb_init_domain.c
index da03f0d406..21fbb6a2b7 100644
--- a/source4/winbind/wb_init_domain.c
+++ b/source4/winbind/wb_init_domain.c
@@ -38,6 +38,7 @@
#include "libcli/ldap/ldap_client.h"
#include "auth/credentials/credentials.h"
+#include "param/param.h"
/*
* Initialize a domain:
diff --git a/source4/winbind/wb_pam_auth.c b/source4/winbind/wb_pam_auth.c
index 4874254eff..ef19c32331 100644
--- a/source4/winbind/wb_pam_auth.c
+++ b/source4/winbind/wb_pam_auth.c
@@ -29,6 +29,7 @@
#include "librpc/gen_ndr/ndr_netlogon.h"
#include "librpc/gen_ndr/ndr_netlogon_c.h"
#include "librpc/gen_ndr/winbind.h"
+#include "param/param.h"
/* Oh, there is so much to keep an eye on when authenticating a user. Oh my! */
struct pam_auth_crap_state {
diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c
index af361794ed..a86fc3d3a2 100644
--- a/source4/winbind/wb_samba3_cmd.c
+++ b/source4/winbind/wb_samba3_cmd.c
@@ -31,6 +31,7 @@
#include "librpc/gen_ndr/netlogon.h"
#include "libcli/security/security.h"
#include "auth/pam_errors.h"
+#include "param/param.h"
/*
Send off the reply to an async Samba3 query, handling filling in the PAM, NTSTATUS and string errors.
diff --git a/source4/winbind/wb_server.c b/source4/winbind/wb_server.c
index 3793275aa3..8a3f9e3154 100644
--- a/source4/winbind/wb_server.c
+++ b/source4/winbind/wb_server.c
@@ -31,6 +31,7 @@
#include "lib/stream/packet.h"
#include "smbd/service.h"
#include "param/secrets.h"
+#include "param/param.h"
void wbsrv_terminate_connection(struct wbsrv_connection *wbconn, const char *reason)
{
diff --git a/source4/winbind/wb_sid2domain.c b/source4/winbind/wb_sid2domain.c
index 257a1afdc0..d813df00d1 100644
--- a/source4/winbind/wb_sid2domain.c
+++ b/source4/winbind/wb_sid2domain.c
@@ -26,6 +26,7 @@
#include "winbind/wb_async_helpers.h"
#include "libcli/security/security.h"
#include "lib/util/dlinklist.h"
+#include "param/param.h"
static struct wbsrv_domain *find_domain_from_sid(struct wbsrv_service *service,
const struct dom_sid *sid)
diff --git a/source4/winbind/wb_utils.c b/source4/winbind/wb_utils.c
index 5938bb391d..b9d46af8c2 100644
--- a/source4/winbind/wb_utils.c
+++ b/source4/winbind/wb_utils.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "param/param.h"
/* Split a domain\\user string into it's parts, because the client supplies it
diff --git a/source4/wrepl_server/wrepl_in_connection.c b/source4/wrepl_server/wrepl_in_connection.c
index 9b0f5522e5..e90c6fddfb 100644
--- a/source4/wrepl_server/wrepl_in_connection.c
+++ b/source4/wrepl_server/wrepl_in_connection.c
@@ -31,6 +31,7 @@
#include "smbd/process_model.h"
#include "system/network.h"
#include "lib/socket/netif.h"
+#include "param/param.h"
void wreplsrv_terminate_in_connection(struct wreplsrv_in_connection *wreplconn, const char *reason)
{
diff --git a/source4/wrepl_server/wrepl_server.c b/source4/wrepl_server/wrepl_server.c
index dfbc97a6b7..6ac7fed0cc 100644
--- a/source4/wrepl_server/wrepl_server.c
+++ b/source4/wrepl_server/wrepl_server.c
@@ -31,6 +31,7 @@
#include "ldb/include/ldb_errors.h"
#include "auth/auth.h"
#include "db_wrap.h"
+#include "param/param.h"
static struct ldb_context *wins_config_db_connect(TALLOC_CTX *mem_ctx)
{