summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMatthieu Patou <mat@matws.net>2012-01-27 16:12:52 -0800
committerMatthieu Patou <mat@samba.org>2012-02-03 11:09:29 +0100
commit357631b8b9da95c5cd43e05e8ad9d7ef43fb67da (patch)
tree67a0bb5813d90eca361befb189407a5e230851c4 /source3
parent9b43ad4fcac1eb6796973336c5614b18a054080d (diff)
downloadsamba-357631b8b9da95c5cd43e05e8ad9d7ef43fb67da.tar.gz
samba-357631b8b9da95c5cd43e05e8ad9d7ef43fb67da.tar.bz2
samba-357631b8b9da95c5cd43e05e8ad9d7ef43fb67da.zip
s3-nmbd: don't discard DGRAM frames from local addresses when we are a DC
Winbind use netbios to locate the DC, if samba is also a DC then nmbd receive request from Winbind that are from a local address, those requests must not be discarded otherwise winbind can't find the DC and won't try another method. Autobuild-User: Matthieu Patou <mat@samba.org> Autobuild-Date: Fri Feb 3 11:09:29 CET 2012 on sn-devel-104
Diffstat (limited to 'source3')
-rw-r--r--source3/nmbd/nmbd_packets.c32
1 files changed, 17 insertions, 15 deletions
diff --git a/source3/nmbd/nmbd_packets.c b/source3/nmbd/nmbd_packets.c
index da38dcfbfe..edac6f6b9f 100644
--- a/source3/nmbd/nmbd_packets.c
+++ b/source3/nmbd/nmbd_packets.c
@@ -1995,21 +1995,23 @@ bool listen_for_packets(struct messaging_context *msg, bool run_election)
continue;
}
- if ((is_loopback_ip_v4(packet->ip) || ismyip_v4(packet->ip)) &&
- packet->port == client_port)
- {
- if (client_port == DGRAM_PORT) {
- DEBUG(7,("discarding own dgram packet from %s:%d\n",
- inet_ntoa(packet->ip),packet->port));
- free_packet(packet);
- continue;
- }
-
- if (packet->packet.nmb.header.nm_flags.bcast) {
- DEBUG(7,("discarding own nmb bcast packet from %s:%d\n",
- inet_ntoa(packet->ip),packet->port));
- free_packet(packet);
- continue;
+ if (!IS_DC) {
+ if ((is_loopback_ip_v4(packet->ip) || ismyip_v4(packet->ip)) &&
+ packet->port == client_port)
+ {
+ if (client_port == DGRAM_PORT) {
+ DEBUG(7,("discarding own dgram packet from %s:%d\n",
+ inet_ntoa(packet->ip),packet->port));
+ free_packet(packet);
+ continue;
+ }
+
+ if (packet->packet.nmb.header.nm_flags.bcast) {
+ DEBUG(7,("discarding own nmb bcast packet from %s:%d\n",
+ inet_ntoa(packet->ip),packet->port));
+ free_packet(packet);
+ continue;
+ }
}
}