credentials, query info reply.

(This used to be commit 9b095887df204393090d7da9a47508685ddd5163)

3 files changed, 9 insertions, 10 deletions

diff --git a/source3/include/byteorder.h b/source3/include/byteorder.h
index a6f826b518..06337b91a2 100644
--- a/source3/include/byteorder.h
+++ b/source3/include/byteorder.h
@@ -220,10 +220,10 @@ it also defines lots of intermediate macros, just ignore those :-)
 #define DBG_RW_SVAL(string,depth,base,read,inbuf,outbuf) \
 	RW_SVAL(read,inbuf,outbuf,0) \
 	DEBUG(5,("%s%04x %s: %04x\n", \
-             tab_depth(depth), PTR_DIFF(inbuf,base),string, *(inbuf)));
+             tab_depth(depth), PTR_DIFF(inbuf,base),string, *((uint16*)(inbuf))));
 
 #define DBG_RW_IVAL(string,depth,base,read,inbuf,outbuf) \
 	RW_IVAL(read,inbuf,outbuf,0) \
 	DEBUG(5,("%s%04x %s: %08x\n", \
-             tab_depth(depth), PTR_DIFF(inbuf,base),string, *(inbuf)));
+             tab_depth(depth), PTR_DIFF(inbuf,base),string, *((uint32*)(inbuf))));
 
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 324431e2b3..ca60239412 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -63,10 +63,10 @@ int tar_parseargs(int argc, char *argv[], char *Optarg, int Optind);
 /*The following definitions come from  credentials.c  */
 
 void cred_session_key(DOM_CHAL *clnt_chal, DOM_CHAL *srv_chal, char *pass, 
-		       char *session_key);
-void cred_create(char *session_key, DOM_CHAL *stored_cred, UTIME timestamp, 
+		       uint32 session_key[2]);
+void cred_create(uint32 session_key[2], DOM_CHAL *stor_cred, UTIME timestamp, 
 		 DOM_CHAL *cred);
-int cred_assert(DOM_CHAL *cred, char *session_key, DOM_CHAL *stored_cred,
+int cred_assert(DOM_CHAL *cred, uint32 session_key[2], DOM_CHAL *stored_cred,
 		UTIME timestamp);
 
 /*The following definitions come from  dir.c  */
@@ -665,7 +665,7 @@ int make_rpc_reply(char *inbuf, char *q, int data_len);
 void make_uni_hdr(UNIHDR *hdr, int max_len, int len, uint16 terminate);
 void make_uni_hdr2(UNIHDR2 *hdr, int max_len, int len, uint16 terminate);
 void make_unistr(UNISTR *str, char *buf);
-void make_unistr2(UNISTR2 *str, char *buf, int len, char terminate);
+void make_unistr2(UNISTR2 *str, char *buf, int len);
 void make_dom_rid2(DOM_RID2 *rid2, uint32 rid);
 void make_dom_sid2(DOM_SID2 *sid2, char *sid_str);
 
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 58dfc141bd..8e34b06359 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -394,7 +394,7 @@ typedef struct log_info
 /* DOM_CHAL - challenge info */
 typedef struct chal_info
 {
-  uint8 data[8]; /* credentials */
+  uint32 data[2]; /* credentials */
 
 } DOM_CHAL;
 
@@ -492,7 +492,6 @@ typedef struct rpc_hdr_info
 typedef struct dom_query_info
 {
   uint16 uni_dom_max_len; /* domain name string length * 2 */
-  uint16 padding;         /* 2 padding bytes? */
   uint16 uni_dom_str_len; /* domain name string length * 2 */
   uint32 buffer_dom_name; /* undocumented domain name string buffer pointer */
   uint32 buffer_dom_sid; /* undocumented domain SID string buffer pointer */
@@ -1018,8 +1017,8 @@ struct dcinfo
   DOM_CHAL clnt_cred; /* Last client credential */
   DOM_CHAL srv_cred;  /* Last server credential */
 
-  char  sess_key[8]; /* Session key */
-  uchar md4pw[16];   /* md4(machine password) */
+  uint32 sess_key[2]; /* Session key */
+  uchar  md4pw[16];   /* md4(machine password) */
 };
 
 typedef struct