summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>1999-03-09 02:03:39 +0000
committerLuke Leighton <lkcl@samba.org>1999-03-09 02:03:39 +0000
commit60bfe3819eb92da021218987467b2ff101b094dd (patch)
tree182ebb04245dd4a51414c1f8c725deece687424d
parenta3c6e96a22bfaaa5a2993e85327555266476013d (diff)
downloadsamba-60bfe3819eb92da021218987467b2ff101b094dd.tar.gz
samba-60bfe3819eb92da021218987467b2ff101b094dd.tar.bz2
samba-60bfe3819eb92da021218987467b2ff101b094dd.zip
alignment issue in UDP SAMLOGON response.
(This used to be commit de290627f06915d420d37d2a3ac2f736c4cf8d74)
-rw-r--r--source3/nmbd/nmbd_processlogon.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/source3/nmbd/nmbd_processlogon.c b/source3/nmbd/nmbd_processlogon.c
index 5b8e01f5d0..710bbe0de7 100644
--- a/source3/nmbd/nmbd_processlogon.c
+++ b/source3/nmbd/nmbd_processlogon.c
@@ -179,7 +179,9 @@ reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x lm_20 token=%x\n",
q += 4;
domainsidsize = IVAL(q, 0);
q += 4;
- q += domainsidsize + 3;
+ q += domainsidsize + 2;
+ q = align2(q, buf);
+
ntversion = IVAL(q, 0);
q += 4;
lmnttoken = SVAL(q, 0);
@@ -187,7 +189,7 @@ reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x lm_20 token=%x\n",
lm20token = SVAL(q, 0);
q += 2;
- DEBUG(3,("process_logon_packet: SAMLOGON sidsize %d ntv %d\n", domainsidsize, ntversion));
+ DEBUG(3,("process_logon_packet: SAMLOGON sidsize %d ntv %x\n", domainsidsize, ntversion));
/*
* we respond regadless of whether the machine is in our password
@@ -198,7 +200,8 @@ reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x lm_20 token=%x\n",
fstrcpy(reply_name,"\\\\"); /* Here it wants \\LOGONSERVER. */
fstrcpy(reply_name+2,my_name);
- if (DEBUGLVL(3)) {
+ if (DEBUGLVL(3))
+ {
fstring ascuser;
fstring asccomp;