diff options
79 files changed, 11 insertions, 87 deletions
diff --git a/lib/util/charset/iconv.c b/lib/util/charset/iconv.c index 150383e7f9..a01b6a5787 100644 --- 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 dde35268eb..73fb0e0966 100644 --- 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 ed3d8a2492..e344235faa 100644 --- 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 77f9cbd45c..ec63df9bf6 100644 --- 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 d9e616fecc..39ef05640a 100644 --- 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 e57a2f396e..8f4698169d 100644 --- 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 2943e05b18..7a36c9ddea 100644 --- 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 cd270590f1..24f3ad27af 100644 --- 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 47d7a2104a..3a07d7e7bd 100644 --- 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 492ef1c92b..a8c45dee4c 100644 --- 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 8eb49b5792..7b82763403 100644 --- 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 6ba123fc18..e0e6b3fc77 100644 --- 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 7b623120a9..6065cfc17c 100644 --- 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 cbdbb86b1f..3f1c1fc63e 100644 --- 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 4aa71e6036..93e81d4244 100644 --- 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 dcc29180cc..ff9ef8afc5 100644 --- 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 06db3b36ba..925806985e 100644 --- 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 1bc9c60753..3b5708978d 100644 --- 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 bb46495c19..26b57e4f45 100644 --- 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 dd3ff47b78..a869ed4440 100644 --- 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 471c425002..38f994f386 100644 --- 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 773bf41873..2b64668b9b 100644 --- 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 2f736a4b05..98b4d405b3 100644 --- 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 524aa09655..af81804911 100644 --- 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 fd5f3cac60..2d1d1ca7e1 100644 --- 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 3ac6c89292..a853f26035 100644 --- 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 2803aaff5e..b902dddb0f 100644 --- 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 9f1a159573..129a80f9ac 100644 --- 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 1b3d2c98c9..e1f5e9ab50 100644 --- 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 18bfd689d2..9d00623081 100644 --- 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 e613dd9228..3bd587aa54 100644 --- 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 b37d4a2ee6..26b00bdafd 100644 --- 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 f12f1ac805..5352a3a90a 100644 --- 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 38d8f700f2..41765bfb2b 100644 --- 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 1dc5e4e766..502ecc1825 100644 --- 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 08f611941d..61cbfa7ecb 100644 --- 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 466b94f4a9..e13ba85361 100644 --- 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 c3c5f3614b..34fa4365ca 100644 --- 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 f0de4b48bd..dedc891ac1 100644 --- 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 6d2565851c..a257e3d0f1 100644 --- 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 e798f052ba..9f94039078 100644 --- 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 7f4ae4d79f..f57f231bc0 100644 --- 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 0104d8e097..9dcc415b7c 100644 --- 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 8af1756562..0d97a6c54b 100644 --- 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 c46cda25df..cbe2289a55 100644 --- 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 284fe84154..f148fb8bf6 100644 --- 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 6e005e03c0..d71708a974 100644 --- 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 13f7ab4704..43f64186c3 100644 --- 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 d5495f1e72..d8faa4fe6c 100644 --- 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 1e2b4cde48..548f270cc0 100644 --- 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 ae832774a3..9753a86670 100644 --- 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 8f95992e9a..09913bc911 100644 --- 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 66c2cfaf4c..448d610819 100644 --- 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 931f66902c..85db1c3857 100644 --- 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 e6313b771c..af758afc6f 100644 --- 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 baa9b3e4d8..f72074898a 100644 --- 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 3480711ed2..e739f391b9 100644 --- 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 2cfd6d4f79..444714fa5e 100644 --- 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 221fafadfd..bb894b2c4e 100644 --- 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 d8ba240e40..44600d33cf 100644 --- 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 7f88662baa..a6173e4501 100644 --- 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 4a55eaa56c..54c5f2c29c 100644 --- 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 bc4473b17a..49a81dd534 100644 --- 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 782cb1b31b..f7ba004ae5 100644 --- 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 cea959347d..a81aacdaa4 100644 --- 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 d7541b7c71..82f7d18323 100644 --- 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 f2f0bf5d27..34d87f1623 100644 --- 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 dd5ef0d0b9..ef0fa5138a 100644 --- 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 ca56f190a9..a19b330dbd 100755 --- 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 ada9b1f432..977ac6b8cb 100644 --- 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 ddddeba41b..1058a58d9d 100644 --- 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 2ae92332f8..cacc1d3baa 100644 --- 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 dabd4125c7..65a15c97e0 100644 --- 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 1f19b8ec3f..7e9b7e119d 100644 --- 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 e77e32ff7a..01ffffa484 100644 --- 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 124e244151..6d898a128c 100644 --- 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 5b35d7e693..c4ab31f4cf 100644 --- 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 9a06ae1f19..3fee0b4ab6 100644 --- 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 249ddd1733..05c5dbbe85 100644 --- 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)) { \ |