3 files changed, 22 insertions, 33 deletions
diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h
index 46be965d70..b754dd8525 100644
--- a/source3/include/ntdomain.h
+++ b/source3/include/ntdomain.h
@@ -31,6 +31,8 @@
 /* miscellaneous structures / defines */
 #include "rpc_misc.h"
 
+#include "rpc_creds.h"
+
 /*
  * A bunch of stuff that was put into smb.h
  * in the NTDOM branch - it didn't belong there.
@@ -114,6 +116,21 @@ typedef struct _input_data {
     prs_struct data;
 } input_data;
 
+struct msrpc_state
+{
+	fstring pipe_name;
+	struct user_creds usr;
+	struct ntdom_info nt;
+
+	int fd;
+	BOOL redirect;
+	BOOL initialised;
+	char *inbuf;
+	char *outbuf;
+
+	uint32 pid;
+};
+
 typedef struct pipes_struct
 {
 	struct pipes_struct *next, *prev;
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 6a09935226..d65c5a5d64 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -812,7 +812,7 @@ int setup_dfs_referral(char* pathname, int max_referral_level,
 int dfs_path_error(char* inbuf, char* outbuf);
 int setup_dfs_referral(char* pathname, int max_referral_level, 
 		       char** ppdata);
-int unistr_to_dos(char* dst,uint16* src)	       ;
+void unistr_to_dos(char* dst,uint16* src)	       ;
 
 /*The following definitions come from  msdfs/msdfs_tdb.c  */
 
@@ -2609,11 +2609,10 @@ BOOL api_rpcTNP(pipes_struct *p, char *rpc_name, struct api_struct *api_rpc_cmds
 void set_pipe_handle_offset(int max_open_files);
 void reset_chain_p(void);
 void init_rpc_pipe_hnd(void);
-BOOL pipe_init_outgoing_data(output_data *o_data);
 pipes_struct *open_rpc_pipe_p(char *pipe_name, 
 			      connection_struct *conn, uint16 vuid);
 ssize_t write_to_pipe(pipes_struct *p, char *data, size_t n);
-int read_from_pipe(pipes_struct *p, char *data, int n);
+ssize_t read_from_pipe(pipes_struct *p, char *data, size_t n);
 BOOL wait_rpc_pipe_hnd_state(pipes_struct *p, uint16 priority);
 BOOL set_rpc_pipe_hnd_state(pipes_struct *p, uint16 device_state);
 BOOL close_rpc_pipe_hnd(pipes_struct *p, connection_struct *conn);
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 15b491239c..a179a7808e 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -171,8 +171,6 @@ implemented */
 #define ERRbaddirectory 267 /* Invalid directory name in a path. */
 #define ERRunknownipc 2142
 
-#define ERROR_ACCESS_DENIED		  (5)
-#define ERROR_INVALID_HANDLE		  (6)
 #define ERROR_INVALID_PARAMETER		 (87)
 #define ERROR_INSUFFICIENT_BUFFER	(122)
 #define ERROR_INVALID_NAME		(123)
@@ -618,9 +616,6 @@ struct dcinfo
   uchar  md4pw[16];   /* md4(machine password) */
 };
 
-#include "nt_printing.h"
-
-#include "ntdomain.h"
 
 typedef struct
 {
@@ -640,18 +635,8 @@ typedef struct
 	/* per-user authentication information on NT RPCs */
 	/* lkclXXXX - THIS SHOULD NOT BE HERE! */
 	struct dcinfo dc;
-
-	NET_USER_INFO_3 usr;
-
 } user_struct;
 
-typedef struct
-{
-	uint32 pid;
-	uint16 vuid;
-
-} vuser_key;
-
 enum {LPQ_QUEUED,LPQ_PAUSED,LPQ_SPOOLING,LPQ_PRINTING};
 
 typedef struct _print_queue_struct
@@ -1679,8 +1664,6 @@ struct pwd_info
 	uchar sess_key[16];
 };
 
-#include "rpc_creds.h"
-
 struct ntdom_info
 {
 	unsigned char sess_key[16];        /* Current session key. */
@@ -1694,20 +1677,10 @@ struct ntdom_info
 	int max_xmit_frag;
 };
 
-struct msrpc_state
-{
-	fstring pipe_name;
-	struct user_creds usr;
-	struct ntdom_info nt;
-
-	int fd;
-	BOOL redirect;
-	BOOL initialised;
-	char *inbuf;
-	char *outbuf;
+#include "nt_printing.h"
+#include "rpc_creds.h"
+#include "ntdomain.h"
 
-	uint32 pid;
-};
 #include "client.h"
 #include "rpcclient.h"