r12694: Move some headers to the directory of the subsystem they belong to.

source/auth/credentials/credentials_files.c

@@ -25,7 +25,7 @@
 #include "includes.h"
 #include "lib/ldb/include/ldb.h"
 #include "librpc/gen_ndr/ndr_samr.h" /* for struct samrPassword */
-#include "include/secrets.h"
+#include "passdb/secrets.h"
 #include "system/filesys.h"
 
 /**

source/auth/gensec/spnego_parse.c

@@ -23,7 +23,7 @@
 
 #include "includes.h"
 #include "auth/auth.h"
-#include "asn_1.h"
+#include "libcli/util/asn_1.h"
 
 static BOOL read_negTokenInit(struct asn1_data *asn1, struct spnego_negTokenInit *token)
 {

source/auth/kerberos/gssapi_parse.c

@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
-#include "asn_1.h"
+#include "libcli/util/asn_1.h"
 #include "auth/gensec/gensec.h"
 
 /*

source/auth/ntlmssp/ntlmssp_parse.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "smb.h"
 #include "pstring.h"
 
 /*

source/client/client.c

@@ -23,7 +23,7 @@
 
 #include "includes.h"
 #include "version.h"
-#include "clilist.h"
+#include "libcli/libcli.h"
 #include "lib/cmdline/popt_common.h"
 #include "librpc/gen_ndr/ndr_srvsvc.h"
 #include "librpc/gen_ndr/ndr_lsa.h"

source/include/clilist.h

@@ -1,28 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-
-   Copyright (C) Andrew Tridgell 2004
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-struct clilist_file_info {
-	uint64_t size;
-	uint16_t attrib;
-	time_t mtime;
-	const char *name;
-	const char *short_name;
-};
-

source/include/enums.h

@@ -28,3 +28,11 @@ enum protocol_types {PROTOCOL_NONE,PROTOCOL_CORE,PROTOCOL_COREPLUS,PROTOCOL_LANM
 
 /* security levels */
 enum security_types {SEC_SHARE,SEC_USER};
+
+/* passed to br lock code */
+enum brl_type {READ_LOCK, WRITE_LOCK, PENDING_READ_LOCK, PENDING_WRITE_LOCK};
+
+enum smb_signing_state {SMB_SIGNING_OFF, SMB_SIGNING_SUPPORTED, 
+			SMB_SIGNING_REQUIRED, SMB_SIGNING_AUTO};
+
+

source/include/includes.h

@@ -84,9 +84,8 @@ struct ipv4_addr {
 #include "structs.h"
 #include "trans2.h"
 #include "nterr.h"
+#include "charset/charset.h"
 #include "core.h"
-#include "smb.h"
-#include "charset.h"
 #include "debug.h"
 #include "doserr.h"
 #include "enums.h"
@@ -98,7 +97,6 @@ struct ipv4_addr {
 #include "librpc/gen_ndr/orpc.h"
 #include "librpc/rpc/dcerpc.h"
 #include "smb_interfaces.h"
-#include "cli_context.h"
 #include "auth/credentials/credentials.h"
 #include "libcli/nbt/libnbt.h"
 

source/include/smb.h

@@ -29,9 +29,6 @@
 
 #define SMB_PORTS "445 139"
 
-enum smb_signing_state {SMB_SIGNING_OFF, SMB_SIGNING_SUPPORTED, 
-			SMB_SIGNING_REQUIRED, SMB_SIGNING_AUTO};
-
 /* deny modes */
 #define DENY_DOS 0
 #define DENY_ALL 1
@@ -557,20 +554,6 @@ enum smb_signing_state {SMB_SIGNING_OFF, SMB_SIGNING_SUPPORTED,
 
 #define DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH 14
 
-/* passed to br lock code */
-enum brl_type {READ_LOCK, WRITE_LOCK, PENDING_READ_LOCK, PENDING_WRITE_LOCK};
-
-/* string manipulation flags - see clistr.c and srvstr.c */
-#define STR_TERMINATE 1
-#define STR_UPPER 2
-#define STR_ASCII 4
-#define STR_UNICODE 8
-#define STR_NOALIGN 16
-#define STR_NO_RANGE_CHECK 32
-#define STR_LEN8BIT 64
-#define STR_TERMINATE_ASCII 128 /* only terminate if ascii */
-#define STR_LEN_NOTERM 256 /* the length field is the unterminated length */
-
 
 /*
   filesystem attribute bits
@@ -590,4 +573,10 @@ enum brl_type {READ_LOCK, WRITE_LOCK, PENDING_READ_LOCK, PENDING_WRITE_LOCK};
 #define FS_ATTR_ENCRYPTION                        0x00020000
 #define FS_ATTR_NAMED_STREAMS                     0x00040000
 
+#define smb_len(buf) (PVAL(buf,3)|(PVAL(buf,2)<<8)|(PVAL(buf,1)<<16))
+#define _smb_setlen(buf,len) do {(buf)[0] = 0; (buf)[1] = ((len)&0x10000)>>16; \
+        (buf)[2] = ((len)&0xFF00)>>8; (buf)[3] = (len)&0xFF;} while (0)
+#define _smb_setlen2(buf,len) do {(buf)[0] = 0; (buf)[1] = ((len)&0xFF0000)>>16; \
+        (buf)[2] = ((len)&0xFF00)>>8; (buf)[3] = (len)&0xFF;} while (0)
+
 #endif /* _SMB_H */

source/include/smb_macros.h

@@ -44,12 +44,6 @@
 	DEBUG(0,("PANIC: assert failed at %s(%d)\n", __FILE__, __LINE__)); \
 	smb_panic("assert failed"); }} while (0)
 
-#define smb_len(buf) (PVAL(buf,3)|(PVAL(buf,2)<<8)|(PVAL(buf,1)<<16))
-#define _smb_setlen(buf,len) do {(buf)[0] = 0; (buf)[1] = ((len)&0x10000)>>16; \
-        (buf)[2] = ((len)&0xFF00)>>8; (buf)[3] = (len)&0xFF;} while (0)
-#define _smb_setlen2(buf,len) do {(buf)[0] = 0; (buf)[1] = ((len)&0xFF0000)>>16; \
-        (buf)[2] = ((len)&0xFF00)>>8; (buf)[3] = (len)&0xFF;} while (0)
-
 #ifndef MIN
 #define MIN(a,b) ((a)<(b)?(a):(b))
 #endif

source/include/structs.h

@@ -372,3 +372,6 @@ struct registry_context;
 struct nbtd_interface;
 struct nbtd_iface_name;
 struct nbtd_server;
+struct smbcli_session;
+struct smbcli_state;
+struct substitute_context;

source/ldap_server/ldap_server.c

@@ -26,7 +26,7 @@
 #include "lib/events/events.h"
 #include "auth/auth.h"
 #include "dlinklist.h"
-#include "asn_1.h"
+#include "libcli/util/asn_1.h"
 #include "ldap_server/ldap_server.h"
 #include "smbd/service_task.h"
 #include "smbd/service_stream.h"

source/lib/charset/charset.h

@@ -55,3 +55,15 @@ typedef struct {
 	void *cd_direct, *cd_pull, *cd_push;
 } *smb_iconv_t;
 
+/* string manipulation flags */
+#define STR_TERMINATE 1
+#define STR_UPPER 2
+#define STR_ASCII 4
+#define STR_UNICODE 8
+#define STR_NOALIGN 16
+#define STR_NO_RANGE_CHECK 32
+#define STR_LEN8BIT 64
+#define STR_TERMINATE_ASCII 128 /* only terminate if ascii */
+#define STR_LEN_NOTERM 256 /* the length field is the unterminated length */
+
+#include "lib/charset/charset_proto.h"

source/lib/charset/config.mk

@@ -4,6 +4,7 @@
 OBJ_FILES = \
 		iconv.o \
 		charcnv.o
+PRIVATE_PROTO_HEADER = charset_proto.h
 REQUIRED_SUBSYSTEMS = EXT_LIB_ICONV
 # End SUBSYSTEM CHARSET
 ################################################

source/lib/messaging/messaging.c

@@ -23,7 +23,7 @@
 #include "includes.h"
 #include "lib/events/events.h"
 #include "system/filesys.h"
-#include "messages.h"
+#include "messaging/messaging.h"
 #include "dlinklist.h"
 #include "lib/socket/socket.h"
 #include "librpc/gen_ndr/ndr_irpc.h"

source/lib/stream/packet.c

@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "smb.h"
 #include "dlinklist.h"
 #include "lib/events/events.h"
 #include "lib/socket/socket.h"

source/lib/util_str.c

@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "system/iconv.h"
+#include "smb.h"
 #include "pstring.h"
 #include "lib/ldb/include/ldb.h"
 

source/libcli/auth/smbencrypt.c

@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "system/time.h"
+#include "smb.h"
 #include "auth/ntlmssp/ntlmssp.h"
 #include "lib/crypto/crypto.h"
 #include "pstring.h"

source/libcli/cldap/cldap.h

@@ -20,7 +20,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "asn_1.h"
+#include "libcli/util/asn_1.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 
 enum cldap_request_state {CLDAP_REQUEST_SEND, 

source/libcli/cliconnect.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "libcli/libcli.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/smb_composite/smb_composite.h"
 

source/libcli/clideltree.c

@@ -19,7 +19,8 @@
 */
 
 #include "includes.h"
-#include "clilist.h"
+#include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 struct delete_state {
 	struct smbcli_tree *tree;

source/libcli/clilist.c

@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "clilist.h"
+#include "libcli/libcli.h"
 #include "libcli/raw/libcliraw.h"
 
 struct search_private {

source/libcli/config.mk

@@ -98,6 +98,7 @@ REQUIRED_SUBSYSTEMS = LIBCLI_RAW LIBCLI_UTILS LIBCLI_AUTH \
 
 [SUBSYSTEM::LIBSMB]
 REQUIRED_SUBSYSTEMS = LIBCLI SOCKET
+PRIVATE_PROTO_HEADER = libcli_proto.h
 OBJ_FILES = clireadwrite.o \
 		cliconnect.o \
 		clifile.o \

source/libcli/ldap/ldap.c

@@ -25,7 +25,7 @@
 
 #include "includes.h"
 #include "system/iconv.h"
-#include "asn_1.h"
+#include "libcli/util/asn_1.h"
 #include "libcli/ldap/ldap.h"
 
 

source/libcli/ldap/ldap_client.c

@@ -24,7 +24,7 @@
 */
 
 #include "includes.h"
-#include "asn_1.h"
+#include "libcli/util/asn_1.h"
 #include "dlinklist.h"
 #include "lib/events/events.h"
 #include "lib/socket/socket.h"

source/libcli/libcli.h

@@ -19,6 +19,8 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include "smb.h"
+
 /* 
    smbcli_state: internal state used in libcli library for single-threaded callers, 
    i.e. a single session on a single socket. 
@@ -30,3 +32,14 @@ struct smbcli_state {
 	struct substitute_context *substitute;
 	struct smblsa_state *lsa;
 };
+
+struct clilist_file_info {
+	uint64_t size;
+	uint16_t attrib;
+	time_t mtime;
+	const char *name;
+	const char *short_name;
+};
+
+
+#include "libcli/libcli_proto.h"

source/libcli/raw/libcliraw.h

@@ -21,6 +21,7 @@
 */
 
 #include "request.h"
+#include "smb.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
 
 struct smbcli_tree;  /* forward declare */

source/libcli/raw/rawfile.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "smb.h"
 #include "libcli/raw/libcliraw.h"
 
 #define SETUP_REQUEST(cmd, wct, buflen) do { \

source/libcli/raw/smb_signing.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "smb.h"
 #include "libcli/raw/libcliraw.h"
 #include "lib/crypto/crypto.h"
 

source/libcli/smb2/smb2.h

@@ -20,6 +20,8 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include "smb.h"
+
 struct smb2_options {
 	uint32_t timeout;
 };

source/libcli/util/asn1.c

@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "asn_1.h"
+#include "libcli/util/asn_1.h"
 
 /* free an asn1 structure */
 void asn1_free(struct asn1_data *data)

source/libcli/util/clilsa.c

@@ -28,6 +28,7 @@
 
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 
 struct smblsa_state {

source/libnet/libnet_join.c

@@ -26,7 +26,7 @@
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_errors.h"
 #include "libcli/cldap/cldap.h"
-#include "include/secrets.h"
+#include "passdb/secrets.h"
 #include "dsdb/samdb/samdb.h"
 
 /*

source/libnet/libnet_passwd.c

@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "smb.h"
 #include "libnet/libnet.h"
 #include "lib/crypto/crypto.h"
 

source/main.mk

@@ -215,6 +215,7 @@ librpc/ndr/libndr.h: librpc/ndr/libndr_proto.h librpc/gen_ndr/misc.h
 librpc/rpc/dcerpc.h: librpc/rpc/dcerpc_proto.h
 auth/credentials/credentials.h: auth/credentials/credentials_proto.h
 libcli/nbt/libnbt.h: libcli/nbt/nbt_proto.h
+lib/charset/charset.h: lib/charset/charset_proto.h
 
 include/includes.h: \
 		include/config.h \
@@ -223,7 +224,8 @@ include/includes.h: \
 		librpc/rpc/dcerpc.h \
 		auth/credentials/credentials_proto.h \
 		libcli/nbt/libnbt.h \
-		lib/basic.h
+		lib/basic.h \
+		lib/charset/charset.h
 
 clean_pch: 
 	-rm -f include/includes.h.gch

source/ntvfs/common/brlock.c

@@ -28,7 +28,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "lib/tdb/include/tdb.h"
-#include "messages.h"
+#include "messaging/messaging.h"
 #include "db_wrap.h"
 #include "lib/messaging/irpc.h"
 

source/ntvfs/common/opendb.c

@@ -41,9 +41,10 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "lib/tdb/include/tdb.h"
-#include "messages.h"
+#include "messaging/messaging.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "db_wrap.h"
+#include "smb_server/smb_server.h"
 #include "lib/messaging/irpc.h"
 
 struct odb_context {

source/ntvfs/posix/pvfs_lock.c

@@ -24,7 +24,7 @@
 #include "vfs_posix.h"
 #include "system/time.h"
 #include "dlinklist.h"
-#include "messages.h"
+#include "messaging/messaging.h"
 
 
 /*

source/ntvfs/posix/pvfs_open.c

@@ -25,7 +25,7 @@
 #include "system/dir.h"
 #include "system/time.h"
 #include "dlinklist.h"
-#include "messages.h"
+#include "messaging/messaging.h"
 #include "librpc/gen_ndr/ndr_xattr.h"
 
 /*

source/ntvfs/simple/svfs_util.c

@@ -28,6 +28,7 @@
 #include "svfs.h"
 #include "system/time.h"
 #include "system/dir.h"
+#include "smb_server/smb_server.h"
 #include "ntvfs/ntvfs.h"
 
 /*

source/param/loadparm.c

@@ -53,6 +53,7 @@
  */
 
 #include "includes.h"
+#include "smb.h"
 #include "version.h"
 #include "dynconfig.h"
 #include "pstring.h"

source/scripting/ejs/smbcalls_cli.c

@@ -26,7 +26,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
-#include "clilist.h"
+#include "libcli/libcli.h"
 
 #if 0
 

source/smb_server/smb_server.h

@@ -20,6 +20,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include "smb.h"
 #include "request.h"
 #include "smbd/process_model.h"
 

source/torture/basic/aliases.c

@@ -22,6 +22,7 @@
 #include "torture/torture.h"
 #include "dlinklist.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 int create_complex_file(struct smbcli_state *cli, TALLOC_CTX *mem_ctx, const char *fname);
 

source/torture/basic/attr.c

@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "torture/torture.h"
+#include "libcli/libcli.h"
 
 extern int torture_failures;
 

source/torture/basic/charset.c

@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define BASEDIR "\\chartest\\"
 

source/torture/basic/delaywrite.c

@@ -27,6 +27,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
 #include "system/filesys.h"
+#include "libcli/libcli.h"
 
 #define BASEDIR "\\delaywrite"
 

source/torture/basic/delete.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "libcli/libcli.h"
 #include "torture/torture.h"
 #include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"

source/torture/basic/denytest.c

@@ -22,6 +22,7 @@
 #include "torture/torture.h"
 #include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 extern BOOL torture_showall;
 extern int torture_failures;

source/torture/basic/dir.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "libcli/libcli.h"
 #include "torture/torture.h"
 #include "system/filesys.h"
 

source/torture/basic/disconnect.c

@@ -24,6 +24,7 @@
 #include "torture/torture.h"
 #include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define BASEDIR "\\test_disconnect"
 

source/torture/basic/locking.c

@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 #include "system/time.h"
 #include "system/filesys.h"
 

source/torture/basic/mangle_test.c

@@ -22,6 +22,7 @@
 #include "torture/torture.h"
 #include "system/filesys.h"
 #include "lib/tdb/include/tdbutil.h"
+#include "libcli/libcli.h"
 #include "pstring.h"
 
 static TDB_CONTEXT *tdb;

source/torture/basic/properties.c

@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 struct bitmapping {
 	const char *name;

source/torture/basic/rename.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "libcli/libcli.h"
 #include "torture/torture.h"
 
 /*

source/torture/basic/scanner.c

@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "torture/torture.h"
+#include "libcli/libcli.h"
 #include "libcli/raw/libcliraw.h"
 #include "system/filesys.h"
 #include "pstring.h"

source/torture/basic/secleak.c

@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 #include "system/time.h"
 #include "libcli/smb_composite/smb_composite.h"
 

source/torture/basic/unlink.c

@@ -24,6 +24,7 @@
 #include "torture/torture.h"
 #include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define BASEDIR "\\unlinktest"
 

source/torture/basic/utable.c

@@ -22,6 +22,7 @@
 #include "torture/torture.h"
 #include "system/iconv.h"
 #include "system/filesys.h"
+#include "libcli/libcli.h"
 #include "pstring.h"
 
 BOOL torture_utable(void)

source/torture/gentest.c

@@ -22,6 +22,7 @@
 #include "system/time.h"
 #include "system/filesys.h"
 #include "request.h"
+#include "libcli/libcli.h"
 #include "libcli/raw/libcliraw.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "auth/gensec/gensec.h"

source/torture/locktest.c

@@ -23,6 +23,7 @@
 #include "system/time.h"
 #include "pstring.h"
 #include "auth/gensec/gensec.h"
+#include "libcli/libcli.h"
 
 static int numops = 1000;
 static BOOL showall;

source/torture/masktest.c

@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "clilist.h"
+#include "libcli/libcli.h"
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
 #include "pstring.h"

source/torture/nbench/nbench.c

@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "torture/torture.h"
+#include "libcli/libcli.h"
 #include "system/filesys.h"
 #include "pstring.h"
 

source/torture/nbench/nbio.c

@@ -24,6 +24,7 @@
 #include "system/time.h"
 #include "system/filesys.h"
 #include "dlinklist.h"
+#include "libcli/libcli.h"
 #include "libcli/raw/libcliraw.h"
 
 #define MAX_FILES 100

source/torture/rap/rap.c

@@ -23,6 +23,7 @@
 #include "torture/torture.h"
 #include "rap.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 struct rap_call {
 	uint16_t callno;

source/torture/raw/acls.c

@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define BASEDIR "\\testsd"
 

source/torture/raw/chkpath.c

@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define BASEDIR "\\rawchkpath"
 

source/torture/raw/close.c

@@ -22,6 +22,7 @@
 #include "torture/torture.h"
 #include "system/time.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 
 /* basic testing of all RAW_CLOSE_* calls 

source/torture/raw/composite.c

@@ -24,6 +24,7 @@
 #include "torture/torture.h"
 #include "lib/events/events.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 #include "libcli/composite/composite.h"
 #include "libcli/smb_composite/smb_composite.h"
 #include "lib/cmdline/popt_common.h"

source/torture/raw/context.c

@@ -25,6 +25,7 @@
 #include "libcli/smb_composite/smb_composite.h"
 #include "lib/cmdline/popt_common.h"
 #include "lib/events/events.h"
+#include "libcli/libcli.h"
 
 #define BASEDIR "\\rawcontext"
 

source/torture/raw/eas.c

@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define BASEDIR "\\testeas"
 

source/torture/raw/ioctl.c

@@ -23,6 +23,7 @@
 #include "torture/torture.h"
 #include "ioctl.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define BASEDIR "\\rawioctl"
 

source/torture/raw/lock.c

@@ -23,6 +23,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
 #include "system/filesys.h"
+#include "libcli/libcli.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \

source/torture/raw/mkdir.c

@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define BASEDIR "\\mkdirtest"
 

source/torture/raw/mux.c

@@ -22,6 +22,7 @@
 #include "torture/torture.h"
 #include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define BASEDIR "\\test_mux"
 

source/torture/raw/notify.c

@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define BASEDIR "\\test_notify"
 

source/torture/raw/open.c

@@ -25,6 +25,7 @@
 #include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "lib/events/events.h"
+#include "libcli/libcli.h"
 
 /* enum for whether reads/writes are possible on a file */
 enum rdwr_mode {RDWR_NONE, RDWR_RDONLY, RDWR_WRONLY, RDWR_RDWR};

source/torture/raw/oplock.c

@@ -22,6 +22,7 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define CHECK_VAL(v, correct) do { \
 	if ((v) != (correct)) { \

source/torture/raw/qfileinfo.c

@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 static struct {
 	const char *name;

source/torture/raw/qfsinfo.c

@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 
 static struct {

source/torture/raw/read.c

@@ -23,6 +23,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
 #include "system/filesys.h"
+#include "libcli/libcli.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \

source/torture/raw/rename.c

@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \

source/torture/raw/search.c

@@ -22,6 +22,7 @@
 #include "torture/torture.h"
 #include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 
 #define BASEDIR "\\testsearch"

source/torture/raw/seek.c

@@ -22,6 +22,7 @@
 #include "torture/torture.h"
 #include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \

source/torture/raw/setfileinfo.c

@@ -22,6 +22,7 @@
 #include "torture/torture.h"
 #include "system/time.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define BASEDIR "\\testsfileinfo"
 

source/torture/raw/streams.c

@@ -24,6 +24,7 @@
 #include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
 #include "system/filesys.h"
+#include "libcli/libcli.h"
 
 #define BASEDIR "\\teststreams"
 

source/torture/raw/unlink.c

@@ -22,6 +22,7 @@
 #include "torture/torture.h"
 #include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \

source/torture/raw/write.c

@@ -24,6 +24,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
 #include "system/filesys.h"
+#include "libcli/libcli.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \

source/torture/rpc/netlogon.c

@@ -26,6 +26,7 @@
 #include "torture/torture.h"
 #include "lib/events/events.h"
 #include "auth/auth.h"
+#include "smb.h"
 #include "lib/cmdline/popt_common.h"
 
 static const char *machine_password;

source/torture/rpc/samr.c

@@ -24,6 +24,7 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_samr.h"
+#include "smb.h"
 #include "lib/crypto/crypto.h"
 
 #define TEST_ACCOUNT_NAME "samrtorturetest"

source/torture/rpc/testjoin.c

@@ -31,6 +31,7 @@
 #include "lib/crypto/crypto.h"
 #include "libnet/libnet.h"
 #include "lib/cmdline/popt_common.h"
+#include "smb.h"
 #include "lib/ldb/include/ldb.h"
 
 

source/torture/smb2/connect.c

@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "smb.h"
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
 

source/torture/torture.c

@@ -25,6 +25,7 @@
 #include "system/wait.h"
 #include "system/filesys.h"
 #include "ioctl.h"
+#include "libcli/libcli.h"
 #include "librpc/rpc/dcerpc_table.h"
 
 int torture_nprocs=4;

source/torture/torture_util.c

@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
 #include "system/shmem.h"
 #include "system/time.h"