nmblib.c :

	adding some debug info

pipenetlog.c pipentlsa.c pipesrvsvc.c :

	using unistrn2 instead of unistr2 in the SAM logon username.
	wrong offset for command in request (use "reserved" field
	not cancel_count.  AGH i'll get there)
(This used to be commit 6d301d2cfd25b18ba18685d926d7a5bc08695b6d)

4 files changed, 13 insertions, 10 deletions

diff --git a/source3/libsmb/nmblib.c b/source3/libsmb/nmblib.c
index 121008685b..6a91b20ea8 100644
--- a/source3/libsmb/nmblib.c
+++ b/source3/libsmb/nmblib.c
@@ -697,6 +697,7 @@ BOOL send_packet(struct packet_struct *p)
     {
     case NMB_PACKET:
       len = build_nmb(buf,p);
+      debug_nmb_packet(p);
       break;
 
     case DGRAM_PACKET:
diff --git a/source3/pipenetlog.c b/source3/pipenetlog.c
index 9b9afdb050..87337180c6 100644
--- a/source3/pipenetlog.c
+++ b/source3/pipenetlog.c
@@ -520,13 +520,15 @@ static void api_lsa_sam_logon( user_struct *vuser,
 		extern pstring myname;
 		uint32 r_uid;
 		uint32 r_gid;
+		UNISTR2 *uni_samlogon_user = &(q_l.sam_id.auth.id1.uni_user_name);
 
 		dummy_time.low  = 0xffffffff;
 		dummy_time.high = 0x7fffffff;
 
 		get_myname(myname, NULL);
 
-		pstrcpy(samlogon_user, unistr2(q_l.sam_id.auth.id1.uni_user_name.buffer));
+		pstrcpy(samlogon_user, unistrn2(uni_samlogon_user->buffer,
+		                                uni_samlogon_user->uni_str_len));
 
 		DEBUG(3,("SAM Logon. Domain:[%s].  User:[%s]\n",
 		          lp_workgroup(), samlogon_user));
@@ -643,13 +645,13 @@ BOOL api_netlogrpcTNP(int cnum,int uid, char *param,char *data,
 		return True;
 	}
 
-	DEBUG(4,("netlogon TransactNamedPipe op %x\n",hdr.cancel_count));
+	DEBUG(4,("netlogon TransactNamedPipe op %x\n",hdr.reserved));
 
 	if ((vuser = get_valid_user_struct(uid)) == NULL) return False;
 
 	DEBUG(3,("Username of UID %d is %s\n", vuser->uid, vuser->name));
 
-	switch (hdr.cancel_count)
+	switch (hdr.reserved)
 	{
 		case LSA_REQCHAL:
 		{
@@ -693,7 +695,7 @@ BOOL api_netlogrpcTNP(int cnum,int uid, char *param,char *data,
 
 		default:
 		{
-  			DEBUG(4, ("**** netlogon, unknown code: %lx\n", hdr.cancel_count));
+  			DEBUG(4, ("**** netlogon, unknown code: %lx\n", hdr.reserved));
 			break;
 		}
 	}
diff --git a/source3/pipentlsa.c b/source3/pipentlsa.c
index 4a65b54543..9fe6058809 100644
--- a/source3/pipentlsa.c
+++ b/source3/pipentlsa.c
@@ -317,9 +317,9 @@ BOOL api_ntLsarpcTNP(int cnum,int uid, char *param,char *data,
 		return True;
 	}
 
-	DEBUG(4,("lsarpc TransactNamedPipe op %x\n",hdr.cancel_count));
+	DEBUG(4,("lsarpc TransactNamedPipe op %x\n",hdr.reserved));
 
-	switch (hdr.cancel_count)
+	switch (hdr.reserved)
 	{
 		case LSA_OPENPOLICY:
 		{
@@ -416,7 +416,7 @@ BOOL api_ntLsarpcTNP(int cnum,int uid, char *param,char *data,
 
 		default:
 		{
-			DEBUG(4, ("NTLSARPC, unknown code: %lx\n", hdr.cancel_count));
+			DEBUG(4, ("NTLSARPC, unknown code: %lx\n", hdr.reserved));
 			break;
 		}
 	}
diff --git a/source3/pipesrvsvc.c b/source3/pipesrvsvc.c
index b99d9e2dc6..ee50f00b11 100644
--- a/source3/pipesrvsvc.c
+++ b/source3/pipesrvsvc.c
@@ -205,9 +205,9 @@ BOOL api_srvsvcTNP(int cnum,int uid, char *param,char *data,
 		return True;
 	}
 
-	DEBUG(4,("srvsvc TransactNamedPipe op %x\n",hdr.cancel_count));
+	DEBUG(4,("srvsvc TransactNamedPipe op %x\n",hdr.reserved));
 
-	switch (hdr.cancel_count)
+	switch (hdr.reserved)
 	{
 		case NETSHAREENUM:
 		{
@@ -261,7 +261,7 @@ BOOL api_srvsvcTNP(int cnum,int uid, char *param,char *data,
 
 		default:
 		{
-			DEBUG(4, ("srvsvc, unknown code: %lx\n", hdr.cancel_count));
+			DEBUG(4, ("srvsvc, unknown code: %lx\n", hdr.reserved));
 			break;
 		}
 	}