diff options
author | Andrew Tridgell <tridge@samba.org> | 2000-03-27 12:19:58 +0000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2000-03-27 12:19:58 +0000 |
commit | 6570b48d73d4d6597cf8f17040cb57e8b16394dd (patch) | |
tree | e1d3d3411c7822d39647034784f03225575ea409 /source3/nmbd/nmbd_packets.c | |
parent | 61302f54bdf327e6879297166d175ee8144fad25 (diff) | |
download | samba-6570b48d73d4d6597cf8f17040cb57e8b16394dd.tar.gz samba-6570b48d73d4d6597cf8f17040cb57e8b16394dd.tar.bz2 samba-6570b48d73d4d6597cf8f17040cb57e8b16394dd.zip |
the final part of the nmbd merge between head and tng - this gets the
GETDC stuff sorted out
(This used to be commit f6b56ae93e47a54317f2711533ec8208d5cbc8a9)
Diffstat (limited to 'source3/nmbd/nmbd_packets.c')
-rw-r--r-- | source3/nmbd/nmbd_packets.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source3/nmbd/nmbd_packets.c b/source3/nmbd/nmbd_packets.c index 627bbea019..a7c94f1544 100644 --- a/source3/nmbd/nmbd_packets.c +++ b/source3/nmbd/nmbd_packets.c @@ -592,7 +592,7 @@ struct response_record *queue_release_name( struct subnet_record *subrec, if(assert_check_subnet(subrec)) return NULL; - if(( p = create_and_init_netbios_packet(nmbname, (subrec != unicast_subnet), False, + if ((p = create_and_init_netbios_packet(nmbname, (subrec != unicast_subnet), False, subrec->bcast_ip)) == NULL) return NULL; @@ -621,10 +621,9 @@ struct response_record *queue_release_name( struct subnet_record *subrec, * This will cause us to remove the name asap. JRA. */ - if(bcast) - { - rrec->repeat_count = 0; - rrec->repeat_time = 0; + if (subrec != unicast_subnet) { + rrec->repeat_count = 0; + rrec->repeat_time = 0; } return rrec; |