3 files changed, 29 insertions, 5 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index a821ce181f..69692e5847 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -596,6 +596,9 @@ char *mktemp(char *); /* No standard include */
 #include <sys/vfs.h>
 #include <sys/id.h>
 #include <sys/priv.h>
+#ifdef ALLOW_CHANGE_PASSWORD
+#include <termios.h>  
+#endif /* ALLOW_CHANGE_PASSWORD */
 /* According to AIX 4.1 man pages, inet_ntoa needs the following headers */
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 6a64059eb1..3acfb0cf5e 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1593,6 +1593,13 @@ struct packet_struct *receive_packet(int fd,enum packet_type type,int t);
 
 char *get_nt_error_msg(uint32 nt_code);
 
+/*The following definitions come from  nttrans.c  */
+
+int reply_ntcreate_and_X(char *inbuf,char *outbuf,int length,int bufsize);
+int reply_ntcancel(char *inbuf,char *outbuf,int length,int bufsize);
+int reply_nttranss(char *inbuf,char *outbuf,int length,int bufsize);
+int reply_nttrans(char *inbuf,char *outbuf,int length,int bufsize);
+
 /*The following definitions come from  params.c  */
 
 BOOL pm_process( char *FileName,
diff --git a/source3/include/smb.h b/source3/include/smb.h
index e58fcc034d..ca295f3b42 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1112,11 +1112,25 @@ struct parm_struct
 #define FILE_FLAG_POSIX_SEMANTICS  0x01000000L
 
 /* CreateDisposition field. */
-#define CREATE_NEW 1
-#define CREATE_ALWAYS 2
-#define OPEN_EXISTING 3
-#define OPEN_ALWAYS 4
-#define TRUNCATE_EXISTING 5
+#define FILE_SUPERSEDE 0
+#define FILE_OPEN 1
+#define FILE_CREATE 2
+#define FILE_OPEN_IF 3
+#define FILE_OVERWRITE 4
+#define FILE_OVERWRITE_IF 5
+
+/* Responses when opening a file. */
+#define FILE_WAS_OPENED 1
+#define FILE_WAS_CREATED 2
+#define FILE_WAS_OVERWRITTEN 3
+
+/* File type flags */
+#define FILE_TYPE_DISK  0
+#define FILE_TYPE_BYTE_MODE_PIPE 1
+#define FILE_TYPE_MESSAGE_MODE_PIPE 2
+#define FILE_TYPE_PRINTER 3
+#define FILE_TYPE_COMM_DEVICE 4
+#define FILE_TYPE_UNKNOWN 0xFFFF
 
 /* Flag for NT transact rename call. */
 #define RENAME_REPLACE_IF_EXISTS 1