summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>2000-03-17 20:18:00 +0000
committerLuke Leighton <lkcl@samba.org>2000-03-17 20:18:00 +0000
commit4499109ad2da9f94e2a4d9cf0f102520e085ddfa (patch)
tree4dc8df7bb803b9784d377fa6d6bbfe0ff714c3cb
parentd3a5901f4117372ab227c057556190bbcc036ec9 (diff)
downloadsamba-4499109ad2da9f94e2a4d9cf0f102520e085ddfa.tar.gz
samba-4499109ad2da9f94e2a4d9cf0f102520e085ddfa.tar.xz
samba-4499109ad2da9f94e2a4d9cf0f102520e085ddfa.zip
jeremy spotted that some 2.5-year-old code, only now used in one place, a
function align4, was incorrect. fascinating :)
-rw-r--r--source/lib/util.c2
-rw-r--r--source/nmbd/nmbd_processlogon.c1
2 files changed, 1 insertions, 2 deletions
diff --git a/source/lib/util.c b/source/lib/util.c
index 9e55e662517..640b415d7af 100644
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -2665,7 +2665,7 @@ char *align4(char *q, char *base)
int mod = PTR_DIFF(q, base) & 3;
if (mod != 0)
{
- q += mod;
+ q += 4-mod;
}
return q;
}
diff --git a/source/nmbd/nmbd_processlogon.c b/source/nmbd/nmbd_processlogon.c
index 338674d8aad..3fd817e2e00 100644
--- a/source/nmbd/nmbd_processlogon.c
+++ b/source/nmbd/nmbd_processlogon.c
@@ -222,7 +222,6 @@ reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x lm_20 token=%x\n",
if (domainsidsize != 0)
{
q += domainsidsize;
- q += 2;
q = align4(q, buf);
}