diff options
| author | Jeremy Allison <jra@samba.org> | 2000-04-11 19:44:54 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2000-04-11 19:44:54 +0000 |
| commit | f6be38cae223f1ad3f4ecc5b81d14c44d92f58ba (patch) | |
| tree | fdfba0ada6fb79f89c27ace70eea7913e9d97915 /source3/nmbd | |
| parent | ca085145a9392c229b483ee24c1d566a23335fb3 (diff) | |
| download | samba-f6be38cae223f1ad3f4ecc5b81d14c44d92f58ba.tar.gz samba-f6be38cae223f1ad3f4ecc5b81d14c44d92f58ba.tar.bz2 samba-f6be38cae223f1ad3f4ecc5b81d14c44d92f58ba.zip | |
include/byteorder.h: ALIGN4/ALIGN2 macros.
include/includes.h: Added SMB_BIG_UINT_BITS.
lib/util.c: Removed align2/align4 - use macros.
libsmb/namequery.c: Use ALIGN2.
locking/locking.c: Replace do_lock, do_unlock, args with SMB_BIG_UINT, not SMB_OFF_T.
Needed to move to hiding POSIX locks at a lower layer.
nmbd/nmbd_processlogon.c: Use ALIGN2/ALIGN4 macros.
smbd/blocking.c: Replace do_lock, do_unlock, args with SMB_BIG_UINT, not SMB_OFF_T.
smbd/reply.c: Replace do_lock, do_unlock, args with SMB_BIG_UINT, not SMB_OFF_T.
Jeremy.
(This used to be commit 491eea8a20bf80d426625479326211dc975857a6)
Diffstat (limited to 'source3/nmbd')
| -rw-r--r-- | source3/nmbd/nmbd_processlogon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/nmbd/nmbd_processlogon.c b/source3/nmbd/nmbd_processlogon.c index 76a9aea952..47467f132d 100644 --- a/source3/nmbd/nmbd_processlogon.c +++ b/source3/nmbd/nmbd_processlogon.c @@ -116,7 +116,7 @@ logons are not enabled.\n", inet_ntoa(p->ip) )); getdc = skip_string(machine,1); q = skip_string(getdc,1); - q = align2(q, buf); + q = ALIGN2(q, buf); /* at this point we can work out if this is a W9X or NT style request. Experiments show that the difference is wether the @@ -160,7 +160,7 @@ logons are not enabled.\n", inet_ntoa(p->ip) )); /* PDC and domain name */ if (!short_request) /* Make a full reply */ { - q = align2(q, buf); + q = ALIGN2(q, buf); q += dos_PutUniCode(q, my_name, sizeof(pstring), True); /* PDC name */ q += dos_PutUniCode(q, global_myworkgroup,sizeof(pstring), True); /* Domain name*/ @@ -207,7 +207,7 @@ reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x lm_20 token=%x\n", if (domainsidsize != 0) { q += domainsidsize; - q = align4(q, buf); + q = ALIGN4(q, buf); } if (len - PTR_DIFF(q, buf) > 8) { /* with NT5 clients we can sometimes |