summaryrefslogtreecommitdiff
path: root/source3/nmbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-09-14 22:03:41 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:30:48 -0500
commit3aaca8028e09db58381076f199a43680f81f04ac (patch)
treed9bbbe39fbfdd2b2db8462a156ee97dddf03cf9c /source3/nmbd
parent5eb34f5d570b2370e010e81f65b53ce47a1a873d (diff)
downloadsamba-3aaca8028e09db58381076f199a43680f81f04ac.tar.gz
r25170: Remove pstring limits from ms_fnmatch and module load.
Jeremy. (This used to be commit 764574ee05ea4f13cdd30c0a0668ffeb81756989)
Diffstat (limited to 'source3/nmbd')
-rw-r--r--source3/nmbd/nmbd_processlogon.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/nmbd/nmbd_processlogon.c b/source3/nmbd/nmbd_processlogon.c
index 1ba45ce8df3..8a183c4d24a 100644
--- a/source3/nmbd/nmbd_processlogon.c
+++ b/source3/nmbd/nmbd_processlogon.c
@@ -220,7 +220,7 @@ logons are not enabled.\n", inet_ntoa(p->ip) ));
sizeof(pstring) - PTR_DIFF(q, outbuf),
True); /* PDC name */
q += dos_PutUniCode(q, lp_workgroup(),
- sizeof(pstring) - (q-outbuf),
+ sizeof(pstring) - PTR_DIFF(q, outbuf),
True); /* Domain name*/
if (sizeof(pstring) - PTR_DIFF(q, outbuf) < 8) {
return;
@@ -525,7 +525,7 @@ reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x lm_20 token=%x\n",
q += 4; /* unknown */
SIVAL(q, 0, 0x00000000);
q += 4; /* unknown */
- }
+ }
#endif
if (sizeof(outbuf) - PTR_DIFF(q, outbuf) < 8) {
@@ -535,7 +535,7 @@ reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x lm_20 token=%x\n",
/* tell the client what version we are */
SIVAL(q, 0, ((ntversion < 11) || (SEC_ADS != lp_security())) ? 1 : 13);
/* our ntversion */
- SSVAL(q, 4, 0xffff); /* our lmnttoken */
+ SSVAL(q, 4, 0xffff); /* our lmnttoken */
SSVAL(q, 6, 0xffff); /* our lm20token */
q += 8;
@@ -549,7 +549,7 @@ reporting %s domain %s 0x%x ntversion=%x lm_nt token=%x lm_20 token=%x\n",
global_myname(), 0x0,
source_name,
dgram->source_name.name_type,
- p->ip, *iface_ip(p->ip), p->port);
+ p->ip, *iface_ip(p->ip), p->port);
break;
}