5 files changed, 35 insertions, 15 deletions
diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h
index 07d06656c0..c1b966aa59 100644
--- a/source3/include/ntdomain.h
+++ b/source3/include/ntdomain.h
@@ -24,6 +24,10 @@
 #ifndef _NT_DOMAIN_H /* _NT_DOMAIN_H */
 #define _NT_DOMAIN_H 
 
+/* 
+ * A bunch of stuff that was put into smb.h
+ * in the NTDOM branch - it didn't belong there.
+ */
 
 /* dce/rpc support */
 #include "rpc_dce.h"
@@ -33,19 +37,6 @@
 
 /* security descriptor structures */
 #include "rpc_secdes.h" 
-
-/* different dce/rpc pipes */
-#include "rpc_lsa.h"
-#include "rpc_netlogon.h"
-#include "rpc_reg.h"
-#include "rpc_samr.h"
-#include "rpc_srvsvc.h"
-#include "rpc_wkssvc.h"
-
-/* 
- * A bunch of stuff that was put into smb.h
- * in the NTDOM branch - it didn't belong there.
- */
  
 typedef struct _prs_struct 
 {
@@ -157,4 +148,13 @@ struct acct_info
     uint32 smb_userid; /* domain-relative RID */
 };
 
+/* different dce/rpc pipes */
+#include "rpc_lsa.h"
+#include "rpc_netlogon.h"
+#include "rpc_reg.h"
+#include "rpc_samr.h"
+#include "rpc_srvsvc.h"
+#include "rpc_wkssvc.h"
+#include "rpc_spoolss.h"
+
 #endif /* _NT_DOMAIN_H */
diff --git a/source3/include/nterr.h b/source3/include/nterr.h
index a94464a013..8793509119 100644
--- a/source3/include/nterr.h
+++ b/source3/include/nterr.h
@@ -1,7 +1,18 @@
+
+/* Win32 Status codes. */
+
+#define STATUS_BUFFER_OVERFLOW            (5)
+#define STATUS_MORE_ENTRIES           (0x105)
+#define ERROR_INVALID_HANDLE		  (6)
+#define ERROR_INVALID_PARAMETER		 (87)
+#define ERROR_INSUFFICIENT_BUFFER	(122)
+#define STATUS_1804	               (1804)
+
 /* these are the NT error codes less than 1000. They are here for when
    we start supporting NT error codes in Samba. They were extracted
    using a loop in smbclient then printing a netmon sniff to a file */
 
+#define NT_STATUS_NO_PROBLEMO (0)
 #define NT_STATUS_UNSUCCESSFUL (1)
 #define NT_STATUS_NOT_IMPLEMENTED (2)
 #define NT_STATUS_INVALID_INFO_CLASS (3)
diff --git a/source3/include/rpc_dce.h b/source3/include/rpc_dce.h
index 9ffcf50337..19527ca6e2 100644
--- a/source3/include/rpc_dce.h
+++ b/source3/include/rpc_dce.h
@@ -37,6 +37,8 @@ enum RPC_PKT_TYPE
 	RPC_BIND     = 0x0B,
 	RPC_BINDACK  = 0x0C,
 	RPC_BINDNACK = 0x0D,
+	RPC_ALTCONT  = 0x0E,
+	RPC_ALTCONTRESP = 0x0F,
 	RPC_BINDRESP = 0x10 /* not the real name!  this is undocumented! */
 };
 
diff --git a/source3/include/rpc_misc.h b/source3/include/rpc_misc.h
index b837c8a67c..e96d6d4527 100644
--- a/source3/include/rpc_misc.h
+++ b/source3/include/rpc_misc.h
@@ -156,6 +156,13 @@ typedef struct buffer3_info
 
 } BUFFER3;
 
+/* BUFFER5 */
+typedef struct buffer5_info
+{
+  uint32 buf_len;
+  uint16 *buffer; /* data */
+} BUFFER5;
+
 /* UNISTR2 - unicode string size (in uint16 unicode chars) and buffer */
 typedef struct unistr2_info
 {
diff --git a/source3/include/smb.h b/source3/include/smb.h
index f0ed34bd40..085325939f 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -53,7 +53,6 @@ typedef int BOOL;
 #define SMB_SECONDARY_WAIT (60*1000)
 
 /* Debugging stuff */
-
 #include "debug.h"
 
 /* this defines the error codes that receive_smb can put in smb_read_error */
@@ -267,7 +266,7 @@ typedef smb_ucs2_t wfstring[128];
 #define PIPE_NTSVCS   "\\PIPE\\ntsvcs"
 #define PIPE_LSASS    "\\PIPE\\lsass"
 #define PIPE_LSARPC   "\\PIPE\\lsarpc"
-
+#define PIPE_SPOOLSS  "\\PIPE\\spoolss"
 
 /* 64 bit time (100usec) since ????? - cifs6.txt, section 3.5, page 30 */
 typedef struct nttime_info
@@ -1604,6 +1603,7 @@ extern int chain_size;
 
 #include "smb_macros.h"
 
+#include "nt_printing.h"
 #include "ntdomain.h"
 
 /* A netbios name structure. */