byteorder.h :

	debugging output wasn't (still isn't) perfect.

credentials.c lsaparse.c smbparse.c :

	added DEBUG strings.

pipes.c :

	lost some changes, to do with setup of RPC headers.  arg.
(This used to be commit 9fdd697d17b68293bb95fd68f44c24f0f5b97f5f)

1 files changed, 29 insertions, 29 deletions

diff --git a/source3/lsaparse.c b/source3/lsaparse.c
index 34f4cb4048..69352466f6 100644
--- a/source3/lsaparse.c
+++ b/source3/lsaparse.c
@@ -115,14 +115,14 @@ char* lsa_io_q_lookup_sids(BOOL io, LSA_Q_LOOKUP_SIDS *q_s, char *q, char *base,
 	
     q = smb_io_pol_hnd(io, &(q_s->pol_hnd), q, base, align, depth); /* policy handle */
 
-	DBG_RW_IVAL("num_entries", depth, base, io, q, q_s->num_entries); q += 4;
-	DBG_RW_IVAL("buffer_dom_sid", depth, base, io, q, q_s->buffer_dom_sid); q += 4; /* undocumented domain SID buffer pointer */
-	DBG_RW_IVAL("buffer_dom_name", depth, base, io, q, q_s->buffer_dom_name); q += 4; /* undocumented domain name buffer pointer */
+	DBG_RW_IVAL("num_entries          ", depth, base, io, q, q_s->num_entries); q += 4;
+	DBG_RW_IVAL("buffer_dom_sid       ", depth, base, io, q, q_s->buffer_dom_sid); q += 4; /* undocumented domain SID buffer pointer */
+	DBG_RW_IVAL("buffer_dom_name      ", depth, base, io, q, q_s->buffer_dom_name); q += 4; /* undocumented domain name buffer pointer */
 
 	for (i = 0; i < q_s->num_entries; i++)
 	{	
 		fstring temp;
-		sprintf(temp, "buffer_lookup_sids[%d]", i);
+		sprintf(temp, "buffer_lookup_sids[%d] ", i);
 		DBG_RW_IVAL(temp, depth, base, io, q, q_s->buffer_lookup_sids[i]); q += 4; /* undocumented domain SID pointers to be looked up. */
 	}
 
@@ -131,7 +131,7 @@ char* lsa_io_q_lookup_sids(BOOL io, LSA_Q_LOOKUP_SIDS *q_s, char *q, char *base,
 		q = smb_io_dom_sid(io, &(q_s->dom_sids[i]), q, base, align, depth); /* domain SIDs to be looked up. */
 	}
 
-	DBG_RW_PCVAL("undoc", depth, base, io, q, q_s->undoc, 16); q += 16; /* completely undocumented 16 bytes */
+	DBG_RW_PCVAL("undoc                ", depth, base, io, q, q_s->undoc, 16); q += 16; /* completely undocumented 16 bytes */
 
 	return q;
 }
@@ -152,7 +152,7 @@ char* lsa_io_r_lookup_sids(BOOL io, LSA_R_LOOKUP_SIDS *r_s, char *q, char *base,
 	
 	q = smb_io_dom_r_ref(io, &(r_s->dom_ref), q, base, align, depth); /* domain reference info */
 
-	DBG_RW_IVAL("num_entries", depth, base, io, q, r_s->num_entries); q += 4;
+	DBG_RW_IVAL("num_entries ", depth, base, io, q, r_s->num_entries); q += 4;
 	DBG_RW_IVAL("undoc_buffer", depth, base, io, q, r_s->undoc_buffer); q += 4;
 	DBG_RW_IVAL("num_entries2", depth, base, io, q, r_s->num_entries2); q += 4;
 
@@ -163,7 +163,7 @@ char* lsa_io_r_lookup_sids(BOOL io, LSA_R_LOOKUP_SIDS *r_s, char *q, char *base,
 
 	DBG_RW_IVAL("num_entries3", depth, base, io, q, r_s->num_entries3); q += 4;
 
-	DBG_RW_IVAL("status", depth, base, io, q, r_s->status); q += 4;
+	DBG_RW_IVAL("status      ", depth, base, io, q, r_s->status); q += 4;
 
 	return q;
 }
@@ -184,9 +184,9 @@ char* lsa_io_q_lookup_rids(BOOL io, LSA_Q_LOOKUP_RIDS *q_r, char *q, char *base,
 	
     q = smb_io_pol_hnd(io, &(q_r->pol_hnd), q, base, align, depth); /* policy handle */
 
-	DBG_RW_IVAL("num_entries", depth, base, io, q, q_r->num_entries); q += 4;
-	DBG_RW_IVAL("num_entries2", depth, base, io, q, q_r->num_entries2); q += 4;
-	DBG_RW_IVAL("buffer_dom_sid", depth, base, io, q, q_r->buffer_dom_sid); q += 4; /* undocumented domain SID buffer pointer */
+	DBG_RW_IVAL("num_entries    ", depth, base, io, q, q_r->num_entries); q += 4;
+	DBG_RW_IVAL("num_entries2   ", depth, base, io, q, q_r->num_entries2); q += 4;
+	DBG_RW_IVAL("buffer_dom_sid ", depth, base, io, q, q_r->buffer_dom_sid); q += 4; /* undocumented domain SID buffer pointer */
 	DBG_RW_IVAL("buffer_dom_name", depth, base, io, q, q_r->buffer_dom_name); q += 4; /* undocumented domain name buffer pointer */
 
 	for (i = 0; i < q_r->num_entries; i++)
@@ -194,7 +194,7 @@ char* lsa_io_q_lookup_rids(BOOL io, LSA_Q_LOOKUP_RIDS *q_r, char *q, char *base,
 		q = smb_io_dom_name(io, &(q_r->lookup_name[i]), q, base, align, depth); /* names to be looked up */
 	}
 
-	DBG_RW_PCVAL("undoc", depth, base, io, q, q_r->undoc, UNKNOWN_LEN); q += UNKNOWN_LEN; /* completely undocumented bytes of unknown length */
+	DBG_RW_PCVAL("undoc          ", depth, base, io, q, q_r->undoc, UNKNOWN_LEN); q += UNKNOWN_LEN; /* completely undocumented bytes of unknown length */
 
 	return q;
 }
@@ -215,7 +215,7 @@ char* lsa_io_r_lookup_rids(BOOL io, LSA_R_LOOKUP_RIDS *r_r, char *q, char *base,
 	
 	q = smb_io_dom_r_ref(io, &(r_r->dom_ref), q, base, align, depth); /* domain reference info */
 
-	DBG_RW_IVAL("num_entries", depth, base, io, q, r_r->num_entries); q += 4;
+	DBG_RW_IVAL("num_entries ", depth, base, io, q, r_r->num_entries); q += 4;
 	DBG_RW_IVAL("undoc_buffer", depth, base, io, q, r_r->undoc_buffer); q += 4;
 	DBG_RW_IVAL("num_entries2", depth, base, io, q, r_r->num_entries2); q += 4;
 
@@ -226,7 +226,7 @@ char* lsa_io_r_lookup_rids(BOOL io, LSA_R_LOOKUP_RIDS *r_r, char *q, char *base,
 
 	DBG_RW_IVAL("num_entries3", depth, base, io, q, r_r->num_entries3); q += 4;
 
-	DBG_RW_IVAL("status", depth, base, io, q, r_r->status); q += 4;
+	DBG_RW_IVAL("status      ", depth, base, io, q, r_r->status); q += 4;
 
 	return q;
 }
@@ -365,7 +365,7 @@ char* lsa_io_user_info(BOOL io, LSA_USER_INFO *usr, char *q, char *base, int ali
 
 	q = align_offset(q, base, align);
 	
-	DBG_RW_IVAL("", depth, base, io, q, usr->undoc_buffer); q += 4;
+	DBG_RW_IVAL("undoc_buffer  ", depth, base, io, q, usr->undoc_buffer); q += 4;
 
 	q = smb_io_time(io, &(usr->logon_time)           , q, base, align, depth); /* logon time */
 	q = smb_io_time(io, &(usr->logoff_time)          , q, base, align, depth); /* logoff time */
@@ -381,22 +381,22 @@ char* lsa_io_user_info(BOOL io, LSA_USER_INFO *usr, char *q, char *base, int ali
 	q = smb_io_unihdr(io, &(usr->hdr_home_dir)    , q, base, align, depth); /* home directory unicode string header */
 	q = smb_io_unihdr(io, &(usr->hdr_dir_drive)   , q, base, align, depth); /* home directory drive unicode string header */
 
-	DBG_RW_SVAL("logon_count", depth, base, io, q, usr->logon_count ); q += 2;  /* logon count */
-	DBG_RW_SVAL("bad_pw_count", depth, base, io, q, usr->bad_pw_count); q += 2; /* bad password count */
+	DBG_RW_SVAL("logon_count.  ", depth, base, io, q, usr->logon_count ); q += 2;  /* logon count */
+	DBG_RW_SVAL("bad_pw_count  ", depth, base, io, q, usr->bad_pw_count); q += 2; /* bad password count */
 
-	DBG_RW_IVAL("user_id", depth, base, io, q, usr->user_id      ); q += 4;       /* User ID */
-	DBG_RW_IVAL("group_id", depth, base, io, q, usr->group_id     ); q += 4;      /* Group ID */
-	DBG_RW_IVAL("num_groups", depth, base, io, q, usr->num_groups   ); q += 4;    /* num groups */
-	DBG_RW_IVAL("buffer_groups", depth, base, io, q, usr->buffer_groups); q += 4; /* undocumented buffer pointer to groups. */
-	DBG_RW_IVAL("user_flgs", depth, base, io, q, usr->user_flgs    ); q += 4;     /* user flags */
+	DBG_RW_IVAL("user_id       ", depth, base, io, q, usr->user_id      ); q += 4;       /* User ID */
+	DBG_RW_IVAL("group_id      ", depth, base, io, q, usr->group_id     ); q += 4;      /* Group ID */
+	DBG_RW_IVAL("num_groups    ", depth, base, io, q, usr->num_groups   ); q += 4;    /* num groups */
+	DBG_RW_IVAL("buffer_groups ", depth, base, io, q, usr->buffer_groups); q += 4; /* undocumented buffer pointer to groups. */
+	DBG_RW_IVAL("user_flgs     ", depth, base, io, q, usr->user_flgs    ); q += 4;     /* user flags */
 
-	DBG_RW_PCVAL("", depth, base, io, q, usr->sess_key, 16); q += 16; /* unused user session key */
+	DBG_RW_PCVAL("sess_key     ", depth, base, io, q, usr->sess_key, 16); q += 16; /* unused user session key */
 
 	q = smb_io_unihdr(io, &(usr->hdr_logon_srv), q, base, align, depth); /* logon server unicode string header */
 	q = smb_io_unihdr(io, &(usr->hdr_logon_dom), q, base, align, depth); /* logon domain unicode string header */
 
-	DBG_RW_IVAL("buffer_dom_id", depth, base, io, q, usr->buffer_dom_id); q += 4; /* undocumented logon domain id pointer */
-	DBG_RW_PCVAL("padding", depth, base, io, q, usr->padding, 40); q += 40; /* unused padding bytes? */
+	DBG_RW_IVAL("buffer_dom_id ", depth, base, io, q, usr->buffer_dom_id); q += 4; /* undocumented logon domain id pointer */
+	DBG_RW_PCVAL("padding       ", depth, base, io, q, usr->padding, 40); q += 40; /* unused padding bytes? */
 
 	DBG_RW_IVAL("num_other_sids", depth, base, io, q, usr->num_other_sids); q += 4; /* 0 - num_sids */
 	DBG_RW_IVAL("buffer_other_sids", depth, base, io, q, usr->buffer_other_sids); q += 4; /* NULL - undocumented pointer to SIDs. */
@@ -408,7 +408,7 @@ char* lsa_io_user_info(BOOL io, LSA_USER_INFO *usr, char *q, char *base, int ali
 	q = smb_io_unistr2(io, &(usr->uni_home_dir)    , q, base, align, depth); /* home directory unicode string */
 	q = smb_io_unistr2(io, &(usr->uni_dir_drive)   , q, base, align, depth); /* home directory drive unicode string */
 
-	DBG_RW_IVAL("num_groups2", depth, base, io, q, usr->num_groups2); q += 4;        /* num groups */
+	DBG_RW_IVAL("num_groups2   ", depth, base, io, q, usr->num_groups2); q += 4;        /* num groups */
 	for (i = 0; i < usr->num_groups2; i++)
 	{
 		q = smb_io_gid(io, &(usr->gids[i]), q, base, align, depth); /* group info */
@@ -459,15 +459,15 @@ char* lsa_io_r_sam_logon(BOOL io, LSA_R_SAM_LOGON *r_l, char *q, char *base, int
 	DBG_RW_IVAL("buffer_creds", depth, base, io, q, r_l->buffer_creds); q += 4; /* undocumented buffer pointer */
 	q = smb_io_cred(io, &(r_l->srv_creds), q, base, align, depth); /* server credentials.  server time stamp appears to be ignored. */
 
-	DBG_RW_IVAL("buffer_user", depth, base, io, q, r_l->buffer_user); q += 4;
+	DBG_RW_IVAL("buffer_user ", depth, base, io, q, r_l->buffer_user); q += 4;
 	if (r_l->buffer_user != 0)
 	{
 		q = lsa_io_user_info(io, r_l->user, q, base, align, depth);
 	}
 
-	DBG_RW_IVAL("auth_resp", depth, base, io, q, r_l->auth_resp); q += 4; /* 1 - Authoritative response; 0 - Non-Auth? */
+	DBG_RW_IVAL("auth_resp   ", depth, base, io, q, r_l->auth_resp); q += 4; /* 1 - Authoritative response; 0 - Non-Auth? */
 
-	DBG_RW_IVAL("status", depth, base, io, q, r_l->status); q += 4;
+	DBG_RW_IVAL("status      ", depth, base, io, q, r_l->status); q += 4;
 
 	return q;
 }
@@ -504,7 +504,7 @@ char* lsa_io_r_sam_logoff(BOOL io, LSA_R_SAM_LOGOFF *r_l, char *q, char *base, i
 	DBG_RW_IVAL("buffer_creds", depth, base, io, q, r_l->buffer_creds); q += 4; /* undocumented buffer pointer */
 	q = smb_io_cred(io, &(r_l->srv_creds), q, base, align, depth); /* server credentials.  server time stamp appears to be ignored. */
 
-	DBG_RW_IVAL("status", depth, base, io, q, r_l->status); q += 4;
+	DBG_RW_IVAL("status      ", depth, base, io, q, r_l->status); q += 4;
 
 	return q;
 }