s3-vfs: Use ENOATTR in errno comparison for getxattr

[garming/samba-autobuild/.git] / source4 / nbt_server / defense.c

diff --git a/source4/nbt_server/defense.c b/source4/nbt_server/defense.c
index 86b3eb968b8b3d658cac1ca26e2c7c0e354968d3..fbe22aa781bb7568efbc5506bb4553ef726b20a5 100644 (file)
--- a/source4/nbt_server/defense.c
+++ b/source4/nbt_server/defense.c
@@ -7,7 +7,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -16,15 +16,15 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
-#include "dlinklist.h"
+#include "../lib/util/dlinklist.h"
 #include "system/network.h"
 #include "nbt_server/nbt_server.h"
 #include "nbt_server/wins/winsserver.h"
+#include "librpc/gen_ndr/ndr_nbt.h"
 #include "lib/socket/socket.h"
 
 
@@ -38,9 +38,18 @@ void nbtd_request_defense(struct nbt_name_socket *nbtsock,
 {
        struct nbtd_iface_name *iname;
        struct nbt_name *name;
-       struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private, 
+       struct nbtd_interface *iface = talloc_get_type(nbtsock->incoming.private_data,
                                                       struct nbtd_interface);
 
+       /*
+        * if the packet comes from one of our interfaces
+        * it must be our winsclient trying to reach the winsserver
+        */
+       if (nbtd_self_packet(nbtsock, packet, src)) {
+               nbtd_winsserver_request(nbtsock, packet, src);
+               return;
+       }
+
        NBTD_ASSERT_PACKET(packet, src, packet->qdcount == 1);
        NBTD_ASSERT_PACKET(packet, src, packet->arcount == 1);
        NBTD_ASSERT_PACKET(packet, src,