Remove unused include param/param.h.

diff --git a/lib/util/charset/iconv.c b/lib/util/charset/iconv.c
index 150383e7f9ebf7b316b6c87b043a8b3ee33a3b38..a01b6a5787f28e31dc34b5bcbb6397c961dba964 100644 (file)
--- a/lib/util/charset/iconv.c
+++ b/lib/util/charset/iconv.c
@@ -22,7 +22,6 @@
 #include "../lib/util/dlinklist.h"
 #include "system/iconv.h"
 #include "system/filesys.h"
-#include "param/param.h"
 
 
 /**

diff --git a/lib/util/ms_fnmatch.c b/lib/util/ms_fnmatch.c
index dde35268eb4b37f695fa32d6ca44577ee283cfd1..73fb0e09668dc90e9e6236c36c702c66222d3305 100644 (file)
--- a/lib/util/ms_fnmatch.c
+++ b/lib/util/ms_fnmatch.c
@@ -29,7 +29,6 @@
  */
 
 #include "includes.h"
-#include "param/param.h"
 
 static int null_match(const char *p)
 {

diff --git a/libcli/nbt/namequery.c b/libcli/nbt/namequery.c
index ed3d8a24925bbf535bee3fa573dccb005dfc7a32..e344235faa8fd8f8ec470c3b854a7b96317375c0 100644 (file)
--- a/libcli/nbt/namequery.c
+++ b/libcli/nbt/namequery.c
@@ -23,7 +23,6 @@
 #include "../libcli/nbt/libnbt.h"
 #include "../libcli/nbt/nbt_proto.h"
 #include "lib/socket/socket.h"
-#include "param/param.h"
 
 /**
   send a nbt name query

diff --git a/libcli/nbt/namerefresh.c b/libcli/nbt/namerefresh.c
index 77f9cbd45c39c908e35ee8d5421bd31102612b47..ec63df9bf659a74ed2f57933faf369c8152da865 100644 (file)
--- a/libcli/nbt/namerefresh.c
+++ b/libcli/nbt/namerefresh.c
@@ -24,7 +24,6 @@
 #include "../libcli/nbt/nbt_proto.h"
 #include "libcli/composite/composite.h"
 #include "lib/socket/socket.h"
-#include "param/param.h"
 
 /*
   send a nbt name refresh request

diff --git a/libcli/nbt/nameregister.c b/libcli/nbt/nameregister.c
index d9e616feccb816dc07923def29fc8df186988a4d..39ef05640a8883842fdb5523772aba651d9a1d08 100644 (file)
--- a/libcli/nbt/nameregister.c
+++ b/libcli/nbt/nameregister.c
@@ -25,7 +25,6 @@
 #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/libcli/nbt/namerelease.c b/libcli/nbt/namerelease.c
index e57a2f396e8705f7e1fc50e73b2561e747e78dc5..8f4698169d803e25ef4b310f0b91f978d5e9d5ed 100644 (file)
--- a/libcli/nbt/namerelease.c
+++ b/libcli/nbt/namerelease.c
@@ -23,7 +23,6 @@
 #include "../libcli/nbt/libnbt.h"
 #include "../libcli/nbt/nbt_proto.h"
 #include "lib/socket/socket.h"
-#include "param/param.h"
 
 /*
   send a nbt name release request

diff --git a/source4/auth/kerberos/kerberos_pac.c b/source4/auth/kerberos/kerberos_pac.c
index 2943e05b18e85c754e1263040546aa0897c3bbfb..7a36c9ddea79a410c2c34575efd367289bdac16a 100644 (file)
--- a/source4/auth/kerberos/kerberos_pac.c
+++ b/source4/auth/kerberos/kerberos_pac.c
@@ -30,7 +30,6 @@
 #include "librpc/gen_ndr/ndr_krb5pac.h"
 #include "lib/ldb/include/ldb.h"
 #include "auth/auth_sam_reply.h"
-#include "param/param.h"
 
 krb5_error_code check_pac_checksum(TALLOC_CTX *mem_ctx, 
                                   DATA_BLOB pac_data,

diff --git a/source4/auth/ntlmssp/ntlmssp_parse.c b/source4/auth/ntlmssp/ntlmssp_parse.c
index cd270590f15547cfa4e5f45788811c0803821d15..24f3ad27afd135af1dc05cbd1de89825b7f7c112 100644 (file)
--- a/source4/auth/ntlmssp/ntlmssp_parse.c
+++ b/source4/auth/ntlmssp/ntlmssp_parse.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "param/param.h"
 #include "auth/ntlmssp/msrpc_parse.h"
 
 /*

diff --git a/source4/auth/ntlmssp/ntlmssp_sign.c b/source4/auth/ntlmssp/ntlmssp_sign.c
index 47d7a2104a648a64d70f44f149c5735a5d497fdf..3a07d7e7bd48ec907074225cc448dc6102014bfd 100644 (file)
--- a/source4/auth/ntlmssp/ntlmssp_sign.c
+++ b/source4/auth/ntlmssp/ntlmssp_sign.c
@@ -26,7 +26,6 @@
 #include "../lib/crypto/crypto.h"
 #include "auth/credentials/credentials.h"
 #include "auth/gensec/gensec.h"
-#include "param/param.h"
 
 #define CLI_SIGN "session key to client-to-server signing key magic constant"
 #define CLI_SEAL "session key to client-to-server sealing key magic constant"

diff --git a/source4/dsdb/samdb/ldb_modules/instancetype.c b/source4/dsdb/samdb/ldb_modules/instancetype.c
index 492ef1c92b6b591733f1eff9410c31aaf06b9f5f..a8c45dee4cbbf0cabb727510aa83a3de77a6bfde 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/instancetype.c
+++ b/source4/dsdb/samdb/ldb_modules/instancetype.c
@@ -37,7 +37,6 @@
 #include "includes.h"
 #include "ldb/include/ldb_includes.h"
 #include "librpc/gen_ndr/ndr_misc.h"
-#include "param/param.h"
 #include "dsdb/samdb/samdb.h"
 #include "dsdb/common/flags.h"
 

diff --git a/source4/dsdb/samdb/ldb_modules/update_keytab.c b/source4/dsdb/samdb/ldb_modules/update_keytab.c
index 8eb49b5792e143e41fefa5d5306928af1fc39fc7..7b82763403e030a4b1420d140a68d7e40b004459 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/update_keytab.c
+++ b/source4/dsdb/samdb/ldb_modules/update_keytab.c
@@ -32,7 +32,6 @@
 #include "auth/credentials/credentials.h"
 #include "auth/credentials/credentials_krb5.h"
 #include "system/kerberos.h"
-#include "param/param.h"
 
 struct dn_list {
        struct cli_credentials *creds;

diff --git a/source4/dsdb/schema/schema_syntax.c b/source4/dsdb/schema/schema_syntax.c
index 6ba123fc18e87920351babdb2f007ae8c5ab8e15..e0e6b3fc77c3def133817be6340a41fd0c66f2f6 100644 (file)
--- a/source4/dsdb/schema/schema_syntax.c
+++ b/source4/dsdb/schema/schema_syntax.c
@@ -27,7 +27,6 @@
 #include "system/time.h"
 #include "../lib/util/charset/charset.h"
 #include "librpc/ndr/libndr.h"
-#include "param/param.h"
 
 static WERROR dsdb_syntax_FOOBAR_drsuapi_to_ldb(const struct dsdb_schema *schema,
                                                const struct dsdb_attribute *attr,

diff --git a/source4/include/includes.h b/source4/include/includes.h
index 7b623120a92e681fd084ad15a90207cf96aa7ce4..6065cfc17cdb8e1f5df6b47b3322b994276fbf2d 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -55,10 +55,4 @@
 #define TALLOC_ABORT(reason) smb_panic(reason)
 #endif
 
-/* this needs to be a string which is not in the C library. We
-   previously used "init_module", but that meant that modules which
-   did not define this function ended up calling the C library
-   function init_module() which makes a system call */
-#define SAMBA_INIT_MODULE "samba_init_module"
-
 #endif /* _INCLUDES_H */

diff --git a/source4/kdc/pac-glue.c b/source4/kdc/pac-glue.c
index cbdbb86b1f5ccd6b41ecb5cc38c01c8d7f0d92c5..3f1c1fc63ef2cf9cca62160598d0ae88310995c9 100644 (file)
--- a/source4/kdc/pac-glue.c
+++ b/source4/kdc/pac-glue.c
@@ -28,7 +28,6 @@
 #include "auth/auth.h"
 #include "auth/auth_sam.h"
 #include "auth/auth_sam_reply.h"
-#include "param/param.h"
 #include "kdc/kdc.h"
 
 struct krb5_dh_moduli;

diff --git a/source4/lib/ldb/ldb_ildap/ldb_ildap.c b/source4/lib/ldb/ldb_ildap/ldb_ildap.c
index 4aa71e603672b6a77a6f1632e3ad8b2bf85b6772..93e81d42449cbb1f35c135f1cf567d7735b9f062 100644 (file)
--- a/source4/lib/ldb/ldb_ildap/ldb_ildap.c
+++ b/source4/lib/ldb/ldb_ildap/ldb_ildap.c
@@ -49,7 +49,6 @@
 #include "libcli/ldap/ldap_client.h"
 #include "auth/auth.h"
 #include "auth/credentials/credentials.h"
-#include "param/param.h"
 
 struct ildb_private {
        struct ldap_connection *ldap;

diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index dcc29180cc1a7be4897550765f1fc544fdc06811..ff9ef8afc5c9cfa3f576f7cf967fbeca3681836b 100644 (file)
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -33,7 +33,6 @@
 #include "../tdb/include/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/patchfile.c b/source4/lib/registry/patchfile.c
index 06db3b36baa32033b12b7b6fa0eeedb9b0e1280f..925806985e1bab27acf316b0a316f29a0cdab921 100644 (file)
--- a/source4/lib/registry/patchfile.c
+++ b/source4/lib/registry/patchfile.c
@@ -23,7 +23,6 @@
 #include "includes.h"
 #include "lib/registry/registry.h"
 #include "system/filesys.h"
-#include "param/param.h"
 
 
 _PUBLIC_ WERROR reg_preg_diff_load(int fd,

diff --git a/source4/lib/registry/patchfile_dotreg.c b/source4/lib/registry/patchfile_dotreg.c
index 1bc9c607536a9d732b0f0758e4cf798b039742ba..3b5708978ddfa0d3e9233221459e0b916e66298a 100644 (file)
--- a/source4/lib/registry/patchfile_dotreg.c
+++ b/source4/lib/registry/patchfile_dotreg.c
@@ -25,7 +25,6 @@
 #include "includes.h"
 #include "lib/registry/registry.h"
 #include "system/filesys.h"
-#include "param/param.h"
 
 /**
  * @file

diff --git a/source4/lib/registry/patchfile_preg.c b/source4/lib/registry/patchfile_preg.c
index bb46495c19c5a21e180cc4bd934c25d3b5e6d1e6..26b57e4f45067412697b5edb2835097a37fbf355 100644 (file)
--- a/source4/lib/registry/patchfile_preg.c
+++ b/source4/lib/registry/patchfile_preg.c
@@ -22,7 +22,6 @@
 #include "includes.h"
 #include "lib/registry/registry.h"
 #include "system/filesys.h"
-#include "param/param.h"
 #include "librpc/gen_ndr/winreg.h"
 
 struct preg_data {
@@ -48,7 +47,7 @@ static WERROR preg_write_utf16(struct smb_iconv_convenience *ic, int fd, const c
        size_t size;
 
        for (i = 0; i < strlen(string); i+=size) {
-               v = next_codepoint(ic, &string[i], &size);
+               v = next_codepoint_convenience(ic, &string[i], &size);
                if (write(fd, &v, 2) < 2) {
                        return WERR_GENERAL_FAILURE;
                }

diff --git a/source4/lib/registry/regf.c b/source4/lib/registry/regf.c
index dd3ff47b78103563193de1cfb40b6875f31246b6..a869ed44404f81014e431f594db7eed22d0b9882 100644 (file)
--- a/source4/lib/registry/regf.c
+++ b/source4/lib/registry/regf.c
@@ -23,7 +23,6 @@
 #include "lib/registry/tdr_regf.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "librpc/gen_ndr/winreg.h"
-#include "param/param.h"
 #include "lib/registry/registry.h"
 #include "libcli/security/security.h"
 

diff --git a/source4/lib/registry/util.c b/source4/lib/registry/util.c
index 471c42500278579613d935f2e51e203a4e54c2ca..38f994f386c4a2ff675170be85417c3fde2ed314 100644 (file)
--- a/source4/lib/registry/util.c
+++ b/source4/lib/registry/util.c
@@ -20,7 +20,6 @@
 #include "includes.h"
 #include "lib/registry/registry.h"
 #include "librpc/gen_ndr/winreg.h"
-#include "param/param.h"
 
 /**
  * @file

diff --git a/source4/lib/socket/connect.c b/source4/lib/socket/connect.c
index 773bf4187358f127fd3269b2b6c70ed4b3ea9d42..2b64668b9b81d0c9aabf8c2269d07a20efc77475 100644 (file)
--- a/source4/lib/socket/connect.c
+++ b/source4/lib/socket/connect.c
@@ -26,7 +26,6 @@
 #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 2f736a4b05027f256d508cf20d97ee13d2da3279..98b4d405b321a18d89bad974473dc5db671e1e60 100644 (file)
--- a/source4/lib/socket/connect_multi.c
+++ b/source4/lib/socket/connect_multi.c
@@ -26,7 +26,6 @@
 #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 524aa096554d3c5f9ffb140ff3d552949aafd0e7..af81804911f192014608ed516f2dbcb45113aade 100644 (file)
--- a/source4/lib/socket/interface.c
+++ b/source4/lib/socket/interface.c
@@ -23,7 +23,6 @@
 #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/tdr/tdr.c b/source4/lib/tdr/tdr.c
index fd5f3cac6007af8aac55dc2d066153a35ae59db3..2d1d1ca7e19135ef3bab7b2c305a1b5d2d1ce7bc 100644 (file)
--- a/source4/lib/tdr/tdr.c
+++ b/source4/lib/tdr/tdr.c
@@ -24,7 +24,6 @@
 #include "system/filesys.h"
 #include "system/network.h"
 #include "tdr/tdr.h"
-#include "param/param.h"
 
 #define TDR_BASE_MARSHALL_SIZE 1024
 

diff --git a/source4/lib/wmi/wmicore.c b/source4/lib/wmi/wmicore.c
index 3ac6c89292b9a8ce000580d440b04696be27401a..a853f26035a4a74070ebed0fb3a02a09ac2e7991 100644 (file)
--- a/source4/lib/wmi/wmicore.c
+++ b/source4/lib/wmi/wmicore.c
@@ -26,7 +26,6 @@
 #include "librpc/gen_ndr/com_wmi.h"
 #include "librpc/rpc/dcerpc.h"
 #include "librpc/ndr/ndr_table.h"
-#include "param/param.h"
 
 struct IWbemServices;
 struct IWbemContext;

diff --git a/source4/libcli/auth/smbencrypt.c b/source4/libcli/auth/smbencrypt.c
index 2803aaff5e3bbb82f1eb46ecc94d090f21c02847..b902dddb0f7f328a35d3bd4b6fc88267c76a076b 100644 (file)
--- a/source4/libcli/auth/smbencrypt.c
+++ b/source4/libcli/auth/smbencrypt.c
@@ -27,7 +27,6 @@
 #include "auth/ntlmssp/msrpc_parse.h"
 #include "../lib/crypto/crypto.h"
 #include "libcli/auth/libcli_auth.h"
-#include "param/param.h"
 
 /*
    This implements the X/Open SMB password encryption

diff --git a/source4/libcli/cldap/cldap.c b/source4/libcli/cldap/cldap.c
index 9f1a1595732bf83b349575fd9b7dacc6b3a5ff86..129a80f9acc20fad61272e5e922c552a2556a053 100644 (file)
--- a/source4/libcli/cldap/cldap.c
+++ b/source4/libcli/cldap/cldap.c
@@ -40,7 +40,6 @@
 #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 1b3d2c98c95110fea0cdf0a055097fb8257af011..e1f5e9ab50dade7f1d99d422d274f7d6f3f737f8 100644 (file)
--- a/source4/libcli/cliconnect.c
+++ b/source4/libcli/cliconnect.c
@@ -26,7 +26,6 @@
 #include "libcli/raw/raw_proto.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/dgramsocket.c b/source4/libcli/dgram/dgramsocket.c
index 18bfd689d26c3374afd2fd4e8b003722f74f4d91..9d00623081640f8cec98a5e5507baa4d24936f84 100644 (file)
--- a/source4/libcli/dgram/dgramsocket.c
+++ b/source4/libcli/dgram/dgramsocket.c
@@ -24,7 +24,6 @@
 #include "../lib/util/dlinklist.h"
 #include "libcli/dgram/libdgram.h"
 #include "lib/socket/socket.h"
-#include "param/param.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 
 

diff --git a/source4/libcli/dgram/mailslot.c b/source4/libcli/dgram/mailslot.c
index e613dd9228d69bfc7723b064c9b61a5e2adbd7c5..3bd587aa54b1623d768f2eebc809eadf23f2f535 100644 (file)
--- a/source4/libcli/dgram/mailslot.c
+++ b/source4/libcli/dgram/mailslot.c
@@ -36,7 +36,6 @@
 #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 b37d4a2ee6ce97eb9113e0c7ffe06099b6126ae2..26b00bdafd5949dffccb7323ce9cf130778e4724 100644 (file)
--- a/source4/libcli/dgram/netlogon.c
+++ b/source4/libcli/dgram/netlogon.c
@@ -24,7 +24,6 @@
 #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/finddcs.c b/source4/libcli/finddcs.c
index f12f1ac80593434801e144ac2105e1d8e1fd2531..5352a3a90a902a3f17dab495887df6e79a72a5e8 100644 (file)
--- a/source4/libcli/finddcs.c
+++ b/source4/libcli/finddcs.c
@@ -28,7 +28,6 @@
 #include "libcli/libcli.h"
 #include "libcli/resolve/resolve.h"
 #include "libcli/finddcs.h"
-#include "param/param.h"
 
 struct finddcs_state {
        struct composite_context *ctx;

diff --git a/source4/libcli/raw/clisession.c b/source4/libcli/raw/clisession.c
index 38d8f700f234d04849c3c87ce0f0158beba0dd6a..41765bfb2b2fa036968d00fd3adb6642f46afc4c 100644 (file)
--- a/source4/libcli/raw/clisession.c
+++ b/source4/libcli/raw/clisession.c
@@ -23,7 +23,6 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"
 #include "system/filesys.h"
-#include "param/param.h"
 
 #define SETUP_REQUEST_SESSION(cmd, wct, buflen) do { \
        req = smbcli_request_setup_session(session, cmd, wct, buflen); \

diff --git a/source4/libcli/raw/clitransport.c b/source4/libcli/raw/clitransport.c
index 1dc5e4e766c55e0eb65e907e4344c437dd37e92a..502ecc18253987843d92e3356337ab1e3a5432eb 100644 (file)
--- a/source4/libcli/raw/clitransport.c
+++ b/source4/libcli/raw/clitransport.c
@@ -27,7 +27,6 @@
 #include "lib/events/events.h"
 #include "lib/stream/packet.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
-#include "param/param.h"
 #include "../libcli/nbt/libnbt.h"
 
 

diff --git a/source4/libcli/raw/clitree.c b/source4/libcli/raw/clitree.c
index 08f611941d6badc28ba4dc49e9f80df4da4fbba5..61cbfa7ecb0be706c03144bf983f8b58e69c59be 100644 (file)
--- a/source4/libcli/raw/clitree.c
+++ b/source4/libcli/raw/clitree.c
@@ -24,7 +24,6 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.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/rawacl.c b/source4/libcli/raw/rawacl.c
index 466b94f4a9377fb8eb25a69d6edd2261ffa0158d..e13ba85361d02fdb44804fb33a3ad2be2cb3539d 100644 (file)
--- a/source4/libcli/raw/rawacl.c
+++ b/source4/libcli/raw/rawacl.c
@@ -22,7 +22,6 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#include "param/param.h"
 
 /****************************************************************************
 fetch file ACL (async send)

diff --git a/source4/libcli/raw/rawfileinfo.c b/source4/libcli/raw/rawfileinfo.c
index c3c5f3614b0ee759512409e4d32191325c15303b..34fa4365ca18ca17442d5c5cb4aca93174e5acef 100644 (file)
--- a/source4/libcli/raw/rawfileinfo.c
+++ b/source4/libcli/raw/rawfileinfo.c
@@ -23,7 +23,6 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#include "param/param.h"
 
 /* local macros to make the code more readable */
 #define FINFO_CHECK_MIN_SIZE(size) if (blob->length < (size)) { \

diff --git a/source4/libcli/raw/rawnegotiate.c b/source4/libcli/raw/rawnegotiate.c
index f0de4b48bde7d99d2f6843a45ed09aae7d1e1c1f..dedc891ac123f8fd4c50c792bbc14417f83d38a6 100644 (file)
--- a/source4/libcli/raw/rawnegotiate.c
+++ b/source4/libcli/raw/rawnegotiate.c
@@ -24,7 +24,6 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"
 #include "system/time.h"
-#include "param/param.h"
 
 static const struct {
        enum protocol_types prot;

diff --git a/source4/libcli/raw/rawrequest.c b/source4/libcli/raw/rawrequest.c
index 6d2565851c0b55ead0719a8f5876b86e915ba9f1..a257e3d0f1a1d716d65359fd668cf34d1502f50b 100644 (file)
--- a/source4/libcli/raw/rawrequest.c
+++ b/source4/libcli/raw/rawrequest.c
@@ -27,7 +27,6 @@
 #include "libcli/raw/raw_proto.h"
 #include "../lib/util/dlinklist.h"
 #include "lib/events/events.h"
-#include "param/param.h"
 #include "librpc/ndr/libndr.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 

diff --git a/source4/libcli/raw/smb_signing.c b/source4/libcli/raw/smb_signing.c
index e798f052ba182db970dfc17f036affe1674ca743..9f94039078300ffa6cda936d4fbf38ec5b66f352 100644 (file)
--- a/source4/libcli/raw/smb_signing.c
+++ b/source4/libcli/raw/smb_signing.c
@@ -24,7 +24,6 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.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/resolve.c b/source4/libcli/resolve/resolve.c
index 7f4ae4d79f1082f00f3aaf23be580dfb8c5f0b49..f57f231bc03ef633e9dec3f2f847898cd11b6a0e 100644 (file)
--- a/source4/libcli/resolve/resolve.c
+++ b/source4/libcli/resolve/resolve.c
@@ -25,7 +25,6 @@
 #include "libcli/composite/composite.h"
 #include "libcli/resolve/resolve.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
-#include "param/param.h"
 #include "system/network.h"
 #include "../lib/util/dlinklist.h"
 

diff --git a/source4/libcli/smb2/request.c b/source4/libcli/smb2/request.c
index 0104d8e097a761b72711ff316b731a25162f2bf9..9dcc415b7c96770e97dc4ed4f07fefc40a613ed6 100644 (file)
--- a/source4/libcli/smb2/request.c
+++ b/source4/libcli/smb2/request.c
@@ -26,7 +26,6 @@
 #include "../lib/util/dlinklist.h"
 #include "lib/events/events.h"
 #include "libcli/smb2/smb2_calls.h"
-#include "param/param.h"
 
 /* fill in the bufinfo */
 void smb2_setup_bufinfo(struct smb2_request *req)

diff --git a/source4/libcli/smb_composite/connect.c b/source4/libcli/smb_composite/connect.c
index 8af17565624b3a4b54a13f9819d6fca0ac42c786..0d97a6c54bc277dcd5f8584b95b670fcdb35be9d 100644 (file)
--- a/source4/libcli/smb_composite/connect.c
+++ b/source4/libcli/smb_composite/connect.c
@@ -29,7 +29,6 @@
 #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/fetchfile.c b/source4/libcli/smb_composite/fetchfile.c
index c46cda25df75ffb07712d53c50edaa8968e5e2f6..cbe2289a55f05ad9acd82df63030568423e7a6f2 100644 (file)
--- a/source4/libcli/smb_composite/fetchfile.c
+++ b/source4/libcli/smb_composite/fetchfile.c
@@ -23,7 +23,6 @@
 #include "includes.h"
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
-#include "param/param.h"
 #include "libcli/resolve/resolve.h"
 
 enum fetchfile_stage {FETCHFILE_CONNECT,

diff --git a/source4/libcli/smb_composite/fsinfo.c b/source4/libcli/smb_composite/fsinfo.c
index 284fe8415469c65c9742c280bec26316ba07c199..f148fb8bf64bb147f66c997f7bbd3a466f975e3e 100644 (file)
--- a/source4/libcli/smb_composite/fsinfo.c
+++ b/source4/libcli/smb_composite/fsinfo.c
@@ -7,7 +7,6 @@
 #include "libcli/raw/raw_proto.h"
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
-#include "param/param.h"
 #include "libcli/resolve/resolve.h"
 
 /* the stages of this call */

diff --git a/source4/libcli/smb_composite/smb2.c b/source4/libcli/smb_composite/smb2.c
index 6e005e03c027a139a9250b527e760392173c011a..d71708a974ef0975304b312cb4490d1c127895eb 100644 (file)
--- a/source4/libcli/smb_composite/smb2.c
+++ b/source4/libcli/smb_composite/smb2.c
@@ -29,7 +29,6 @@
 #include "libcli/raw/raw_proto.h"
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
-#include "param/param.h"
 #include "libcli/smb2/smb2_calls.h"
 
 /*

diff --git a/source4/libcli/util/clilsa.c b/source4/libcli/util/clilsa.c
index 13f7ab4704543c0a71be28126daa196009582ee7..43f64186c33fad02cc23ed7ccd03eed2b3baf84c 100644 (file)
--- a/source4/libcli/util/clilsa.c
+++ b/source4/libcli/util/clilsa.c
@@ -32,7 +32,6 @@
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 #include "libcli/util/clilsa.h"
-#include "param/param.h"
 
 struct smblsa_state {
        struct dcerpc_pipe *pipe;

diff --git a/source4/libnet/py_net.c b/source4/libnet/py_net.c
index d5495f1e72b6e4533c87a235e7415dc9b9d41534..d8faa4fe6c53d7ce3b9a33ba8bb352184c5ddb31 100644 (file)
--- a/source4/libnet/py_net.c
+++ b/source4/libnet/py_net.c
@@ -20,7 +20,6 @@
 #include "includes.h"
 #include <Python.h>
 #include "libnet.h"
-#include "param/param.h"
 #include "libcli/security/security.h"
 #include "lib/events/events.h"
 

diff --git a/source4/librpc/rpc/dcerpc_sock.c b/source4/librpc/rpc/dcerpc_sock.c
index 1e2b4cde484769a8ee375d72185a2686178b0090..548f270cc0f3e9a3306c9879e1fa65da4325a281 100644 (file)
--- a/source4/librpc/rpc/dcerpc_sock.c
+++ b/source4/librpc/rpc/dcerpc_sock.c
@@ -29,7 +29,6 @@
 #include "librpc/rpc/dcerpc.h"
 #include "librpc/rpc/dcerpc_proto.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/nbt_server/wins/wins_hook.c b/source4/nbt_server/wins/wins_hook.c
index ae832774a3d27b579743af36921f1cde0d5b9c69..9753a8667078670457e65907cd346d85065330b1 100644 (file)
--- a/source4/nbt_server/wins/wins_hook.c
+++ b/source4/nbt_server/wins/wins_hook.c
@@ -24,7 +24,6 @@
 #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/ntvfs/posix/pvfs_util.c b/source4/ntvfs/posix/pvfs_util.c
index 8f95992e9a800ff9adb1da7250ef5f34969613a3..09913bc9115adee393dae791ace40c0c5d103492 100644 (file)
--- a/source4/ntvfs/posix/pvfs_util.c
+++ b/source4/ntvfs/posix/pvfs_util.c
@@ -22,7 +22,6 @@
 
 #include "includes.h"
 #include "vfs_posix.h"
-#include "param/param.h"
 
 /*
   return true if a string contains one of the CIFS wildcard characters

diff --git a/source4/ntvfs/unixuid/vfs_unixuid.c b/source4/ntvfs/unixuid/vfs_unixuid.c
index 66c2cfaf4c195e7ac10b7148ba82708f64058a38..448d610819ec54045acdbf5efe9247af87254ecd 100644 (file)
--- a/source4/ntvfs/unixuid/vfs_unixuid.c
+++ b/source4/ntvfs/unixuid/vfs_unixuid.c
@@ -26,7 +26,6 @@
 #include "auth/auth.h"
 #include "ntvfs/ntvfs.h"
 #include "libcli/wbclient/wbclient.h"
-#include "param/param.h"
 
 struct unixuid_private {
        struct wbc_context *wbc_ctx;

diff --git a/source4/param/param.h b/source4/param/param.h
index 931f66902cd09d60751932503744b1c55bc22c73..85db1c3857d83cd54782aed7acad666ed32b87f0 100644 (file)
--- a/source4/param/param.h
+++ b/source4/param/param.h
@@ -44,6 +44,12 @@ struct smbsrv_connection;
 
 typedef NTSTATUS (*init_module_fn) (void);
 
+/* this needs to be a string which is not in the C library. We
+   previously used "init_module", but that meant that modules which
+   did not define this function ended up calling the C library
+   function init_module() which makes a system call */
+#define SAMBA_INIT_MODULE "samba_init_module"
+
 enum server_role {
        ROLE_STANDALONE=0,
        ROLE_DOMAIN_MEMBER=1,

diff --git a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c
index e6313b771ca8ec29b9e4c5e4186cc71cb0b96f96..af758afc6f2dbd2891522c5f7d5f681c8fe8d329 100644 (file)
--- a/source4/rpc_server/unixinfo/dcesrv_unixinfo.c
+++ b/source4/rpc_server/unixinfo/dcesrv_unixinfo.c
@@ -26,7 +26,6 @@
 #include "libcli/wbclient/wbclient.h"
 #include "lib/events/events.h"
 #include "system/passwd.h"
-#include "param/param.h"
 
 static NTSTATUS dcerpc_unixinfo_bind(struct dcesrv_call_state *dce_call,
                                     const struct dcesrv_interface *iface)

diff --git a/source4/smb_server/blob.c b/source4/smb_server/blob.c
index baa9b3e4d80939c9460eafcf578fd33d7bb16e4e..f72074898af2d46845279eaa77969e7aac7836dc 100644 (file)
--- a/source4/smb_server/blob.c
+++ b/source4/smb_server/blob.c
@@ -25,7 +25,6 @@
 #include "ntvfs/ntvfs.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"
-#include "param/param.h"
 
 #define BLOB_CHECK(cmd) do { \
        NTSTATUS _status; \

diff --git a/source4/smb_server/smb/nttrans.c b/source4/smb_server/smb/nttrans.c
index 3480711ed20bfc2df42e7897760fb45637e05efc..e739f391b9d53321f7870c35e75b258eb8440981 100644 (file)
--- a/source4/smb_server/smb/nttrans.c
+++ b/source4/smb_server/smb/nttrans.c
@@ -27,7 +27,6 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#include "param/param.h"
 
 /*
   hold the state of a nttrans op while in progress. Needed to allow for async backend

diff --git a/source4/smb_server/smb/request.c b/source4/smb_server/smb/request.c
index 2cfd6d4f79b36eb4e526c9fa499754a717519f0c..444714fa5e426bd60904829edd0522907d03c3fd 100644 (file)
--- a/source4/smb_server/smb/request.c
+++ b/source4/smb_server/smb/request.c
@@ -27,7 +27,6 @@
 #include "smbd/service_stream.h"
 #include "lib/stream/packet.h"
 #include "ntvfs/ntvfs.h"
-#include "param/param.h"
 
 
 /* we over allocate the data buffer to prevent too many realloc calls */

diff --git a/source4/smb_server/smb2/fileio.c b/source4/smb_server/smb2/fileio.c
index 221fafadfdbfe8612af383ffd1b9199c6fd4f41c..bb894b2c4ef9d263c9269f62e72833e77cda8deb 100644 (file)
--- a/source4/smb_server/smb2/fileio.c
+++ b/source4/smb_server/smb2/fileio.c
@@ -24,7 +24,6 @@
 #include "smb_server/service_smb_proto.h"
 #include "smb_server/smb2/smb2_server.h"
 #include "ntvfs/ntvfs.h"
-#include "param/param.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/raw/raw_proto.h"
 #include "librpc/gen_ndr/ndr_security.h"

diff --git a/source4/smbd/pidfile.c b/source4/smbd/pidfile.c
index d8ba240e406c60ea3668520b8800c3e83986a964..44600d33cfd92a94226375633e6b32f167694d70 100644 (file)
--- a/source4/smbd/pidfile.c
+++ b/source4/smbd/pidfile.c
@@ -21,7 +21,6 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "param/param.h"
 #include "smbd/pidfile.h"
 
 /**

diff --git a/source4/torture/basic/scanner.c b/source4/torture/basic/scanner.c
index 7f88662baa5fe6c4163e6e24f5a8eaa393513e0a..a6173e4501cf711c449b5b99189e63a60c9c61bb 100644 (file)
--- a/source4/torture/basic/scanner.c
+++ b/source4/torture/basic/scanner.c
@@ -548,6 +548,7 @@ bool torture_nttrans_scan(struct torture_context *torture,
 {
        int op, level;
        const char *fname = "\\scanner.dat";
+       struct smb_iconv_convenience *iconv_convenience = lp_iconv_convenience(torture->lp_ctx);
        int fnum, dnum;
 
        fnum = smbcli_open(cli->tree, fname, O_RDWR | O_CREAT | O_TRUNC, 
@@ -557,17 +558,17 @@ bool torture_nttrans_scan(struct torture_context *torture,
        for (op=OP_MIN; op<=OP_MAX; op++) {
                printf("Scanning op=%d\n", op);
                for (level = 0; level <= 50; level++) {
-                       scan_nttrans(lp_iconv_convenience(torture->lp_ctx),
+                       scan_nttrans(iconv_convenience,
                                     cli, op, level, fnum, dnum, fname);
                }
 
                for (level = 0x100; level <= 0x130; level++) {
-                       scan_nttrans(lp_iconv_convenience(torture->lp_ctx),
+                       scan_nttrans(iconv_convenience,
                                     cli, op, level, fnum, dnum, fname);
                }
 
                for (level = 1000; level < 1050; level++) {
-                       scan_nttrans(lp_iconv_convenience(torture->lp_ctx),
+                       scan_nttrans(iconv_convenience,
                                     cli, op, level, fnum, dnum, fname);
                }
        }

diff --git a/source4/torture/libnet/utils.c b/source4/torture/libnet/utils.c
index 4a55eaa56c7266aa1c71f3ede9806bb2fb4ce487..54c5f2c29c1bb0817b249cfd9a228ed94f4d0f3b 100644 (file)
--- a/source4/torture/libnet/utils.c
+++ b/source4/torture/libnet/utils.c
@@ -26,7 +26,6 @@
 #include "torture/rpc/rpc.h"
 #include "libnet/libnet.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
-#include "param/param.h"
 #include "torture/libnet/utils.h"
 
 

diff --git a/source4/torture/raw/eas.c b/source4/torture/raw/eas.c
index bc4473b17a34da01ff7325c0d9ed2e89f1a05361..49a81dd5345026e167c0e51caf5a92a6a16afd3a 100644 (file)
--- a/source4/torture/raw/eas.c
+++ b/source4/torture/raw/eas.c
@@ -25,7 +25,6 @@
 #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/lookuprate.c b/source4/torture/raw/lookuprate.c
index 782cb1b31b74f8dfe859d367c3a36aff8ee1fea3..f7ba004ae50def429d030398380e726155f6ef08 100644 (file)
--- a/source4/torture/raw/lookuprate.c
+++ b/source4/torture/raw/lookuprate.c
@@ -18,7 +18,6 @@
 */
 
 #include "includes.h"
-#include "param/param.h"
 #include "system/filesys.h"
 #include "torture/smbtorture.h"
 #include "torture/basic/proto.h"

diff --git a/source4/torture/raw/mkdir.c b/source4/torture/raw/mkdir.c
index cea959347d8cf38bc483028114cf0ed9d204512f..a81aacdaa4041667d875132d44c91cd8860cadee 100644 (file)
--- a/source4/torture/raw/mkdir.c
+++ b/source4/torture/raw/mkdir.c
@@ -23,7 +23,6 @@
 #include "libcli/raw/raw_proto.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 d7541b7c7132c689cab2876e1904b5f590c71b1c..82f7d1832367e757d5acf2d0155211079b536fc1 100644 (file)
--- a/source4/torture/raw/notify.c
+++ b/source4/torture/raw/notify.c
@@ -24,7 +24,6 @@
 #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/offline.c b/source4/torture/raw/offline.c
index f2f0bf5d27427b13d1d5f1313a46a49694778e08..34d87f1623f2d4f5715af308a63fb090476663e6 100644 (file)
--- a/source4/torture/raw/offline.c
+++ b/source4/torture/raw/offline.c
@@ -33,7 +33,6 @@
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
 #include "libcli/resolve/resolve.h"
-#include "param/param.h"
 
 #define BASEDIR "\\testoffline"
 

diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c
index dd5ef0d0b9188d6bb846362658df2852c7529589..ef0fa5138a78e02184742a8e231cfaa1bed5912d 100644 (file)
--- a/source4/torture/raw/open.c
+++ b/source4/torture/raw/open.c
@@ -29,7 +29,6 @@
 #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/pingpong.c b/source4/torture/raw/pingpong.c
index ca56f190a9347cc1a1b1d2ab5e0640cb87f57800..a19b330dbd2a8c85480b11c5432f03506e39e572 100755 (executable)
--- a/source4/torture/raw/pingpong.c
+++ b/source4/torture/raw/pingpong.c
@@ -50,7 +50,6 @@
 #include "system/filesys.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"
-#include "param/param.h"
 
 static void lock_byte(struct smbcli_state *cli, int fd, int offset, int lock_timeout)
 {

diff --git a/source4/torture/raw/read.c b/source4/torture/raw/read.c
index ada9b1f4321ebd09d88ea4f6e959dca2bded4045..977ac6b8cb5e0f6732ee1761ccaba646261f5e72 100644 (file)
--- a/source4/torture/raw/read.c
+++ b/source4/torture/raw/read.c
@@ -25,7 +25,6 @@
 #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/unlink.c b/source4/torture/raw/unlink.c
index ddddeba41be378626ef911fdd164adc36baa8f16..1058a58d9d07225ecef75863e744ba6f69625398 100644 (file)
--- a/source4/torture/raw/unlink.c
+++ b/source4/torture/raw/unlink.c
@@ -24,7 +24,6 @@
 #include "libcli/raw/raw_proto.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 2ae92332f8ddd844b2d421250b7cc81daea23775..cacc1d3baa9927841e4ed0019603394011bb1c7b 100644 (file)
--- a/source4/torture/rpc/bench.c
+++ b/source4/torture/rpc/bench.c
@@ -23,7 +23,6 @@
 #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/drsuapi_cracknames.c b/source4/torture/rpc/drsuapi_cracknames.c
index dabd4125c7356779cca456aca580ec8cd316dee5..65a15c97e0dcc4ad3c327f0a3a1865a98a240743 100644 (file)
--- a/source4/torture/rpc/drsuapi_cracknames.c
+++ b/source4/torture/rpc/drsuapi_cracknames.c
@@ -27,7 +27,6 @@
 #include "torture/rpc/rpc.h"
 #include "ldb/include/ldb.h"
 #include "libcli/security/security.h"
-#include "param/param.h"
 
 static bool test_DsCrackNamesMatrix(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
                                    struct DsPrivate *priv, const char *dn,

diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 1f19b8ec3fb2660aa0c3c93fd3dd72ddcbfe2fb7..7e9b7e119d1d6b9fe34e55b68d08e49dfc946218 100644 (file)
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -28,7 +28,6 @@
 #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/smb2/connect.c b/source4/torture/smb2/connect.c
index e77e32ff7a0cfcc83bdc18954d1faeec2e29aa9d..01ffffa48474fa5e83ce025a618be8c3ac79e0f9 100644 (file)
--- a/source4/torture/smb2/connect.c
+++ b/source4/torture/smb2/connect.c
@@ -25,7 +25,6 @@
 #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/create.c b/source4/torture/smb2/create.c
index 124e24415193297d6cc8816891b23a63d9383734..6d898a128cf50b24464d93f80c015aa069fede0f 100644 (file)
--- a/source4/torture/smb2/create.c
+++ b/source4/torture/smb2/create.c
@@ -24,7 +24,6 @@
 #include "libcli/smb2/smb2_calls.h"
 #include "torture/torture.h"
 #include "torture/smb2/proto.h"
-#include "param/param.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "libcli/security/security.h"
 

diff --git a/source4/torture/smb2/getinfo.c b/source4/torture/smb2/getinfo.c
index 5b35d7e693a8fc1f8c9bbfdb21204fbdc421c2ff..c4ab31f4cff56f51b45f2ece8b64aae304ab1c4d 100644 (file)
--- a/source4/torture/smb2/getinfo.c
+++ b/source4/torture/smb2/getinfo.c
@@ -26,8 +26,6 @@
 #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/oplocks.c b/source4/torture/smb2/oplocks.c
index 9a06ae1f19c924654750385c8a70b672d16793f4..3fee0b4ab621102029d83ac385daabfa0407b46a 100644 (file)
--- a/source4/torture/smb2/oplocks.c
+++ b/source4/torture/smb2/oplocks.c
@@ -25,7 +25,6 @@
 #include "libcli/smb2/smb2_calls.h"
 #include "torture/torture.h"
 #include "torture/smb2/proto.h"
-#include "param/param.h"
 
 #define CHECK_VAL(v, correct) do { \
        if ((v) != (correct)) { \

diff --git a/source4/torture/smb2/persistent_handles.c b/source4/torture/smb2/persistent_handles.c
index 249ddd1733e5ff90fe9b9a7cf61d532b243e66f1..05c5dbbe858cb4041a63525a18a0e3eadfc18f1c 100644 (file)
--- a/source4/torture/smb2/persistent_handles.c
+++ b/source4/torture/smb2/persistent_handles.c
@@ -25,7 +25,6 @@
 #include "libcli/smb2/smb2_calls.h"
 #include "torture/torture.h"
 #include "torture/smb2/proto.h"
-#include "param/param.h"
 
 #define CHECK_VAL(v, correct) do { \
        if ((v) != (correct)) { \