moved trans2.h and nterr.h into includes.h with all our other includes

diff --git a/source/groupdb/aliasdb.c b/source/groupdb/aliasdb.c
index e5e6ebfa53f179e0c527dd33602609eff26fee8c..a6876d0afca49d5330ac4fbc414e7b9c3360ba2b 100644 (file)
--- a/source/groupdb/aliasdb.c
+++ b/source/groupdb/aliasdb.c
@@ -21,7 +21,6 @@
 */
 
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 

diff --git a/source/groupdb/groupdb.c b/source/groupdb/groupdb.c
index b8952358fbc1735f8ed1dc79f24fb735cc76695e..1f773d9f153d770ebfe3305225d876dcb8ee5542 100644 (file)
--- a/source/groupdb/groupdb.c
+++ b/source/groupdb/groupdb.c
@@ -21,7 +21,6 @@
 */
 
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 

diff --git a/source/include/includes.h b/source/include/includes.h
index e19295834a65039abf006c650482cf4a40867910..b71a5ee3d3d3f2fc50a6a25e0b2c3265fab1ee82 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -605,6 +605,8 @@ extern int errno;
 #include "talloc.h"
 #include "interfaces.h"
 #include "hash.h"
+#include "trans2.h"
+#include "nterr.h"
 
 #ifdef HAVE_FNMATCH
 #include <fnmatch.h>
@@ -867,4 +869,6 @@ int setresgid(gid_t rgid, gid_t egid, gid_t sgid);
 #include <dlfcn.h>
 #endif
 
+extern int DEBUGLEVEL;
+
 #endif /* _INCLUDES_H */

diff --git a/source/include/proto.h b/source/include/proto.h
index 4564ac832c8602a2a47eb2435921a7d383b795f3..db50e12ab65b0af354cc4ce77ac12ca8d3782ac7 100644 (file)
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -568,25 +568,8 @@ void split_at_last_component_w(smb_ucs2_t *path, smb_ucs2_t *front, smb_ucs2_t s
 smb_ucs2_t *octal_string_w(int i);
 smb_ucs2_t *string_truncate_w(smb_ucs2_t *s, size_t length);
 
-/*The following definitions come from  libsmb/clientgen.c  */
+/*The following definitions come from  libsmb/cliconnect.c  */
 
-int cli_set_port(struct cli_state *cli, int port);
-char *cli_errstr(struct cli_state *cli);
-BOOL cli_api_pipe(struct cli_state *cli, char *pipe_name, int pipe_name_len,
-                  uint16 *setup, uint32 setup_count, uint32 max_setup_count,
-                  char *params, uint32 param_count, uint32 max_param_count,
-                  char *data, uint32 data_count, uint32 max_data_count,
-                  char **rparam, uint32 *rparam_count,
-                  char **rdata, uint32 *rdata_count);
-BOOL cli_api(struct cli_state *cli,
-            char *param, int prcnt, int mprcnt,
-            char *data, int drcnt, int mdrcnt,
-            char **rparam, int *rprcnt,
-            char **rdata, int *rdrcnt);
-BOOL cli_NetWkstaUserLogon(struct cli_state *cli,char *user, char *workstation);
-int cli_RNetShareEnum(struct cli_state *cli, void (*fn)(const char *, uint32, const char *));
-BOOL cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype,
-                      void (*fn)(const char *, uint32, const char *));
 BOOL cli_session_setup(struct cli_state *cli, 
                       char *user, 
                       char *pass, int passlen,
@@ -596,6 +579,37 @@ BOOL cli_ulogoff(struct cli_state *cli);
 BOOL cli_send_tconX(struct cli_state *cli, 
                    char *share, char *dev, char *pass, int passlen);
 BOOL cli_tdis(struct cli_state *cli);
+BOOL cli_negprot(struct cli_state *cli);
+BOOL cli_session_request(struct cli_state *cli,
+                        struct nmb_name *calling, struct nmb_name *called);
+BOOL cli_connect(struct cli_state *cli, const char *host, struct in_addr *ip);
+BOOL cli_reestablish_connection(struct cli_state *cli);
+BOOL cli_establish_connection(struct cli_state *cli, 
+                               char *dest_host, struct in_addr *dest_ip,
+                               struct nmb_name *calling, struct nmb_name *called,
+                               char *service, char *service_type,
+                               BOOL do_shutdown, BOOL do_tcon);
+BOOL attempt_netbios_session_request(struct cli_state *cli, char *srchost, char *desthost,
+                                     struct in_addr *pdest_ip);
+
+/*The following definitions come from  libsmb/clientgen.c  */
+
+int cli_set_port(struct cli_state *cli, int port);
+BOOL cli_receive_smb(struct cli_state *cli);
+BOOL cli_send_smb(struct cli_state *cli);
+void cli_setup_packet(struct cli_state *cli);
+struct cli_state *cli_initialise(struct cli_state *cli);
+void cli_shutdown(struct cli_state *cli);
+void cli_sockopt(struct cli_state *cli, char *options);
+uint16 cli_setpid(struct cli_state *cli, uint16 pid);
+
+/*The following definitions come from  libsmb/clierror.c  */
+
+char *cli_errstr(struct cli_state *cli);
+int cli_error(struct cli_state *cli, uint8 *eclass, uint32 *num, uint32 *nt_rpc_error);
+
+/*The following definitions come from  libsmb/clifile.c  */
+
 BOOL cli_rename(struct cli_state *cli, char *fname_src, char *fname_dst);
 BOOL cli_unlink(struct cli_state *cli, char *fname);
 BOOL cli_mkdir(struct cli_state *cli, char *dname);
@@ -606,18 +620,52 @@ BOOL cli_close(struct cli_state *cli, int fnum);
 BOOL cli_lock(struct cli_state *cli, int fnum, 
              uint32 offset, uint32 len, int timeout, enum brl_type lock_type);
 BOOL cli_unlock(struct cli_state *cli, int fnum, uint32 offset, uint32 len);
-size_t cli_read(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size);
-ssize_t cli_write(struct cli_state *cli,
-                 int fnum, uint16 write_mode,
-                 char *buf, off_t offset, size_t size);
-ssize_t cli_smbwrite(struct cli_state *cli,
-                    int fnum, char *buf, off_t offset, size_t size1);
 BOOL cli_getattrE(struct cli_state *cli, int fd, 
                  uint16 *attr, size_t *size, 
                  time_t *c_time, time_t *a_time, time_t *m_time);
 BOOL cli_getatr(struct cli_state *cli, char *fname, 
                uint16 *attr, size_t *size, time_t *t);
 BOOL cli_setatr(struct cli_state *cli, char *fname, uint16 attr, time_t t);
+BOOL cli_chkpath(struct cli_state *cli, char *path);
+BOOL cli_dskattr(struct cli_state *cli, int *bsize, int *total, int *avail);
+
+/*The following definitions come from  libsmb/clilist.c  */
+
+int cli_list(struct cli_state *cli,const char *Mask,uint16 attribute, 
+            void (*fn)(file_info *, const char *));
+
+/*The following definitions come from  libsmb/climessage.c  */
+
+BOOL cli_message_start(struct cli_state *cli, char *host, char *username, 
+                             int *grp);
+BOOL cli_message_text(struct cli_state *cli, char *msg, int len, int grp);
+BOOL cli_message_end(struct cli_state *cli, int grp);
+
+/*The following definitions come from  libsmb/cliprint.c  */
+
+int cli_print_queue(struct cli_state *cli, 
+                   void (*fn)(struct print_job_info *));
+int cli_printjob_del(struct cli_state *cli, int job);
+
+/*The following definitions come from  libsmb/clirap.c  */
+
+BOOL cli_api_pipe(struct cli_state *cli, char *pipe_name, int pipe_name_len,
+                  uint16 *setup, uint32 setup_count, uint32 max_setup_count,
+                  char *params, uint32 param_count, uint32 max_param_count,
+                  char *data, uint32 data_count, uint32 max_data_count,
+                  char **rparam, uint32 *rparam_count,
+                  char **rdata, uint32 *rdata_count);
+BOOL cli_api(struct cli_state *cli,
+            char *param, int prcnt, int mprcnt,
+            char *data, int drcnt, int mdrcnt,
+            char **rparam, int *rprcnt,
+            char **rdata, int *rdrcnt);
+BOOL cli_NetWkstaUserLogon(struct cli_state *cli,char *user, char *workstation);
+int cli_RNetShareEnum(struct cli_state *cli, void (*fn)(const char *, uint32, const char *));
+BOOL cli_NetServerEnum(struct cli_state *cli, char *workgroup, uint32 stype,
+                      void (*fn)(const char *, uint32, const char *));
+BOOL cli_oem_change_password(struct cli_state *cli, const char *user, const char *new_password,
+                             const char *old_password);
 BOOL cli_qpathinfo(struct cli_state *cli, const char *fname, 
                   time_t *c_time, time_t *a_time, time_t *m_time, 
                   size_t *size, uint16 *mode);
@@ -629,36 +677,27 @@ BOOL cli_qfileinfo(struct cli_state *cli, int fnum,
                   uint16 *mode, size_t *size,
                   time_t *c_time, time_t *a_time, time_t *m_time, 
                   time_t *w_time, SMB_INO_T *ino);
-int cli_list(struct cli_state *cli,const char *Mask,uint16 attribute, 
-            void (*fn)(file_info *, const char *));
-BOOL cli_oem_change_password(struct cli_state *cli, const char *user, const char *new_password,
-                             const char *old_password);
-BOOL cli_negprot(struct cli_state *cli);
-BOOL cli_session_request(struct cli_state *cli,
-                        struct nmb_name *calling, struct nmb_name *called);
-BOOL cli_connect(struct cli_state *cli, const char *host, struct in_addr *ip);
-struct cli_state *cli_initialise(struct cli_state *cli);
-void cli_shutdown(struct cli_state *cli);
-int cli_error(struct cli_state *cli, uint8 *eclass, uint32 *num, uint32 *nt_rpc_error);
-void cli_sockopt(struct cli_state *cli, char *options);
-uint16 cli_setpid(struct cli_state *cli, uint16 pid);
-BOOL cli_reestablish_connection(struct cli_state *cli);
-BOOL cli_establish_connection(struct cli_state *cli, 
-                               char *dest_host, struct in_addr *dest_ip,
-                               struct nmb_name *calling, struct nmb_name *called,
-                               char *service, char *service_type,
-                               BOOL do_shutdown, BOOL do_tcon);
-int cli_printjob_del(struct cli_state *cli, int job);
-int cli_print_queue(struct cli_state *cli, 
-                   void (*fn)(struct print_job_info *));
-BOOL cli_chkpath(struct cli_state *cli, char *path);
-BOOL cli_message_start(struct cli_state *cli, char *host, char *username, 
-                             int *grp);
-BOOL cli_message_text(struct cli_state *cli, char *msg, int len, int grp);
-BOOL cli_message_end(struct cli_state *cli, int grp);
-BOOL cli_dskattr(struct cli_state *cli, int *bsize, int *total, int *avail);
-BOOL attempt_netbios_session_request(struct cli_state *cli, char *srchost, char *desthost,
-                                     struct in_addr *pdest_ip);
+
+/*The following definitions come from  libsmb/clireadwrite.c  */
+
+size_t cli_read(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size);
+ssize_t cli_write(struct cli_state *cli,
+                 int fnum, uint16 write_mode,
+                 char *buf, off_t offset, size_t size);
+ssize_t cli_smbwrite(struct cli_state *cli,
+                    int fnum, char *buf, off_t offset, size_t size1);
+
+/*The following definitions come from  libsmb/clitrans.c  */
+
+BOOL cli_send_trans(struct cli_state *cli, int trans, 
+                   char *name, int pipe_name_len, 
+                   int fid, int flags,
+                   uint16 *setup, int lsetup, int msetup,
+                   char *param, int lparam, int mparam,
+                   char *data, int ldata, int mdata);
+BOOL cli_receive_trans(struct cli_state *cli,int trans,
+                              char **param, int *param_len,
+                              char **data, int *data_len);
 
 /*The following definitions come from  libsmb/credentials.c  */
 

diff --git a/source/lib/msrpc_use.c b/source/lib/msrpc_use.c
index 1d0df1872fb1fa5ff9d4c66e8fffafaf5f295a80..e18b24ac17a1958ab109329a87c4ca14fb49b822 100644 (file)
--- a/source/lib/msrpc_use.c
+++ b/source/lib/msrpc_use.c
@@ -23,7 +23,6 @@
 #define NO_SYSLOG
 
 #include "includes.h"
-#include "trans2.h"
 
 extern int DEBUGLEVEL;
 extern pstring global_myname;

diff --git a/source/libsmb/nterr.c b/source/libsmb/nterr.c
index d2f9335000d5ce8af019c465fe95ee03a5b65d53..ef3fb4b8baf28f13441a2e4bbd27303778b825e7 100644 (file)
--- a/source/libsmb/nterr.c
+++ b/source/libsmb/nterr.c
@@ -1,7 +1,6 @@
 /* NT error codes.  please read nterr.h */
 
 #include "includes.h"
-#include "nterr.h"
 
 typedef struct
 {

diff --git a/source/passdb/passdb.c b/source/passdb/passdb.c
index f520a11157a4ed19a43e1292d7d5bb4f95e4aacb..bb7bbcaa01b15fa242e208d23ae5079e2035c948 100644 (file)
--- a/source/passdb/passdb.c
+++ b/source/passdb/passdb.c
@@ -21,7 +21,6 @@
 */
 
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 

diff --git a/source/passdb/passgrp.c b/source/passdb/passgrp.c
index f578d9a20ea02ab271a57340cc620660dbb3cdd0..399a45d8a9ab9bcf5aa52b04b531c08b1177be10 100644 (file)
--- a/source/passdb/passgrp.c
+++ b/source/passdb/passgrp.c
@@ -21,7 +21,6 @@
 */
 
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 

diff --git a/source/printing/nt_printing.c b/source/printing/nt_printing.c
index faf660e92f7f884df49b6547ac9495747a795321..0c9526b1ec6cd5471d8a3586a22b581274e58b89 100644 (file)
--- a/source/printing/nt_printing.c
+++ b/source/printing/nt_printing.c
@@ -21,7 +21,6 @@
  */
 
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 

diff --git a/source/rpc_client/cli_login.c b/source/rpc_client/cli_login.c
index 5fe392f2148415136ff6c6c1acc05bdf08e3d12b..7c7398243df7a995ba3a936e5034566733a12259 100644 (file)
--- a/source/rpc_client/cli_login.c
+++ b/source/rpc_client/cli_login.c
@@ -22,7 +22,6 @@
 */
 
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 extern fstring global_myworkgroup;

diff --git a/source/rpc_client/cli_samr.c b/source/rpc_client/cli_samr.c
index 8fccf6c7962299f11151bcb48f044316ba2efdb7..82608ebcc371f08ec27085acae1dc45e4fb047bd 100644 (file)
--- a/source/rpc_client/cli_samr.c
+++ b/source/rpc_client/cli_samr.c
@@ -28,7 +28,6 @@
 #endif
 
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 

diff --git a/source/rpc_client/ntclienttrust.c b/source/rpc_client/ntclienttrust.c
index 8ef193fa893d126bc520e3636acdcc32a21aee0d..9e1bcf2261e349abc8fe3a5b635ea20498f5a7e3 100644 (file)
--- a/source/rpc_client/ntclienttrust.c
+++ b/source/rpc_client/ntclienttrust.c
@@ -25,7 +25,6 @@
 #endif
 
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 

diff --git a/source/rpc_parse/parse_lsa.c b/source/rpc_parse/parse_lsa.c
index 771e7c31d4521f0cf6e2a3d657b827b255361591..a8023bc640da9e6f66446cde368a5373ffc5ae6f 100644 (file)
--- a/source/rpc_parse/parse_lsa.c
+++ b/source/rpc_parse/parse_lsa.c
@@ -22,7 +22,6 @@
  */
 
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 

diff --git a/source/rpc_parse/parse_net.c b/source/rpc_parse/parse_net.c
index 9588d1c53b3332a9b1521be5b1cc005b811676ee..002d7e56aaf439831bd3c97cd3e1b54530578bd6 100644 (file)
--- a/source/rpc_parse/parse_net.c
+++ b/source/rpc_parse/parse_net.c
@@ -22,7 +22,6 @@
  */
 
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 

diff --git a/source/rpc_parse/parse_spoolss.c b/source/rpc_parse/parse_spoolss.c
index 6c62b6627794adef56b8203d5e4969c65f6220a4..5f1f10521fc1eb8c9c60943db563e1a684aec92a 100644 (file)
--- a/source/rpc_parse/parse_spoolss.c
+++ b/source/rpc_parse/parse_spoolss.c
@@ -23,7 +23,6 @@
 
 
 #include "includes.h"
-#include "nterr.h"
 
 #ifdef TNG
        #define prs_uint16 _prs_uint16

diff --git a/source/rpc_server/srv_lookup.c b/source/rpc_server/srv_lookup.c
index 4041cd26604f5040f8e7629ee5f9ffd3dbcae73f..274c68f18da56d4c731c2365a50da4f3f3469a5f 100644 (file)
--- a/source/rpc_server/srv_lookup.c
+++ b/source/rpc_server/srv_lookup.c
@@ -43,7 +43,6 @@
  */
 
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 

diff --git a/source/rpc_server/srv_pipe.c b/source/rpc_server/srv_pipe.c
index fe78d48fa6037149a14240b3d9bba794b54ae75e..3637f68adfe2ab00cb1a3e2eebc0dc1cfa6159b3 100644 (file)
--- a/source/rpc_server/srv_pipe.c
+++ b/source/rpc_server/srv_pipe.c
@@ -39,7 +39,6 @@
  */
 
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 

diff --git a/source/rpc_server/srv_spoolss_nt.c b/source/rpc_server/srv_spoolss_nt.c
index d1ad0f62291c7475b2cabe9136e6fb2f866d96c7..1121d5c2b109e05df69ab54db84b384e3a21749a 100644 (file)
--- a/source/rpc_server/srv_spoolss_nt.c
+++ b/source/rpc_server/srv_spoolss_nt.c
@@ -23,7 +23,6 @@
 
 
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 extern pstring global_myname;

diff --git a/source/rpc_server/srv_srvsvc.c b/source/rpc_server/srv_srvsvc.c
index c5307b264eebc8ef733aa5184a28a6f57bb56e1d..51ba7e8a8f7b8228dfe4ce3273a9ff6572846f52 100644 (file)
--- a/source/rpc_server/srv_srvsvc.c
+++ b/source/rpc_server/srv_srvsvc.c
@@ -22,7 +22,6 @@
  */
 
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 extern pstring global_myname;

diff --git a/source/rpcclient/cmd_lsarpc.c b/source/rpcclient/cmd_lsarpc.c
index 731eda4437d911e8df649fb7fa512acb4122041c..ee4d5803d534c2cec8cf8ba87d795aef5aa87a3f 100644 (file)
--- a/source/rpcclient/cmd_lsarpc.c
+++ b/source/rpcclient/cmd_lsarpc.c
@@ -27,7 +27,6 @@
 #endif
 
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 

diff --git a/source/rpcclient/cmd_netlogon.c b/source/rpcclient/cmd_netlogon.c
index 2c8514b43e8def6fbf45b513d35e87033803ab67..944eda86b7c1078c01a8b75a2a0e35d1cfe6400c 100644 (file)
--- a/source/rpcclient/cmd_netlogon.c
+++ b/source/rpcclient/cmd_netlogon.c
@@ -27,7 +27,6 @@
 #endif
 
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 

diff --git a/source/rpcclient/cmd_reg.c b/source/rpcclient/cmd_reg.c
index fcc12c530cc62258637602a543748daa211c7cb4..dfbfcf0cd1bdf2d70b3056febdc7fbe196384f0a 100644 (file)
--- a/source/rpcclient/cmd_reg.c
+++ b/source/rpcclient/cmd_reg.c
@@ -27,7 +27,6 @@
 #endif
 
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 

diff --git a/source/rpcclient/cmd_samr.c b/source/rpcclient/cmd_samr.c
index 023bf512e8a4144d893f8ba3baf0ce1b6436a5db..b3c7be56e0d203002df44fb7e121962251640d01 100644 (file)
--- a/source/rpcclient/cmd_samr.c
+++ b/source/rpcclient/cmd_samr.c
@@ -27,7 +27,6 @@
 #endif
 
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 

diff --git a/source/rpcclient/cmd_srvsvc.c b/source/rpcclient/cmd_srvsvc.c
index 9deb9e801c6cc2274a62d0d551c44731ebef162f..e1d95af381f5f3e0507784b26fe3c9b0a64f4396 100644 (file)
--- a/source/rpcclient/cmd_srvsvc.c
+++ b/source/rpcclient/cmd_srvsvc.c
@@ -27,7 +27,6 @@
 #endif
 
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 

diff --git a/source/rpcclient/cmd_wkssvc.c b/source/rpcclient/cmd_wkssvc.c
index 0b8f469af372625d51857c29e5feedeaba92d0ec..1e64f384aeb4785a9f889f1c62c85c0ed1da6d17 100644 (file)
--- a/source/rpcclient/cmd_wkssvc.c
+++ b/source/rpcclient/cmd_wkssvc.c
@@ -27,7 +27,6 @@
 #endif
 
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 

diff --git a/source/smbd/ipc.c b/source/smbd/ipc.c
index f87423c9cacf23b1a18ef83511774fd0d8daa4f1..73addda086c58d0791356de9a10fab1f019b0ef0 100644 (file)
--- a/source/smbd/ipc.c
+++ b/source/smbd/ipc.c
@@ -27,7 +27,6 @@
    */
 
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 extern int max_send;

diff --git a/source/smbd/lanman.c b/source/smbd/lanman.c
index aaf2bc017f682dabb8b11f38d4b1979692c542da..9774305fc92acdd8d868691b261aa18bcf9718d0 100644 (file)
--- a/source/smbd/lanman.c
+++ b/source/smbd/lanman.c
@@ -27,7 +27,6 @@
    */
 
 #include "includes.h"
-#include "nterr.h"
 
 #ifdef CHECK_TYPES
 #undef CHECK_TYPES

diff --git a/source/smbd/nttrans.c b/source/smbd/nttrans.c
index b4ae0f61a9a4aa23d7cdac2b4c8953e0dd166c94..98f5959c2dc88d1a2348ffb0afef97193e312481 100644 (file)
--- a/source/smbd/nttrans.c
+++ b/source/smbd/nttrans.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 extern int Protocol;

diff --git a/source/smbd/pipes.c b/source/smbd/pipes.c
index 5d5c6a653a4c1ebe31caebc8f9085c3444c60e3a..0cfe653d306e3826966f2a400d42012504f6cc7d 100644 (file)
--- a/source/smbd/pipes.c
+++ b/source/smbd/pipes.c
@@ -27,7 +27,6 @@
 
 
 #include "includes.h"
-#include "trans2.h"
 
 #define        PIPE            "\\PIPE\\"
 #define        PIPELEN         strlen(PIPE)

diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index a020f5eb3b12189e1f30a56b45886f5199ea0ed0..590dc4f42701f30bb3feb662ce2e151ac3242ae9 100644 (file)
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -25,8 +25,6 @@
 
 
 #include "includes.h"
-#include "trans2.h"
-#include "nterr.h"
 
 /* look in server.c for some explanation of these variables */
 extern int Protocol;

diff --git a/source/smbd/server.c b/source/smbd/server.c
index 83c70a9e89a6e87b77653eab11455511ed09c225..8e4de78cbfa5c3c1b64e05baaaf37f18804da982 100644 (file)
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -20,7 +20,6 @@
 */
 
 #include "includes.h"
-#include "trans2.h"
 
 pstring servicesf = CONFIGFILE;
 extern pstring debugf;

diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c
index a30038a431ee58466907975162a84ad857b16613..4e502f767bdc13086479965e8ecdcb57895cfbae 100644 (file)
--- a/source/smbd/trans2.c
+++ b/source/smbd/trans2.c
@@ -22,7 +22,6 @@
 */
 
 #include "includes.h"
-#include "trans2.h"
 
 extern int DEBUGLEVEL;
 extern int Protocol;