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)

diff --git a/source/libsmb/nmblib.c b/source/libsmb/nmblib.c
index 121008685b9a0cb25a4c81432e1c4f3b8f60dc9c..6a91b20ea87fe1cffae34e2e8c670ca268ac55be 100644 (file)
--- a/source/libsmb/nmblib.c
+++ b/source/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/source/pipenetlog.c b/source/pipenetlog.c
index 9b9afdb05063ad0c2b72515af556dd20759a25a5..87337180c6a97a92ca34fbae304f4beb97f26f22 100644 (file)
--- a/source/pipenetlog.c
+++ b/source/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/source/pipentlsa.c b/source/pipentlsa.c
index 4a65b5454369fc782f65df598a4425de3677d41a..9fe605880958257e8ffbb53bf84dc82a40c04a0c 100644 (file)
--- a/source/pipentlsa.c
+++ b/source/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/source/pipesrvsvc.c b/source/pipesrvsvc.c
index b99d9e2dc66c6272f21fec69293a751734180c13..ee50f00b110fa14152e8e4bf818b4ad358928f6e 100644 (file)
--- a/source/pipesrvsvc.c
+++ b/source/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;
                }
        }