summaryrefslogtreecommitdiffstats
path: root/source/nmbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-01-08 20:37:48 +0000
committerJeremy Allison <jra@samba.org>2001-01-08 20:37:48 +0000
commit3a50ad16c5b51d0d812e50cfb65ff43a5786d131 (patch)
tree444489de7c547a2009316359f12e418ec5c39d6c /source/nmbd
parent4afc02447d4de9aaa329e4ec59d36f91716835c0 (diff)
downloadsamba-3a50ad16c5b51d0d812e50cfb65ff43a5786d131.tar.gz
samba-3a50ad16c5b51d0d812e50cfb65ff43a5786d131.tar.xz
samba-3a50ad16c5b51d0d812e50cfb65ff43a5786d131.zip
Big merge to sync up appliance-head and 2.2.
Jeremy.
Diffstat (limited to 'source/nmbd')
-rw-r--r--source/nmbd/nmbd_packets.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/nmbd/nmbd_packets.c b/source/nmbd/nmbd_packets.c
index e26d7f1b166..8b102985611 100644
--- a/source/nmbd/nmbd_packets.c
+++ b/source/nmbd/nmbd_packets.c
@@ -1902,17 +1902,17 @@ BOOL send_mailslot(BOOL unique, char *mailslot,char *buf,int len,
memset((char *)&p,'\0',sizeof(p));
- if(ismyip(dest_ip) && dest_port == 138) /* FIXME, change from constant */
+ if(ismyip(dest_ip) && (dest_port == DGRAM_PORT)) /* Only if to DGRAM_PORT */
loopback_this_packet = True;
- generate_name_trn_id();
+ /* generate_name_trn_id(); */ /* Not used, so gone, RJS */
/* DIRECT GROUP or UNIQUE datagram. */
dgram->header.msg_type = unique ? 0x10 : 0x11;
dgram->header.flags.node_type = M_NODE;
dgram->header.flags.first = True;
dgram->header.flags.more = False;
- dgram->header.dgm_id = name_trn_id;
+ dgram->header.dgm_id = generate_name_trn_id();
dgram->header.source_ip = src_ip;
dgram->header.source_port = DGRAM_PORT;
dgram->header.dgm_length = 0; /* Let build_dgram() handle this. */