getting somewhere.

ipc.c :

	removed srvsvc pipe reference: have to do that.

pipes.c lsaparse.c smbparse.c :

	more debugging info.  looks a bit like netmon output.
(This used to be commit e02aa88e25ae6d4da7953aaff04ff2ae9a656d05)

1 files changed, 186 insertions, 114 deletions

diff --git a/source3/smbparse.c b/source3/smbparse.c
index a0363c7108..d7fbf53020 100644
--- a/source3/smbparse.c
+++ b/source3/smbparse.c
@@ -27,13 +27,16 @@ extern int DEBUGLEVEL;
 /*******************************************************************
 reads or writes a UTIME type.
 ********************************************************************/
-char* smb_io_utime(BOOL io, UTIME *t, char *q, char *base, int align)
+char* smb_io_utime(BOOL io, UTIME *t, char *q, char *base, int align, int depth)
 {
 	if (t == NULL) return NULL;
 
+	DEBUG(5,("%s%04x smb_io_utime\n",  tab_depth(depth), PTR_DIFF(q, base)));
+	depth++;
+
 	q = align_offset(q, base, align);
 	
-	RW_IVAL (io, q, t->time, 0); q += 4;
+	DBG_RW_IVAL ("time", depth, base, io, q, t->time); q += 4;
 
 	return q;
 }
@@ -41,14 +44,17 @@ char* smb_io_utime(BOOL io, UTIME *t, char *q, char *base, int align)
 /*******************************************************************
 reads or writes an NTTIME structure.
 ********************************************************************/
-char* smb_io_time(BOOL io, NTTIME *nttime, char *q, char *base, int align)
+char* smb_io_time(BOOL io, NTTIME *nttime, char *q, char *base, int align, int depth)
 {
 	if (nttime == NULL) return NULL;
 
+	DEBUG(5,("%s%04x smb_io_time\n",  tab_depth(depth), PTR_DIFF(q, base)));
+	depth++;
+
 	q = align_offset(q, base, align);
 	
-	RW_IVAL(io, q, nttime->low , 0); q += 4; /* low part */
-	RW_IVAL(io, q, nttime->high, 0); q += 4; /* high part */
+	DBG_RW_IVAL("low", depth, base, io, q, nttime->low ); q += 4; /* low part */
+	DBG_RW_IVAL("high", depth, base, io, q, nttime->high); q += 4; /* high part */
 
 	return q;
 }
@@ -56,26 +62,31 @@ char* smb_io_time(BOOL io, NTTIME *nttime, char *q, char *base, int align)
 /*******************************************************************
 reads or writes a DOM_SID structure.
 ********************************************************************/
-char* smb_io_dom_sid(BOOL io, DOM_SID *sid, char *q, char *base, int align)
+char* smb_io_dom_sid(BOOL io, DOM_SID *sid, char *q, char *base, int align, int depth)
 {
 	int i;
 
 	if (sid == NULL) return NULL;
 
+	DEBUG(5,("%s%04x smb_io_dom_sid\n",  tab_depth(depth), PTR_DIFF(q, base)));
+	depth++;
+
 	q = align_offset(q, base, align);
 	
-	RW_CVAL(io, q, sid->sid_no, 0); q++; 
-	RW_CVAL(io, q, sid->num_auths, 0); q++;
+	DBG_RW_CVAL("sid_no", depth, base, io, q, sid->sid_no); q++; 
+	DBG_RW_CVAL("num_auths", depth, base, io, q, sid->num_auths); q++;
 
 	for (i = 0; i < 6; i++)
 	{
-		RW_CVAL(io, q, sid->id_auth[i], 0); q++;
+		fstring tmp;
+		sprintf(tmp, "id_auth[%d] ", i);
+		DBG_RW_CVAL(tmp, depth, base, io, q, sid->id_auth[i]); q++;
 	}
 
 	/* oops! XXXX should really issue a warning here... */
 	if (sid->num_auths > MAXSUBAUTHS) sid->num_auths = MAXSUBAUTHS;
 
-	RW_PSVAL(io, q, sid->sub_auths, sid->num_auths); q += sid->num_auths * 2;
+	DBG_RW_PSVAL("num_auths", depth, base, io, q, sid->sub_auths, sid->num_auths); q += sid->num_auths * 2;
 
 	return q;
 }
@@ -83,18 +94,21 @@ char* smb_io_dom_sid(BOOL io, DOM_SID *sid, char *q, char *base, int align)
 /*******************************************************************
 reads or writes a UNIHDR structure.
 ********************************************************************/
-char* smb_io_unihdr(BOOL io, UNIHDR *hdr, char *q, char *base, int align)
+char* smb_io_unihdr(BOOL io, UNIHDR *hdr, char *q, char *base, int align, int depth)
 {
 	if (hdr == NULL) return NULL;
 
+	DEBUG(5,("%s%04x smb_io_unihdr\n",  tab_depth(depth), PTR_DIFF(q, base)));
+	depth++;
+
 	/* should be value 4, so enforce it. */
 	hdr->undoc = 4;
 
 	q = align_offset(q, base, align);
 	
-	RW_IVAL(io, q, hdr->uni_max_len, 0); q += 4;
-	RW_IVAL(io, q, hdr->uni_str_len, 0); q += 4;
-	RW_IVAL(io, q, hdr->undoc      , 0); q += 4;
+	DBG_RW_IVAL("uni_max_len", depth, base, io, q, hdr->uni_max_len); q += 4;
+	DBG_RW_IVAL("uni_str_len", depth, base, io, q, hdr->uni_str_len); q += 4;
+	DBG_RW_IVAL("undoc", depth, base, io, q, hdr->undoc      ); q += 4;
 
 	return q;
 }
@@ -102,14 +116,17 @@ char* smb_io_unihdr(BOOL io, UNIHDR *hdr, char *q, char *base, int align)
 /*******************************************************************
 reads or writes a UNIHDR2 structure.
 ********************************************************************/
-char* smb_io_unihdr2(BOOL io, UNIHDR2 *hdr2, char *q, char *base, int align)
+char* smb_io_unihdr2(BOOL io, UNIHDR2 *hdr2, char *q, char *base, int align, int depth)
 {
 	if (hdr2 == NULL) return NULL;
 
+	DEBUG(5,("%s%04x smb_io_unihdr2\n",  tab_depth(depth), PTR_DIFF(q, base)));
+	depth++;
+
 	q = align_offset(q, base, align);
 
-	q = smb_io_unihdr(io, &(hdr2->unihdr), q, base, align);
-	RW_IVAL(io, q, hdr2->undoc_buffer, 0); q += 4;
+	q = smb_io_unihdr(io, &(hdr2->unihdr), q, base, align, depth);
+	DBG_RW_IVAL("undoc_buffer", depth, base, io, q, hdr2->undoc_buffer); q += 4;
 
 	return q;
 }
@@ -118,10 +135,13 @@ char* smb_io_unihdr2(BOOL io, UNIHDR2 *hdr2, char *q, char *base, int align)
 reads or writes a UNISTR structure.
 XXXX NOTE: UNISTR structures NEED to be null-terminated.
 ********************************************************************/
-char* smb_io_unistr(BOOL io, UNISTR *uni, char *q, char *base, int align)
+char* smb_io_unistr(BOOL io, UNISTR *uni, char *q, char *base, int align, int depth)
 {
 	if (uni == NULL) return NULL;
 
+	DEBUG(5,("%s%04x smb_io_unistr\n",  tab_depth(depth), PTR_DIFF(q, base)));
+	depth++;
+
 	q = align_offset(q, base, align);
 	
 	if (io)
@@ -143,18 +163,21 @@ XXXX NOTE: UNISTR2 structures need NOT be null-terminated.
      the uni_str_len member tells you how long the string is;
      the uni_max_len member tells you how large the buffer is.
 ********************************************************************/
-char* smb_io_unistr2(BOOL io, UNISTR2 *uni2, char *q, char *base, int align)
+char* smb_io_unistr2(BOOL io, UNISTR2 *uni2, char *q, char *base, int align, int depth)
 {
 	if (uni2 == NULL) return NULL;
 
+	DEBUG(5,("%s%04x smb_io_unistr2\n",  tab_depth(depth), PTR_DIFF(q, base)));
+	depth++;
+
 	q = align_offset(q, base, align);
 	
 	/* should be value 0, so enforce it. */
 	uni2->undoc = 0;
 
-	RW_IVAL(io, q, uni2->uni_max_len, 0); q += 4;
-	RW_IVAL(io, q, uni2->undoc      , 0); q += 4;
-	RW_IVAL(io, q, uni2->uni_str_len, 0); q += 4;
+	DBG_RW_IVAL("uni_max_len", depth, base, io, q, uni2->uni_max_len); q += 4;
+	DBG_RW_IVAL("undoc", depth, base, io, q, uni2->undoc      ); q += 4;
+	DBG_RW_IVAL("uni_str_len", depth, base, io, q, uni2->uni_str_len); q += 4;
 
 	/* oops! XXXX maybe issue a warning that this is happening... */
 	if (uni2->uni_max_len > MAX_UNISTRLEN) uni2->uni_max_len = MAX_UNISTRLEN;
@@ -162,7 +185,7 @@ char* smb_io_unistr2(BOOL io, UNISTR2 *uni2, char *q, char *base, int align)
 
 	/* buffer advanced by indicated length of string
        NOT by searching for null-termination */
-	RW_PSVAL(io, q, uni2->buffer, uni2->uni_max_len); q += uni2->uni_max_len * 2;
+	DBG_RW_PSVAL("", depth, base, io, q, uni2->buffer, uni2->uni_max_len); q += uni2->uni_max_len * 2;
 
 	return q;
 }
@@ -170,10 +193,13 @@ char* smb_io_unistr2(BOOL io, UNISTR2 *uni2, char *q, char *base, int align)
 /*******************************************************************
 reads or writes a DOM_SID2 structure.
 ********************************************************************/
-char* smb_io_dom_sid2(BOOL io, DOM_SID2 *sid2, char *q, char *base, int align)
+char* smb_io_dom_sid2(BOOL io, DOM_SID2 *sid2, char *q, char *base, int align, int depth)
 {
 	if (sid2 == NULL) return NULL;
 
+	DEBUG(5,("%s%04x smb_io_dom_sid2\n",  tab_depth(depth), PTR_DIFF(q, base)));
+	depth++;
+
 	q = align_offset(q, base, align);
 	
 	/* should be value 5, so enforce it */
@@ -182,11 +208,11 @@ char* smb_io_dom_sid2(BOOL io, DOM_SID2 *sid2, char *q, char *base, int align)
 	/* should be value 0, so enforce it */
 	sid2->undoc = 0;
 
-	RW_IVAL(io, q, sid2->type , 0); q += 4;
-	RW_IVAL(io, q, sid2->undoc, 0); q += 4;
+	DBG_RW_IVAL("type", depth, base, io, q, sid2->type ); q += 4;
+	DBG_RW_IVAL("undoc", depth, base, io, q, sid2->undoc); q += 4;
 
-	q = smb_io_unihdr2(io, &(sid2->hdr), q, base, align);
-	q = smb_io_unistr (io, &(sid2->str), q, base, align);
+	q = smb_io_unihdr2(io, &(sid2->hdr), q, base, align, depth);
+	q = smb_io_unistr (io, &(sid2->str), q, base, align, depth);
 
 	return q;
 }
@@ -194,10 +220,13 @@ char* smb_io_dom_sid2(BOOL io, DOM_SID2 *sid2, char *q, char *base, int align)
 /*******************************************************************
 reads or writes a DOM_RID2 structure.
 ********************************************************************/
-char* smb_io_dom_rid2(BOOL io, DOM_RID2 *rid2, char *q, char *base, int align)
+char* smb_io_dom_rid2(BOOL io, DOM_RID2 *rid2, char *q, char *base, int align, int depth)
 {
 	if (rid2 == NULL) return NULL;
 
+	DEBUG(5,("%s%04x smb_io_dom_rid2\n",  tab_depth(depth), PTR_DIFF(q, base)));
+	depth++;
+
 	q = align_offset(q, base, align);
 	
 	/* should be value 5, so enforce it */
@@ -206,10 +235,10 @@ char* smb_io_dom_rid2(BOOL io, DOM_RID2 *rid2, char *q, char *base, int align)
 	/* should be value 5, so enforce it */
 	rid2->undoc = 5;
 
-	RW_IVAL(io, q, rid2->type, 0); q += 4;
-	RW_IVAL(io, q, rid2->undoc   , 0); q += 4;
-	RW_IVAL(io, q, rid2->rid     , 0); q += 4;
-	RW_IVAL(io, q, rid2->rid_idx , 0); q += 4;
+	DBG_RW_IVAL("type", depth, base, io, q, rid2->type); q += 4;
+	DBG_RW_IVAL("undoc", depth, base, io, q, rid2->undoc   ); q += 4;
+	DBG_RW_IVAL("rid", depth, base, io, q, rid2->rid     ); q += 4;
+	DBG_RW_IVAL("rid_idx", depth, base, io, q, rid2->rid_idx ); q += 4;
 
 	return q;
 }
@@ -217,21 +246,24 @@ char* smb_io_dom_rid2(BOOL io, DOM_RID2 *rid2, char *q, char *base, int align)
 /*******************************************************************
 reads or writes a DOM_LOG_INFO structure.
 ********************************************************************/
-char* smb_io_log_info(BOOL io, DOM_LOG_INFO *log, char *q, char *base, int align)
+char* smb_io_log_info(BOOL io, DOM_LOG_INFO *log, char *q, char *base, int align, int depth)
 {
 	if (log == NULL) return NULL;
 
+	DEBUG(5,("%s%04x smb_io_log_info\n",  tab_depth(depth), PTR_DIFF(q, base)));
+	depth++;
+
 	q = align_offset(q, base, align);
 	
-	RW_IVAL(io, q, log->undoc_buffer, 0); q += 4;
+	DBG_RW_IVAL("undoc_buffer", depth, base, io, q, log->undoc_buffer); q += 4;
 
-	q = smb_io_unistr2(io, &(log->uni_logon_srv), q, base, align);
-	q = smb_io_unistr2(io, &(log->uni_acct_name), q, base, align);
+	q = smb_io_unistr2(io, &(log->uni_logon_srv), q, base, align, depth);
+	q = smb_io_unistr2(io, &(log->uni_acct_name), q, base, align, depth);
 
-	RW_SVAL(io, q, log->sec_chan, 0); q += 2;
+	DBG_RW_SVAL("sec_chan", depth, base, io, q, log->sec_chan); q += 2;
 
 	/* XXXX no alignment required between sec_chan and uni_comp_name */
-	q = smb_io_unistr2(io, &(log->uni_comp_name), q, base, 0);
+	q = smb_io_unistr2(io, &(log->uni_comp_name), q, base, 0, depth);
 
 	return q;
 }
@@ -239,13 +271,16 @@ char* smb_io_log_info(BOOL io, DOM_LOG_INFO *log, char *q, char *base, int align
 /*******************************************************************
 reads or writes a DOM_CHAL structure.
 ********************************************************************/
-char* smb_io_chal(BOOL io, DOM_CHAL *chal, char *q, char *base, int align)
+char* smb_io_chal(BOOL io, DOM_CHAL *chal, char *q, char *base, int align, int depth)
 {
 	if (chal == NULL) return NULL;
 
+	DEBUG(5,("%s%04x smb_io_chal\n",  tab_depth(depth), PTR_DIFF(q, base)));
+	depth++;
+
 	q = align_offset(q, base, align);
 	
-	RW_PCVAL(io, q, chal->data, 8); q += 8;
+	DBG_RW_PCVAL("data", depth, base, io, q, chal->data, 8); q += 8;
 
 	return q;
 }
@@ -253,14 +288,17 @@ char* smb_io_chal(BOOL io, DOM_CHAL *chal, char *q, char *base, int align)
 /*******************************************************************
 reads or writes a DOM_CRED structure.
 ********************************************************************/
-char* smb_io_cred(BOOL io, DOM_CRED *cred, char *q, char *base, int align)
+char* smb_io_cred(BOOL io, DOM_CRED *cred, char *q, char *base, int align, int depth)
 {
 	if (cred == NULL) return NULL;
 
+	DEBUG(5,("%s%04x smb_io_cred\n",  tab_depth(depth), PTR_DIFF(q, base)));
+	depth++;
+
 	q = align_offset(q, base, align);
 	
-	q = smb_io_chal (io, &(cred->challenge), q, base, align);
-	q = smb_io_utime(io, &(cred->timestamp), q, base, align);
+	q = smb_io_chal (io, &(cred->challenge), q, base, align, depth);
+	q = smb_io_utime(io, &(cred->timestamp), q, base, align, depth);
 
 	return q;
 }
@@ -268,14 +306,17 @@ char* smb_io_cred(BOOL io, DOM_CRED *cred, char *q, char *base, int align)
 /*******************************************************************
 reads or writes a DOM_CLNT_INFO structure.
 ********************************************************************/
-char* smb_io_clnt_info(BOOL io, DOM_CLNT_INFO *clnt, char *q, char *base, int align)
+char* smb_io_clnt_info(BOOL io, DOM_CLNT_INFO *clnt, char *q, char *base, int align, int depth)
 {
 	if (clnt == NULL) return NULL;
 
+	DEBUG(5,("%s%04x smb_io_clnt_info\n",  tab_depth(depth), PTR_DIFF(q, base)));
+	depth++;
+
 	q = align_offset(q, base, align);
 	
-	q = smb_io_log_info(io, &(clnt->login), q, base, align);
-	q = smb_io_cred    (io, &(clnt->cred ), q, base, align);
+	q = smb_io_log_info(io, &(clnt->login), q, base, align, depth);
+	q = smb_io_cred    (io, &(clnt->cred ), q, base, align, depth);
 
 	return q;
 }
@@ -283,14 +324,17 @@ char* smb_io_clnt_info(BOOL io, DOM_CLNT_INFO *clnt, char *q, char *base, int al
 /*******************************************************************
 reads or writes a DOM_LOGON_ID structure.
 ********************************************************************/
-char* smb_io_logon_id(BOOL io, DOM_LOGON_ID *log, char *q, char *base, int align)
+char* smb_io_logon_id(BOOL io, DOM_LOGON_ID *log, char *q, char *base, int align, int depth)
 {
 	if (log == NULL) return NULL;
 
+	DEBUG(5,("%s%04x smb_io_logon_id\n",  tab_depth(depth), PTR_DIFF(q, base)));
+	depth++;
+
 	q = align_offset(q, base, align);
 	
-	RW_IVAL(io, q, log->low , 0); q += 4;
-	RW_IVAL(io, q, log->high, 0); q += 4;
+	DBG_RW_IVAL("low", depth, base, io, q, log->low ); q += 4;
+	DBG_RW_IVAL("high", depth, base, io, q, log->high); q += 4;
 
 	return q;
 }
@@ -298,13 +342,16 @@ char* smb_io_logon_id(BOOL io, DOM_LOGON_ID *log, char *q, char *base, int align
 /*******************************************************************
 reads or writes an ARC4_OWF structure.
 ********************************************************************/
-char* smb_io_arc4_owf(BOOL io, ARC4_OWF *hash, char *q, char *base, int align)
+char* smb_io_arc4_owf(BOOL io, ARC4_OWF *hash, char *q, char *base, int align, int depth)
 {
 	if (hash == NULL) return NULL;
 
+	DEBUG(5,("%s%04x smb_io_arc4_owf\n",  tab_depth(depth), PTR_DIFF(q, base)));
+	depth++;
+
 	q = align_offset(q, base, align);
 	
-	RW_PCVAL(io, q, hash->data, 16); q += 16;
+	DBG_RW_PCVAL("data", depth, base, io, q, hash->data, 16); q += 16;
 
 	return q;
 }
@@ -312,26 +359,29 @@ char* smb_io_arc4_owf(BOOL io, ARC4_OWF *hash, char *q, char *base, int align)
 /*******************************************************************
 reads or writes an DOM_ID_INFO_1 structure.
 ********************************************************************/
-char* smb_io_id_info1(BOOL io, DOM_ID_INFO_1 *id, char *q, char *base, int align)
+char* smb_io_id_info1(BOOL io, DOM_ID_INFO_1 *id, char *q, char *base, int align, int depth)
 {
 	if (id == NULL) return NULL;
 
+	DEBUG(5,("%s%04x smb_io_id_info1\n",  tab_depth(depth), PTR_DIFF(q, base)));
+	depth++;
+
 	q = align_offset(q, base, align);
 	
-	q = smb_io_unihdr(io, &(id->hdr_domain_name   ), q, base, align);
+	q = smb_io_unihdr(io, &(id->hdr_domain_name   ), q, base, align, depth);
 
-	RW_IVAL(io, q, id->param, 0); q += 4;
-	q = smb_io_logon_id(io, &(id->logon_id), q, base, align);
+	DBG_RW_IVAL("param", depth, base, io, q, id->param); q += 4;
+	q = smb_io_logon_id(io, &(id->logon_id), q, base, align, depth);
 
-	q = smb_io_unihdr(io, &(id->hdr_user_name     ), q, base, align);
-	q = smb_io_unihdr(io, &(id->hdr_workgroup_name), q, base, align);
+	q = smb_io_unihdr(io, &(id->hdr_user_name     ), q, base, align, depth);
+	q = smb_io_unihdr(io, &(id->hdr_workgroup_name), q, base, align, depth);
 
-	q = smb_io_arc4_owf(io, &(id->arc4_lm_owf), q, base, align);
-	q = smb_io_arc4_owf(io, &(id->arc4_nt_owf), q, base, align);
+	q = smb_io_arc4_owf(io, &(id->arc4_lm_owf), q, base, align, depth);
+	q = smb_io_arc4_owf(io, &(id->arc4_nt_owf), q, base, align, depth);
 
-	q = smb_io_unistr2(io, &(id->uni_domain_name   ), q, base, align);
-	q = smb_io_unistr2(io, &(id->uni_user_name     ), q, base, align);
-	q = smb_io_unistr2(io, &(id->uni_workgroup_name), q, base, align);
+	q = smb_io_unistr2(io, &(id->uni_domain_name   ), q, base, align, depth);
+	q = smb_io_unistr2(io, &(id->uni_user_name     ), q, base, align, depth);
+	q = smb_io_unistr2(io, &(id->uni_workgroup_name), q, base, align, depth);
 
 	return q;
 }
@@ -339,23 +389,26 @@ char* smb_io_id_info1(BOOL io, DOM_ID_INFO_1 *id, char *q, char *base, int align
 /*******************************************************************
 reads or writes a DOM_SAM_INFO structure.
 ********************************************************************/
-char* smb_io_sam_info(BOOL io, DOM_SAM_INFO *sam, char *q, char *base, int align)
+char* smb_io_sam_info(BOOL io, DOM_SAM_INFO *sam, char *q, char *base, int align, int depth)
 {
 	if (sam == NULL) return NULL;
 
+	DEBUG(5,("%s%04x smb_io_sam_info\n",  tab_depth(depth), PTR_DIFF(q, base)));
+	depth++;
+
 	q = align_offset(q, base, align);
 	
-	q = smb_io_clnt_info(io, &(sam->client  ), q, base, align);
-	q = smb_io_cred     (io, &(sam->rtn_cred), q, base, align);
+	q = smb_io_clnt_info(io, &(sam->client  ), q, base, align, depth);
+	q = smb_io_cred     (io, &(sam->rtn_cred), q, base, align, depth);
 
-	RW_IVAL(io, q, sam->logon_level, 0); q += 4;
-	RW_SVAL(io, q, sam->auth_level , 0); q += 4;
+	DBG_RW_IVAL("logon_level", depth, base, io, q, sam->logon_level); q += 4;
+	DBG_RW_SVAL("auth_level", depth, base, io, q, sam->auth_level ); q += 4;
 
 	switch (sam->auth_level)
 	{
 		case 1:
 		{
-			q = smb_io_id_info1(io, &(sam->auth.id1), q, base, align);
+			q = smb_io_id_info1(io, &(sam->auth.id1), q, base, align, depth);
 			break;
 		}
 		default:
@@ -370,14 +423,17 @@ char* smb_io_sam_info(BOOL io, DOM_SAM_INFO *sam, char *q, char *base, int align
 /*******************************************************************
 reads or writes a DOM_GID structure.
 ********************************************************************/
-char* smb_io_gid(BOOL io, DOM_GID *gid, char *q, char *base, int align)
+char* smb_io_gid(BOOL io, DOM_GID *gid, char *q, char *base, int align, int depth)
 {
 	if (gid == NULL) return NULL;
 
+	DEBUG(5,("%s%04x smb_io_gid\n",  tab_depth(depth), PTR_DIFF(q, base)));
+	depth++;
+
 	q = align_offset(q, base, align);
 	
-	RW_IVAL(io, q, gid->gid , 0); q += 4;
-	RW_IVAL(io, q, gid->attr, 0); q += 4;
+	DBG_RW_IVAL("gid", depth, base, io, q, gid->gid ); q += 4;
+	DBG_RW_IVAL("attr", depth, base, io, q, gid->attr); q += 4;
 
 	return q;
 }
@@ -385,24 +441,27 @@ char* smb_io_gid(BOOL io, DOM_GID *gid, char *q, char *base, int align)
 /*******************************************************************
 reads or writes an RPC_HDR structure.
 ********************************************************************/
-char* smb_io_rpc_hdr(BOOL io, RPC_HDR *rpc, char *q, char *base, int align)
+char* smb_io_rpc_hdr(BOOL io, RPC_HDR *rpc, char *q, char *base, int align, int depth)
 {
 	if (rpc == NULL) return NULL;
 
+	DEBUG(5,("%s%04x smb_io_rpc_hdr\n",  tab_depth(depth), PTR_DIFF(q, base)));
+	depth++;
+
 	/* reserved should be zero: enforce it */
 	rpc->reserved = 0;
 
-	RW_CVAL(io, q, rpc->major, 0); q++;
-	RW_CVAL(io, q, rpc->minor, 0); q++;
-	RW_CVAL(io, q, rpc->pkt_type, 0); q++;
-	RW_CVAL(io, q, rpc->frag, 0); q++;
-	RW_IVAL(io, q, rpc->pack_type, 0); q += 4;
-	RW_SVAL(io, q, rpc->frag_len, 0); q += 2;
-	RW_SVAL(io, q, rpc->auth_len, 0); q += 2;
-	RW_IVAL(io, q, rpc->call_id, 0); q += 4;
-	RW_IVAL(io, q, rpc->alloc_hint, 0); q += 4;
-	RW_CVAL(io, q, rpc->context_id, 0); q++;
-	RW_CVAL(io, q, rpc->reserved, 0); q++;
+	DBG_RW_CVAL("major", depth, base, io, q, rpc->major); q++;
+	DBG_RW_CVAL("minor", depth, base, io, q, rpc->minor); q++;
+	DBG_RW_CVAL("pkt_type", depth, base, io, q, rpc->pkt_type); q++;
+	DBG_RW_CVAL("frag", depth, base, io, q, rpc->frag); q++;
+	DBG_RW_IVAL("pack_type", depth, base, io, q, rpc->pack_type); q += 4;
+	DBG_RW_SVAL("frag_len", depth, base, io, q, rpc->frag_len); q += 2;
+	DBG_RW_SVAL("auth_len", depth, base, io, q, rpc->auth_len); q += 2;
+	DBG_RW_IVAL("call_id", depth, base, io, q, rpc->call_id); q += 4;
+	DBG_RW_IVAL("alloc_hint", depth, base, io, q, rpc->alloc_hint); q += 4;
+	DBG_RW_CVAL("context_id", depth, base, io, q, rpc->context_id); q++;
+	DBG_RW_CVAL("reserved", depth, base, io, q, rpc->reserved); q++;
 
 	return q;
 }
@@ -414,7 +473,7 @@ char* smb_io_pol_hnd(BOOL io, LSA_POL_HND *pol, char *q, char *base, int align,
 {
 	if (pol == NULL) return NULL;
 
-	DEBUG(5,("%ssmb_io_pol_hnd\n", tab_depth(depth)));
+	DEBUG(5,("%s%04x smb_io_pol_hnd\n",  tab_depth(depth), PTR_DIFF(q, base)));
 	depth++;
 
 	q = align_offset(q, base, align);
@@ -427,43 +486,46 @@ char* smb_io_pol_hnd(BOOL io, LSA_POL_HND *pol, char *q, char *base, int align,
 /*******************************************************************
 reads or writes a dom query structure.
 ********************************************************************/
-char* smb_io_dom_query_3(BOOL io, DOM_QUERY_3 *d_q, char *q, char *base, int align)
+char* smb_io_dom_query_3(BOOL io, DOM_QUERY_3 *d_q, char *q, char *base, int align, int depth)
 {
-	return smb_io_dom_query(io, d_q, q, base, align);
+	return smb_io_dom_query(io, d_q, q, base, align, depth);
 }
 
 /*******************************************************************
 reads or writes a dom query structure.
 ********************************************************************/
-char* smb_io_dom_query_5(BOOL io, DOM_QUERY_3 *d_q, char *q, char *base, int align)
+char* smb_io_dom_query_5(BOOL io, DOM_QUERY_3 *d_q, char *q, char *base, int align, int depth)
 {
-	return smb_io_dom_query(io, d_q, q, base, align);
+	return smb_io_dom_query(io, d_q, q, base, align, depth);
 }
 
 /*******************************************************************
 reads or writes a dom query structure.
 ********************************************************************/
-char* smb_io_dom_query(BOOL io, DOM_QUERY *d_q, char *q, char *base, int align)
+char* smb_io_dom_query(BOOL io, DOM_QUERY *d_q, char *q, char *base, int align, int depth)
 {
 	if (d_q == NULL) return NULL;
 
+	DEBUG(5,("%s%04x smb_io_dom_query\n",  tab_depth(depth), PTR_DIFF(q, base)));
+	depth++;
+
 	q = align_offset(q, base, align);
 	
 
-	RW_SVAL(io, q, d_q->uni_dom_max_len, 0); q += 2; /* domain name string length * 2 */
-	RW_SVAL(io, q, d_q->padding        , 0); q += 2; /* 2 padding bytes */
-	RW_SVAL(io, q, d_q->uni_dom_str_len, 0); q += 2; /* domain name string length * 2 */
+	DBG_RW_SVAL("uni_dom_max_len", depth, base, io, q, d_q->uni_dom_max_len); q += 2; /* domain name string length * 2 */
+	DBG_RW_SVAL("padding", depth, base, io, q, d_q->padding        ); q += 2; /* 2 padding bytes */
+	DBG_RW_SVAL("uni_dom_str_len", depth, base, io, q, d_q->uni_dom_str_len); q += 2; /* domain name string length * 2 */
 
-	RW_IVAL(io, q, d_q->buffer_dom_name, 0); q += 4; /* undocumented domain name string buffer pointer */
-	RW_IVAL(io, q, d_q->buffer_dom_sid , 0); q += 4; /* undocumented domain SID string buffer pointer */
+	DBG_RW_IVAL("buffer_dom_name", depth, base, io, q, d_q->buffer_dom_name); q += 4; /* undocumented domain name string buffer pointer */
+	DBG_RW_IVAL("buffer_dom_sid", depth, base, io, q, d_q->buffer_dom_sid ); q += 4; /* undocumented domain SID string buffer pointer */
 
 	if (d_q->buffer_dom_name != 0)
 	{
-		q = smb_io_unistr2(io, &(d_q->uni_domain_name), q, base, align); /* domain name (unicode string) */
+		q = smb_io_unistr2(io, &(d_q->uni_domain_name), q, base, align, depth); /* domain name (unicode string) */
 	}
 	if (d_q->buffer_dom_sid != 0)
 	{
-		q = smb_io_dom_sid(io, &(d_q->dom_sid), q, base, align); /* domain SID */
+		q = smb_io_dom_sid(io, &(d_q->dom_sid), q, base, align, depth); /* domain SID */
 	}
 
 	return q;
@@ -472,32 +534,35 @@ char* smb_io_dom_query(BOOL io, DOM_QUERY *d_q, char *q, char *base, int align)
 /*******************************************************************
 reads or writes a DOM_R_REF structure.
 ********************************************************************/
-char* smb_io_dom_r_ref(BOOL io, DOM_R_REF *r_r, char *q, char *base, int align)
+char* smb_io_dom_r_ref(BOOL io, DOM_R_REF *r_r, char *q, char *base, int align, int depth)
 {
 	int i;
 
+	DEBUG(5,("%s%04x smb_io_dom_r_ref\n",  tab_depth(depth), PTR_DIFF(q, base)));
+	depth++;
+
 	if (r_r == NULL) return NULL;
 
 	q = align_offset(q, base, align);
 	
-	RW_IVAL(io, q, r_r->undoc_buffer, 0); q += 4; /* undocumented buffer pointer. */
-	RW_IVAL(io, q, r_r->num_ref_doms_1, 0); q += 4; /* num referenced domains? */
-	RW_IVAL(io, q, r_r->buffer_dom_name, 0); q += 4; /* undocumented domain name buffer pointer. */
-	RW_IVAL(io, q, r_r->max_entries, 0); q += 4; /* 32 - max number of entries */
-	RW_IVAL(io, q, r_r->num_ref_doms_2, 0); q += 4; /* 4 - num referenced domains? */
+	DBG_RW_IVAL("undoc_buffer", depth, base, io, q, r_r->undoc_buffer); q += 4; /* undocumented buffer pointer. */
+	DBG_RW_IVAL("num_ref_doms_1", depth, base, io, q, r_r->num_ref_doms_1); q += 4; /* num referenced domains? */
+	DBG_RW_IVAL("buffer_dom_name", depth, base, io, q, r_r->buffer_dom_name); q += 4; /* undocumented domain name buffer pointer. */
+	DBG_RW_IVAL("max_entries", depth, base, io, q, r_r->max_entries); q += 4; /* 32 - max number of entries */
+	DBG_RW_IVAL("num_ref_doms_2", depth, base, io, q, r_r->num_ref_doms_2); q += 4; /* 4 - num referenced domains? */
 
-	q = smb_io_unihdr2(io, &(r_r->hdr_dom_name), q, base, align); /* domain name unicode string header */
+	q = smb_io_unihdr2(io, &(r_r->hdr_dom_name), q, base, align, depth); /* domain name unicode string header */
 
 	for (i = 0; i < r_r->num_ref_doms_1-1; i++)
 	{
-		q = smb_io_unihdr2(io, &(r_r->hdr_ref_dom[i]), q, base, align);
+		q = smb_io_unihdr2(io, &(r_r->hdr_ref_dom[i]), q, base, align, depth);
 	}
 
-	q = smb_io_unistr(io, &(r_r->uni_dom_name), q, base, align); /* domain name unicode string */
+	q = smb_io_unistr(io, &(r_r->uni_dom_name), q, base, align, depth); /* domain name unicode string */
 
 	for (i = 0; i < r_r->num_ref_doms_2; i++)
 	{
-		q = smb_io_dom_sid(io, &(r_r->ref_dom[i]), q, base, align); /* referenced domain SIDs */
+		q = smb_io_dom_sid(io, &(r_r->ref_dom[i]), q, base, align, depth); /* referenced domain SIDs */
 	}
 	return q;
 }
@@ -505,18 +570,21 @@ char* smb_io_dom_r_ref(BOOL io, DOM_R_REF *r_r, char *q, char *base, int align)
 /*******************************************************************
 reads or writes a DOM_NAME structure.
 ********************************************************************/
-char* smb_io_dom_name(BOOL io, DOM_NAME *name, char *q, char *base, int align)
+char* smb_io_dom_name(BOOL io, DOM_NAME *name, char *q, char *base, int align, int depth)
 {
 	if (name == NULL) return NULL;
 
+	DEBUG(5,("%s%04x smb_io_dom_name\n",  tab_depth(depth), PTR_DIFF(q, base)));
+	depth++;
+
 	q = align_offset(q, base, align);
 	
-	RW_IVAL(io, q, name->uni_str_len, 0); q += 4;
+	DBG_RW_IVAL("uni_str_len", depth, base, io, q, name->uni_str_len); q += 4;
 
 	/* don't know if len is specified by uni_str_len member... */
 	/* assume unicode string is unicode-null-terminated, instead */
 
-	q = smb_io_unistr(io, &(name->str), q, base, align);
+	q = smb_io_unistr(io, &(name->str), q, base, align, depth);
 
 	return q;
 }
@@ -525,13 +593,16 @@ char* smb_io_dom_name(BOOL io, DOM_NAME *name, char *q, char *base, int align)
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
-char* smb_io_neg_flags(BOOL io, NEG_FLAGS *neg, char *q, char *base, int align)
+char* smb_io_neg_flags(BOOL io, NEG_FLAGS *neg, char *q, char *base, int align, int depth)
 {
 	if (neg == NULL) return NULL;
 
+	DEBUG(5,("%s%04x smb_io_neg_flags\n",  tab_depth(depth), PTR_DIFF(q, base)));
+	depth++;
+
 	q = align_offset(q, base, align);
 	
-	RW_IVAL(io, q, neg->neg_flags, 0); q += 4;
+	DBG_RW_IVAL("neg_flags", depth, base, io, q, neg->neg_flags); q += 4;
 
 	return q;
 }
@@ -541,14 +612,15 @@ char* smb_io_neg_flags(BOOL io, NEG_FLAGS *neg, char *q, char *base, int align)
 /*******************************************************************
 reads or writes a structure.
 ********************************************************************/
- char* smb_io_(BOOL io, *, char *q, char *base, int align)
+ char* smb_io_(BOOL io, *, char *q, char *base, int align, int depth)
 {
 	if (== NULL) return NULL;
 
 	q = align_offset(q, base, align);
 	
-	RW_IVAL(io, q, , 0); q += 4;
+	DBG_RW_IVAL("", depth, base, io, q, ); q += 4;
 
 	return q;
 }
 #endif
+