[SCM] Samba Shared Repository - branch master updated - 791f9e09b82b5382f6005482a4e3faa62ce30fae

Jelmer Vernooij jelmer at samba.org
Fri Oct 24 14:39:05 GMT 2008


The branch, master has been updated
       via  791f9e09b82b5382f6005482a4e3faa62ce30fae (commit)
       via  23302413b3fc9cb3695a255b1ea6883f029b46fe (commit)
      from  2a76f4d8c832155253be971975b0ac50649c7515 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 791f9e09b82b5382f6005482a4e3faa62ce30fae
Merge: 23302413b3fc9cb3695a255b1ea6883f029b46fe 2a76f4d8c832155253be971975b0ac50649c7515
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Oct 24 16:38:44 2008 +0200

    Merge branch 'master' of ssh://git.samba.org/data/git/samba

commit 23302413b3fc9cb3695a255b1ea6883f029b46fe
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Oct 24 16:37:56 2008 +0200

    Remove unused include param/param.h.

-----------------------------------------------------------------------

Summary of changes:
 lib/util/charset/iconv.c                       |    1 -
 lib/util/ms_fnmatch.c                          |    1 -
 libcli/nbt/namequery.c                         |    1 -
 libcli/nbt/namerefresh.c                       |    1 -
 libcli/nbt/nameregister.c                      |    1 -
 libcli/nbt/namerelease.c                       |    1 -
 source4/auth/kerberos/kerberos_pac.c           |    1 -
 source4/auth/ntlmssp/ntlmssp_parse.c           |    1 -
 source4/auth/ntlmssp/ntlmssp_sign.c            |    1 -
 source4/dsdb/samdb/ldb_modules/instancetype.c  |    1 -
 source4/dsdb/samdb/ldb_modules/update_keytab.c |    1 -
 source4/dsdb/schema/schema_syntax.c            |    1 -
 source4/include/includes.h                     |    6 ------
 source4/kdc/pac-glue.c                         |    1 -
 source4/lib/ldb/ldb_ildap/ldb_ildap.c          |    1 -
 source4/lib/messaging/messaging.c              |    1 -
 source4/lib/registry/patchfile.c               |    1 -
 source4/lib/registry/patchfile_dotreg.c        |    1 -
 source4/lib/registry/patchfile_preg.c          |    3 +--
 source4/lib/registry/regf.c                    |    1 -
 source4/lib/registry/util.c                    |    1 -
 source4/lib/socket/connect.c                   |    1 -
 source4/lib/socket/connect_multi.c             |    1 -
 source4/lib/socket/interface.c                 |    1 -
 source4/lib/tdr/tdr.c                          |    1 -
 source4/lib/wmi/wmicore.c                      |    1 -
 source4/libcli/auth/smbencrypt.c               |    1 -
 source4/libcli/cldap/cldap.c                   |    1 -
 source4/libcli/cliconnect.c                    |    1 -
 source4/libcli/dgram/dgramsocket.c             |    1 -
 source4/libcli/dgram/mailslot.c                |    1 -
 source4/libcli/dgram/netlogon.c                |    1 -
 source4/libcli/finddcs.c                       |    1 -
 source4/libcli/raw/clisession.c                |    1 -
 source4/libcli/raw/clitransport.c              |    1 -
 source4/libcli/raw/clitree.c                   |    1 -
 source4/libcli/raw/rawacl.c                    |    1 -
 source4/libcli/raw/rawfileinfo.c               |    1 -
 source4/libcli/raw/rawnegotiate.c              |    1 -
 source4/libcli/raw/rawrequest.c                |    1 -
 source4/libcli/raw/smb_signing.c               |    1 -
 source4/libcli/resolve/resolve.c               |    1 -
 source4/libcli/smb2/request.c                  |    1 -
 source4/libcli/smb_composite/connect.c         |    1 -
 source4/libcli/smb_composite/fetchfile.c       |    1 -
 source4/libcli/smb_composite/fsinfo.c          |    1 -
 source4/libcli/smb_composite/smb2.c            |    1 -
 source4/libcli/util/clilsa.c                   |    1 -
 source4/libnet/py_net.c                        |    1 -
 source4/librpc/rpc/dcerpc_sock.c               |    1 -
 source4/nbt_server/wins/wins_hook.c            |    1 -
 source4/ntvfs/posix/pvfs_util.c                |    1 -
 source4/ntvfs/unixuid/vfs_unixuid.c            |    1 -
 source4/param/param.h                          |    6 ++++++
 source4/rpc_server/unixinfo/dcesrv_unixinfo.c  |    1 -
 source4/smb_server/blob.c                      |    1 -
 source4/smb_server/smb/nttrans.c               |    1 -
 source4/smb_server/smb/request.c               |    1 -
 source4/smb_server/smb2/fileio.c               |    1 -
 source4/smbd/pidfile.c                         |    1 -
 source4/torture/basic/scanner.c                |    7 ++++---
 source4/torture/libnet/utils.c                 |    1 -
 source4/torture/raw/eas.c                      |    1 -
 source4/torture/raw/lookuprate.c               |    1 -
 source4/torture/raw/mkdir.c                    |    1 -
 source4/torture/raw/notify.c                   |    1 -
 source4/torture/raw/offline.c                  |    1 -
 source4/torture/raw/open.c                     |    1 -
 source4/torture/raw/pingpong.c                 |    1 -
 source4/torture/raw/read.c                     |    1 -
 source4/torture/raw/unlink.c                   |    1 -
 source4/torture/rpc/bench.c                    |    1 -
 source4/torture/rpc/drsuapi_cracknames.c       |    1 -
 source4/torture/rpc/samr.c                     |    1 -
 source4/torture/smb2/connect.c                 |    1 -
 source4/torture/smb2/create.c                  |    1 -
 source4/torture/smb2/getinfo.c                 |    2 --
 source4/torture/smb2/oplocks.c                 |    1 -
 source4/torture/smb2/persistent_handles.c      |    1 -
 79 files changed, 11 insertions(+), 87 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/charset/iconv.c b/lib/util/charset/iconv.c
index 150383e..a01b6a5 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 dde3526..73fb0e0 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 ed3d8a2..e344235 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 77f9cbd..ec63df9 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 d9e616f..39ef056 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 e57a2f3..8f46981 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 2943e05..7a36c9d 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 cd27059..24f3ad2 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 47d7a21..3a07d7e 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 492ef1c..a8c45de 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 8eb49b5..7b82763 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 6ba123f..e0e6b3f 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 7b62312..6065cfc 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 cbdbb86..3f1c1fc 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 4aa71e6..93e81d4 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 dcc2918..ff9ef8a 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 06db3b3..9258069 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 1bc9c60..3b57089 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 bb46495..26b57e4 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 dd3ff47..a869ed4 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 471c425..38f994f 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 773bf41..2b64668 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 2f736a4..98b4d40 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 524aa09..af81804 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 fd5f3ca..2d1d1ca 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 3ac6c89..a853f26 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 2803aaf..b902ddd 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 9f1a159..129a80f 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 1b3d2c9..e1f5e9a 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 18bfd68..9d00623 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 e613dd9..3bd587a 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 b37d4a2..26b00bd 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 f12f1ac..5352a3a 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 38d8f70..41765bf 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 1dc5e4e..502ecc1 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 08f6119..61cbfa7 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 466b94f..e13ba85 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 c3c5f36..34fa436 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 f0de4b4..dedc891 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 6d25658..a257e3d 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 e798f05..9f94039 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"


-- 
Samba Shared Repository


More information about the samba-cvs mailing list