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

(This used to be commit c722f665c90103f3ed57621c460e32ad33e7a8a3)

diff --git a/source4/auth/credentials/credentials_files.c b/source4/auth/credentials/credentials_files.c
index 8d84e8cdb57cd212b3d9eee73611a13be94d443d..219869cf3ae14cecdc18229b3bf83766a1585c64 100644 (file)
--- a/source4/auth/credentials/credentials_files.c
+++ b/source4/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"
 
 /**

diff --git a/source4/auth/gensec/spnego_parse.c b/source4/auth/gensec/spnego_parse.c
index 59b09b1969c52064d12e41185a50384a4d9b478b..8dde78da484ca6b6fb7d91d31f6ded4b3b26050b 100644 (file)
--- a/source4/auth/gensec/spnego_parse.c
+++ b/source4/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)
 {

diff --git a/source4/auth/kerberos/gssapi_parse.c b/source4/auth/kerberos/gssapi_parse.c
index a48179cc1a26328f401a4e3c23a8c427d9b0772f..5226d77a2b783164edb751903319b82ee60206b3 100644 (file)
--- a/source4/auth/kerberos/gssapi_parse.c
+++ b/source4/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"
 
 /*

diff --git a/source4/auth/ntlmssp/ntlmssp_parse.c b/source4/auth/ntlmssp/ntlmssp_parse.c
index 42546cb13083f6d871a60dbb890ad150253657be..e8c08bf650dc25ca80b51051f2d21ebd8fa65768 100644 (file)
--- a/source4/auth/ntlmssp/ntlmssp_parse.c
+++ b/source4/auth/ntlmssp/ntlmssp_parse.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "smb.h"
 #include "pstring.h"
 
 /*

diff --git a/source4/client/client.c b/source4/client/client.c
index 712a5261fa7ff6d0188a5b7fae73d4bbb5caa7cd..afaa3139281c5209dcec2c7b10046e198e9d44c4 100644 (file)
--- a/source4/client/client.c
+++ b/source4/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"

diff --git a/source4/include/clilist.h b/source4/include/clilist.h
deleted file mode 100644 (file)
index d031987..0000000
--- a/source4/include/clilist.h
+++ /dev/null
@@ -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;
-};
-

diff --git a/source4/include/enums.h b/source4/include/enums.h
index 4e8e7b04a0f62c1204e39b5432b94dd2cc36c481..6003dfc7a00fdc5cbac9d8508f8f3340a72e468e 100644 (file)
--- a/source4/include/enums.h
+++ b/source4/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};
+
+

diff --git a/source4/include/includes.h b/source4/include/includes.h
index 849850daa6664e14292e8bc98c1ec9ee21580e65..dd4f19009a95e9bc370ced1dec37eb9732b43ee6 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/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"
 

diff --git a/source4/include/smb.h b/source4/include/smb.h
index f7a46e757d9a85981efc0bdacb9e081631bc9b7a..5297ef9e27a02d559da262aeede3c93dce4386de 100644 (file)
--- a/source4/include/smb.h
+++ b/source4/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 */

diff --git a/source4/include/smb_macros.h b/source4/include/smb_macros.h
index afe31e00bacab6d86d6bb1a2cd91e6eef329a53a..356d96808396e4489a9ae9f549cb3f91870388c7 100644 (file)
--- a/source4/include/smb_macros.h
+++ b/source4/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

diff --git a/source4/include/structs.h b/source4/include/structs.h
index b78d9184177328cf4570001b6e7dd5126723bfef..83f742b30e44762a90402334420e3e98a8610d62 100644 (file)
--- a/source4/include/structs.h
+++ b/source4/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;

diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index 26bb2402e8d49b47701ea47fb5dcc0a80ac141c1..d5736521432531f3bfa8cd78fbe11d19467ae7b2 100644 (file)
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/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"

diff --git a/source4/include/charset.h b/source4/lib/charset/charset.h
similarity index 84%
rename from source4/include/charset.h
rename to source4/lib/charset/charset.h
index ba1402acb3c1d9260465932004f944a81497b945..5ad2f431bfcf040b75473d380e7a32675b3a5e6c 100644 (file)
--- a/source4/include/charset.h
+++ b/source4/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"

diff --git a/source4/lib/charset/config.mk b/source4/lib/charset/config.mk
index 4fb8ee79bf5d222f6da003a9325d3a30f0ef9fb9..a69bee1ec330321338b36c73b2e02f783fba15bd 100644 (file)
--- a/source4/lib/charset/config.mk
+++ b/source4/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
 ################################################

diff --git a/source4/include/db_wrap.h b/source4/lib/db_wrap.h
similarity index 100%
rename from source4/include/db_wrap.h
rename to source4/lib/db_wrap.h

diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index c7cce9c133edc5e1208b407459ddceb206a79923..ea345ff8817e06552e66761f1008d375291efc4a 100644 (file)
--- a/source4/lib/messaging/messaging.c
+++ b/source4/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"

diff --git a/source4/include/messages.h b/source4/lib/messaging/messaging.h
similarity index 100%
rename from source4/include/messages.h
rename to source4/lib/messaging/messaging.h

diff --git a/source4/lib/stream/packet.c b/source4/lib/stream/packet.c
index d8ce332de68b37cae99932c96f01b78347182b28..2c053009dd46c0d5a69e593c54bc85c10c92265c 100644 (file)
--- a/source4/lib/stream/packet.c
+++ b/source4/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"

diff --git a/source4/lib/util_str.c b/source4/lib/util_str.c
index 56a1345e38279d7c2028b1ff7920fa815d2ae29c..17c0924d680d735ef69af39ee379aadb830f8880 100644 (file)
--- a/source4/lib/util_str.c
+++ b/source4/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"
 

diff --git a/source4/libcli/auth/smbencrypt.c b/source4/libcli/auth/smbencrypt.c
index b031bf488696bcb1e65671ea03fe6fe3cedb0770..6bc9de2f2ba237b1f6d13bbd4b03c548f20ad4d7 100644 (file)
--- a/source4/libcli/auth/smbencrypt.c
+++ b/source4/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"

diff --git a/source4/libcli/cldap/cldap.h b/source4/libcli/cldap/cldap.h
index 632dbd1f65f36b5a598180fe5cf6f59c141366a2..e1f59464e5eeef8ce2f02121b4199328f6104da9 100644 (file)
--- a/source4/libcli/cldap/cldap.h
+++ b/source4/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, 

diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c
index 220b5a3898e30c444d4b520be5b3b435731d385d..fe0ad9c9f5e455d806da95866dfe02cef222b63d 100644 (file)
--- a/source4/libcli/cliconnect.c
+++ b/source4/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"
 

diff --git a/source4/libcli/clideltree.c b/source4/libcli/clideltree.c
index 30369b977f02828b90ece679740e728ebd45b5c5..0c65d993c82f0f99fdd4a04b24354b9cf0d9d24b 100644 (file)
--- a/source4/libcli/clideltree.c
+++ b/source4/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;

diff --git a/source4/libcli/clilist.c b/source4/libcli/clilist.c
index 0d69a386eb213abcedd612d2b5008a18d1ca5f72..f18ec84db93c903e32e74d8d90befbbd870b5eae 100644 (file)
--- a/source4/libcli/clilist.c
+++ b/source4/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 {

diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index fb04c32d85d0a34309cc34fed99f21fabc483498..20219be0f48ab3c92cac49efc3bc881509e4e181 100644 (file)
--- a/source4/libcli/config.mk
+++ b/source4/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 \

diff --git a/source4/libcli/ldap/ldap.c b/source4/libcli/ldap/ldap.c
index 3cfbe3a1e1329514171c196b2dbcdef818cda090..c699820cea33f117cc1a9460cac7363071091226 100644 (file)
--- a/source4/libcli/ldap/ldap.c
+++ b/source4/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"
 
 

diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c
index 77fc7db0498bb1d5121c10a9f1698139bc2cf593..9b1a4ef9d5fa35351863ba29908eadea2582b0fa 100644 (file)
--- a/source4/libcli/ldap/ldap_client.c
+++ b/source4/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"

diff --git a/source4/include/cli_context.h b/source4/libcli/libcli.h
similarity index 86%
rename from source4/include/cli_context.h
rename to source4/libcli/libcli.h
index 843e8e8ca942948f56cf0edc556801d4100b61ea..917ab27519265503a0a7ba578e100cad7b4e115b 100644 (file)
--- a/source4/include/cli_context.h
+++ b/source4/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"

diff --git a/source4/libcli/raw/libcliraw.h b/source4/libcli/raw/libcliraw.h
index b09361b5ffd1450012cbe6fd9b8c312b3fbe1efb..7eb0694bd2507888523b10cd6f7ffe7b7bf27962 100644 (file)
--- a/source4/libcli/raw/libcliraw.h
+++ b/source4/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 */

diff --git a/source4/libcli/raw/rawfile.c b/source4/libcli/raw/rawfile.c
index 6981a768002d3ce7b6d52abda0493a63ca92fac2..0cc7385ceeb507d1af490066f0adcf2fe4350a60 100644 (file)
--- a/source4/libcli/raw/rawfile.c
+++ b/source4/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 { \

diff --git a/source4/libcli/raw/smb_signing.c b/source4/libcli/raw/smb_signing.c
index df63c33cb9bfc93cfb05ee644320ea0971df5021..a73db78f7b7aecf2ef9d6145766b2f9ef10e0203 100644 (file)
--- a/source4/libcli/raw/smb_signing.c
+++ b/source4/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"
 

diff --git a/source4/libcli/smb2/smb2.h b/source4/libcli/smb2/smb2.h
index eb7c10ed9d310d17df58a6bcc11c9979c8938117..cf84f344422070182b47c04332a044e991c7f1ef 100644 (file)
--- a/source4/libcli/smb2/smb2.h
+++ b/source4/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;
 };

diff --git a/source4/libcli/util/asn1.c b/source4/libcli/util/asn1.c
index 0dceb1bba60ab1491f08919f82eb70e3f1c2ce59..db3f7823fab98b27fa304db6ee62c4f1bf1cb8bf 100644 (file)
--- a/source4/libcli/util/asn1.c
+++ b/source4/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)

diff --git a/source4/include/asn_1.h b/source4/libcli/util/asn_1.h
similarity index 100%
rename from source4/include/asn_1.h
rename to source4/libcli/util/asn_1.h

diff --git a/source4/libcli/util/clilsa.c b/source4/libcli/util/clilsa.c
index 3c7850b7fd6f7ce7b3f87266cd463113438d56ca..bf5048b02a6da83f9d8e1aef02e067f19d906dd7 100644 (file)
--- a/source4/libcli/util/clilsa.c
+++ b/source4/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 {

diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index a1aa00c5c2e275d2b5b76ce89d6e898c01f31eb6..4f566a36a892ccf3c8f2296c792229a9db1ae8ca 100644 (file)
--- a/source4/libnet/libnet_join.c
+++ b/source4/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"
 
 /*

diff --git a/source4/libnet/libnet_passwd.c b/source4/libnet/libnet_passwd.c
index ec97eea838588c467fdd21d9a47b4c6af712f12f..bd09e306ce243c7fd8dd0dffa43697cbd7244815 100644 (file)
--- a/source4/libnet/libnet_passwd.c
+++ b/source4/libnet/libnet_passwd.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "smb.h"
 #include "libnet/libnet.h"
 #include "lib/crypto/crypto.h"
 

diff --git a/source4/main.mk b/source4/main.mk
index a600df1a0b78a3994f42f09ddff92900e3115be6..018ab0ebbb83e9da2346a56bf84f8575765036f0 100644 (file)
--- a/source4/main.mk
+++ b/source4/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

diff --git a/source4/ntvfs/common/brlock.c b/source4/ntvfs/common/brlock.c
index e06cb0602e84435279a7e43c33075db913359a7d..3fc3c09316a6d39e8ddb225ae020e9a3aa2fd3f3 100644 (file)
--- a/source4/ntvfs/common/brlock.c
+++ b/source4/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"
 

diff --git a/source4/ntvfs/common/opendb.c b/source4/ntvfs/common/opendb.c
index 72e9fff1c6d15036921159e1b4952df8d73cb9a6..7d45f38840dff7d4756e13dc80dff86737380348 100644 (file)
--- a/source4/ntvfs/common/opendb.c
+++ b/source4/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 {

diff --git a/source4/ntvfs/posix/pvfs_lock.c b/source4/ntvfs/posix/pvfs_lock.c
index a0832723b601f52a67f3321dd2d4959f63c350ca..5031e4cef7a85cc6cdd9b85a27a36f11d06384df 100644 (file)
--- a/source4/ntvfs/posix/pvfs_lock.c
+++ b/source4/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"
 
 
 /*

diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c
index 0e2a85bab1f8bdcf4891201031a793d9f6213fc2..5aeb5eb7e81ff8f29d4e85558cb94580edc675bb 100644 (file)
--- a/source4/ntvfs/posix/pvfs_open.c
+++ b/source4/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"
 
 /*

diff --git a/source4/ntvfs/simple/svfs_util.c b/source4/ntvfs/simple/svfs_util.c
index d332abb09107e52bce27f1cdf245231c4629867b..ab1eccc55183fda5914c155e745d03861130bc80 100644 (file)
--- a/source4/ntvfs/simple/svfs_util.c
+++ b/source4/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"
 
 /*

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 72eb1d83cde931d7144bd8db4d688b0d80b69c55..08abc3aa480ce1972aa5858d6c9ea050ed4074b6 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -53,6 +53,7 @@
  */
 
 #include "includes.h"
+#include "smb.h"
 #include "version.h"
 #include "dynconfig.h"
 #include "pstring.h"

diff --git a/source4/include/secrets.h b/source4/passdb/secrets.h
similarity index 100%
rename from source4/include/secrets.h
rename to source4/passdb/secrets.h

diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c
index cc97282038fb8a82925ef002f0c13ae0efb517e3..e165222a984359b6701f2122044ed0dc012919c9 100644 (file)
--- a/source4/scripting/ejs/smbcalls_cli.c
+++ b/source4/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
 

diff --git a/source4/smb_server/smb_server.h b/source4/smb_server/smb_server.h
index 3280706eca5ac4c9a788f16eceaa9204173025e3..f673425dd395ca98ec19bc9835d162c306c63942 100644 (file)
--- a/source4/smb_server/smb_server.h
+++ b/source4/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"
 

diff --git a/source4/torture/basic/aliases.c b/source4/torture/basic/aliases.c
index a693d18ce3ec1aef47e6d06a905f632615a19cc4..104fdc193332f4ea8989e09f403930e92b89eaa4 100644 (file)
--- a/source4/torture/basic/aliases.c
+++ b/source4/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);
 

diff --git a/source4/torture/basic/attr.c b/source4/torture/basic/attr.c
index 5d13a5f689cecb3bf56b8643c994547ed6bbfc9b..e321993749a6050725ac68e8e1aeadab865f81f2 100644 (file)
--- a/source4/torture/basic/attr.c
+++ b/source4/torture/basic/attr.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "torture/torture.h"
+#include "libcli/libcli.h"
 
 extern int torture_failures;
 

diff --git a/source4/torture/basic/charset.c b/source4/torture/basic/charset.c
index 7becdcd8e5c7f94766dd32dc39938815c61384cf..186b265e19336720c44c2632ea4404bdf334bcc5 100644 (file)
--- a/source4/torture/basic/charset.c
+++ b/source4/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\\"
 

diff --git a/source4/torture/basic/delaywrite.c b/source4/torture/basic/delaywrite.c
index 5523e1bb41eb576bc5618a73813e35f75980bd5f..2c26f21ddc97af30ae9fcd3bf451e80056f6fa68 100644 (file)
--- a/source4/torture/basic/delaywrite.c
+++ b/source4/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"
 

diff --git a/source4/torture/basic/delete.c b/source4/torture/basic/delete.c
index 3138f48d0fc92faa273833f3645e7bb397a5d52c..c6ddd4bd7002a8df500386cfe1bc33e9dbcb9f19 100644 (file)
--- a/source4/torture/basic/delete.c
+++ b/source4/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"

diff --git a/source4/torture/basic/denytest.c b/source4/torture/basic/denytest.c
index f633f843ffa85820fffda3e2b0ec990fde8f698f..2e68efa4eb18865ece643039a1792c53d14144c4 100644 (file)
--- a/source4/torture/basic/denytest.c
+++ b/source4/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;

diff --git a/source4/torture/basic/dir.c b/source4/torture/basic/dir.c
index 49efff8d2e44cfd088a92f90636c71f42d156b6b..9dd62f3aa12b1ea8f12b529567d0fbf4e9f6a006 100644 (file)
--- a/source4/torture/basic/dir.c
+++ b/source4/torture/basic/dir.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "libcli/libcli.h"
 #include "torture/torture.h"
 #include "system/filesys.h"
 

diff --git a/source4/torture/basic/disconnect.c b/source4/torture/basic/disconnect.c
index fca5d1968a438be0b66587a03da38adfe8e6c604..61b1750b92e4a4e1bffe41d69da2dbe42066e82e 100644 (file)
--- a/source4/torture/basic/disconnect.c
+++ b/source4/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"
 

diff --git a/source4/torture/basic/locking.c b/source4/torture/basic/locking.c
index e07d0648a7c5bd8f598244a7a594f5b16ee55e0d..307bb0fafc0ae5c1511425d8a5e9bbf6e4a37481 100644 (file)
--- a/source4/torture/basic/locking.c
+++ b/source4/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"
 

diff --git a/source4/torture/basic/mangle_test.c b/source4/torture/basic/mangle_test.c
index 29bb4fcd18fa3f16fa52ae179e1a5ae4c9936339..8317a4ee1802f010c79abd35e5ff1b84700ad6a9 100644 (file)
--- a/source4/torture/basic/mangle_test.c
+++ b/source4/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;

diff --git a/source4/torture/basic/properties.c b/source4/torture/basic/properties.c
index 25a787deadb9df201276b56e57f32d53925b7456..c20edf545b666b0e6139b7af2f4f399633673501 100644 (file)
--- a/source4/torture/basic/properties.c
+++ b/source4/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;

diff --git a/source4/torture/basic/rename.c b/source4/torture/basic/rename.c
index cdb2340b76c0846b578cb647170cdb23a275f437..4bdc6f2d9f34e68958e666ccd7a5db9922d2d70f 100644 (file)
--- a/source4/torture/basic/rename.c
+++ b/source4/torture/basic/rename.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "libcli/libcli.h"
 #include "torture/torture.h"
 
 /*

diff --git a/source4/torture/basic/scanner.c b/source4/torture/basic/scanner.c
index 5d48ee712481c0d6be9b6dcc67b8e09434716872..6e79745e890a6b5899acafcbe5788eeefe2a6079 100644 (file)
--- a/source4/torture/basic/scanner.c
+++ b/source4/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"

diff --git a/source4/torture/basic/secleak.c b/source4/torture/basic/secleak.c
index 70fd50834e2643e013a9564aa6ca49f60ea830a3..20b7e8a5791a0b69ca86bc9dc9eac57fd413590c 100644 (file)
--- a/source4/torture/basic/secleak.c
+++ b/source4/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"
 

diff --git a/source4/torture/basic/unlink.c b/source4/torture/basic/unlink.c
index ec889078aa37f7bd0e085083e97fae2b0d2397f8..d99fec5ee8017f3c86b9b45e560daf061ae54aee 100644 (file)
--- a/source4/torture/basic/unlink.c
+++ b/source4/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"
 

diff --git a/source4/torture/basic/utable.c b/source4/torture/basic/utable.c
index f3f7429021c8b03c34833a5f92e61138be2923bc..e76627fb03da15371558b94b0d771811601cb164 100644 (file)
--- a/source4/torture/basic/utable.c
+++ b/source4/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)

diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index a576b57458554dd3a552ea9039b5bf6821c435c1..a82b8998864b5b8e806b265ec49d7598353b5c71 100644 (file)
--- a/source4/torture/gentest.c
+++ b/source4/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"

diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c
index be2d3022da525848be8014ce8a6061dc519c297b..02bf901428b40e341e7f72c0d0c4080061d2266b 100644 (file)
--- a/source4/torture/locktest.c
+++ b/source4/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;

diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c
index ca5bdf7c21e96df46778a0c052a4751536974ecc..cb88e573e264582b3913793e7d1a3a03a4f520a2 100644 (file)
--- a/source4/torture/masktest.c
+++ b/source4/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"

diff --git a/source4/torture/nbench/nbench.c b/source4/torture/nbench/nbench.c
index 353140a70632327c2baa953c511a959ca576364c..4357dd53a10dba73dcd9012e27d21e29f038cdc3 100644 (file)
--- a/source4/torture/nbench/nbench.c
+++ b/source4/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"
 

diff --git a/source4/torture/nbench/nbio.c b/source4/torture/nbench/nbio.c
index 40d9277c6ed7103a0ea86e283ccc4014da941cba..3e4c9a0f9247971b7f1cc4040dff47deec544a85 100644 (file)
--- a/source4/torture/nbench/nbio.c
+++ b/source4/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

diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index 1b98275e93f2b2f130441a70cf12651c46a29bc4..e9cb45e3b0146eb450b1f7b8cbd779a2dfc0a1af 100644 (file)
--- a/source4/torture/rap/rap.c
+++ b/source4/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;

diff --git a/source4/torture/raw/acls.c b/source4/torture/raw/acls.c
index 119377731be041c4035d132133e75558316cd8ef..6450acab18a84a80f18c1c69511df3abe18b9082 100644 (file)
--- a/source4/torture/raw/acls.c
+++ b/source4/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"
 

diff --git a/source4/torture/raw/chkpath.c b/source4/torture/raw/chkpath.c
index 92fe5dd2d515a6f5ae3c0962a64d953832c55ea1..4b19372b1054ce29424b74e9b1bbc7469ea89588 100644 (file)
--- a/source4/torture/raw/chkpath.c
+++ b/source4/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"
 

diff --git a/source4/torture/raw/close.c b/source4/torture/raw/close.c
index 67050f30a3a7ee6896f176e7d837e7cf8f3b4cc7..e19fe0f3cb460980d627f175fdd3a46c52ce31b8 100644 (file)
--- a/source4/torture/raw/close.c
+++ b/source4/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 

diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c
index f9fe0eb83c6fbc72fe9734ab8078993ea6340c19..760d464fb534ad6b22e90434ec579e7b68b070d7 100644 (file)
--- a/source4/torture/raw/composite.c
+++ b/source4/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"

diff --git a/source4/torture/raw/context.c b/source4/torture/raw/context.c
index 8a8bfc85fb6c226d57da380d5d4bd56aa1e9b229..43e059e23d7541f16d8f9df1ba2a787ef20fcd70 100644 (file)
--- a/source4/torture/raw/context.c
+++ b/source4/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"
 

diff --git a/source4/torture/raw/eas.c b/source4/torture/raw/eas.c
index a1f9bbfe5214aa716afbdb9859a3c2a9ad7fda3a..3bc954d5729e90bc1e5e5153cf9a98bdc4c2d265 100644 (file)
--- a/source4/torture/raw/eas.c
+++ b/source4/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"
 

diff --git a/source4/torture/raw/ioctl.c b/source4/torture/raw/ioctl.c
index 5a88e336cbb565ed5e69075622c49f42a1340329..0fb48c292b32d20c2cee91b5ec537a07bc62ca88 100644 (file)
--- a/source4/torture/raw/ioctl.c
+++ b/source4/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"
 

diff --git a/source4/torture/raw/lock.c b/source4/torture/raw/lock.c
index da3c956afb1dbdf727a6286eb4cef586a0f76759..f18df4752816e28fd5458398ccc074402b750bae 100644 (file)
--- a/source4/torture/raw/lock.c
+++ b/source4/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)) { \

diff --git a/source4/torture/raw/mkdir.c b/source4/torture/raw/mkdir.c
index e1cc33bf84d362300331bba46fc466282b9ea199..ac19ee1187f43e65f8d62becb3b8d9f6eb135736 100644 (file)
--- a/source4/torture/raw/mkdir.c
+++ b/source4/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"
 

diff --git a/source4/torture/raw/mux.c b/source4/torture/raw/mux.c
index d941c01f1a746291c43086de0c79773e35a13778..97a1bf3cc4ac08c8f375e8fc60080a8f288acf8b 100644 (file)
--- a/source4/torture/raw/mux.c
+++ b/source4/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"
 

diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c
index e28ab3a54052e68539c5ab4738e978491db18068..9a5831d69c8efa43a24988197ec29a700a98d0ee 100644 (file)
--- a/source4/torture/raw/notify.c
+++ b/source4/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"
 

diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c
index a1d17587e7858f20798e3f37dfa05be393178a0e..2afad96956bb2adf33c56af9ee14985de923b24d 100644 (file)
--- a/source4/torture/raw/open.c
+++ b/source4/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};

diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index 512e42d867191a53fc47bc627ca850d7edc0306a..64da410bd2776116809f81ee700f48466621c0ee 100644 (file)
--- a/source4/torture/raw/oplock.c
+++ b/source4/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)) { \

diff --git a/source4/torture/raw/qfileinfo.c b/source4/torture/raw/qfileinfo.c
index 57a2ac69c04c45dc7e30de6722b42d819f7eb6a6..6ed57227ac1bc3ae802362826544f529b7047809 100644 (file)
--- a/source4/torture/raw/qfileinfo.c
+++ b/source4/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;

diff --git a/source4/torture/raw/qfsinfo.c b/source4/torture/raw/qfsinfo.c
index 2edceeb2b16027a395e0eaab7dd5b4c23154985d..26bac4c0ad0431216a6fa8c7d897783c775cf903 100644 (file)
--- a/source4/torture/raw/qfsinfo.c
+++ b/source4/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 {

diff --git a/source4/torture/raw/read.c b/source4/torture/raw/read.c
index cb400d871fd7ee0477185747c8c787e82b0102bd..aab879a1d1a36bafe8b6932f7a50ad507356157e 100644 (file)
--- a/source4/torture/raw/read.c
+++ b/source4/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)) { \

diff --git a/source4/torture/raw/rename.c b/source4/torture/raw/rename.c
index 99d8116b319fe1cb40a085b386d59b5404a0c227..c1b24f2b3ad08b78726752430d0a90a843649c36 100644 (file)
--- a/source4/torture/raw/rename.c
+++ b/source4/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)) { \

diff --git a/source4/torture/raw/search.c b/source4/torture/raw/search.c
index 80d1bb5b3f5eea9e870863ecafec075e94345b46..5cb67b068eeaec16d675c3c1dd3edf9d0c8066bf 100644 (file)
--- a/source4/torture/raw/search.c
+++ b/source4/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"

diff --git a/source4/torture/raw/seek.c b/source4/torture/raw/seek.c
index cf16ed2354aa02b5d94eda990aa98bc6871bd253..b0993b67cc3051151b65831e6bf69c4138626563 100644 (file)
--- a/source4/torture/raw/seek.c
+++ b/source4/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)) { \

diff --git a/source4/torture/raw/setfileinfo.c b/source4/torture/raw/setfileinfo.c
index 8055fc7575fb42630971fd7b270e8bdc1db808f4..29521980befdb300a8ede76c2f921672a45db9da 100644 (file)
--- a/source4/torture/raw/setfileinfo.c
+++ b/source4/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"
 

diff --git a/source4/torture/raw/streams.c b/source4/torture/raw/streams.c
index 71ff9332fd78225a103bda87c87f02ba3fd4a58c..22b7d06cddaa397599325363570af914f3fdbceb 100644 (file)
--- a/source4/torture/raw/streams.c
+++ b/source4/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"
 

diff --git a/source4/torture/raw/unlink.c b/source4/torture/raw/unlink.c
index fc92668f385dde95921584dcbde9d7307d224cf6..4c91ab58ba36bcb085f62cd67a465e7fe0316a00 100644 (file)
--- a/source4/torture/raw/unlink.c
+++ b/source4/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)) { \

diff --git a/source4/torture/raw/write.c b/source4/torture/raw/write.c
index 26289506064a626c1c7f7ad6da5744a916941ad0..4209d66892012737e7decc6fca9326eb9aced3b3 100644 (file)
--- a/source4/torture/raw/write.c
+++ b/source4/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)) { \

diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index bdeda0561382fc34a9834bb763e8d4ebafa5a71a..ab123627596ba73ddb1119e2e8389d7211342750 100644 (file)
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/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;

diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index d373e0c817da1c544977ca1398e8836a6aed8511..e109bb7f3027c0146af8a97f699ae734acd1a858 100644 (file)
--- a/source4/torture/rpc/samr.c
+++ b/source4/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"

diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index 622b6ac08adfbb1b1422005db9e2c6b0bf656b3f..f844ad8ca8509c1fb65ef571d03bc2c0ec958729 100644 (file)
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/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"
 
 

diff --git a/source4/torture/smb2/connect.c b/source4/torture/smb2/connect.c
index 2077bb022767649bc864f37b80dae371a2f6c33a..d4016b87703b580a338956671ecca20913419592 100644 (file)
--- a/source4/torture/smb2/connect.c
+++ b/source4/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"
 

diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index ff1a72799b367c945028fbb27f1f354318057979..fd8fc6fd6b0e4c519af484be264b8f5f46552930 100644 (file)
--- a/source4/torture/torture.c
+++ b/source4/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;

diff --git a/source4/torture/torture_util.c b/source4/torture/torture_util.c
index ce457582d3eda93bb8472d79e9ab305d93af325a..fefbfcf5681e55e4a1083f2995b93d1304b55c93 100644 (file)
--- a/source4/torture/torture_util.c
+++ b/source4/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"