diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-08 16:27:06 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-09 12:40:09 +0200 |
| commit | f348d148b463ca61cbc48d2aadeaa099f7150425 (patch) | |
| tree | 0c9dd77dca2448a025df3293ccc7850281b8591d /source3/nmbd/nmbd_packets.c | |
| parent | 3ccc7609476139bc6a906110a2623605f3802159 (diff) | |
| download | samba-f348d148b463ca61cbc48d2aadeaa099f7150425.tar.gz | |
s3-param Remove special case for global_scope()
There is no reason this can't be a normal constant string in the
loadparm system. (Past reasons were that we didn't have lp_set_cmdline())
Andrew Bartlett
Diffstat (limited to 'source3/nmbd/nmbd_packets.c')
| -rw-r--r-- | source3/nmbd/nmbd_packets.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/nmbd/nmbd_packets.c b/source3/nmbd/nmbd_packets.c index 3d51849287c..a89f49c8fc9 100644 --- a/source3/nmbd/nmbd_packets.c +++ b/source3/nmbd/nmbd_packets.c @@ -1073,9 +1073,9 @@ static void process_browse_packet(struct packet_struct *p, const char *buf,int l /* Drop the packet if it's a different NetBIOS scope, or the source is from one of our names. */ pull_ascii(scope, dgram->dest_name.scope, 64, 64, STR_TERMINATE); - if (!strequal(scope, global_scope())) { + if (!strequal(scope, lp_netbios_scope())) { DEBUG(7,("process_browse_packet: Discarding datagram from IP %s. Scope (%s) \ -mismatch with our scope (%s).\n", inet_ntoa(p->ip), scope, global_scope())); +mismatch with our scope (%s).\n", inet_ntoa(p->ip), scope, lp_netbios_scope())); return; } @@ -1161,9 +1161,9 @@ static void process_lanman_packet(struct packet_struct *p, const char *buf,int l /* Drop the packet if it's a different NetBIOS scope, or the source is from one of our names. */ pull_ascii(scope, dgram->dest_name.scope, 64, 64, STR_TERMINATE); - if (!strequal(scope, global_scope())) { + if (!strequal(scope, lp_netbios_scope())) { DEBUG(7,("process_lanman_packet: Discarding datagram from IP %s. Scope (%s) \ -mismatch with our scope (%s).\n", inet_ntoa(p->ip), scope, global_scope())); +mismatch with our scope (%s).\n", inet_ntoa(p->ip), scope, lp_netbios_scope())); return; } |