Changeset 988 for vendor/current/libcli/nbt/tools

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/libcli/nbt/tools/nmblookup.c (modified) (5 diffs)

vendor/current/libcli/nbt/tools/nmblookup.c

@@ -33 +33 @@
 #include "param/param.h"
 
+#include <string.h>
+
+#define MAX_NETBIOSNAME_LEN 16
+
 /* command line options */
 static struct {
@@ -191 +195 @@
         struct nbt_name_socket *nbtsock;
         NTSTATUS status = NT_STATUS_OK;
+        size_t nbt_len;
         bool ret = true;
 
@@ -211 +216 @@
         } else {
                 node_name = talloc_strdup(tmp_ctx, name);
+        }
+
+        nbt_len = strlen(node_name);
+        if (nbt_len > MAX_NETBIOSNAME_LEN - 1) {
+                printf("The specified netbios name [%s] is too long.\n",
+                       node_name);
+                talloc_free(tmp_ctx);
+                return false;
         }
 
@@ -247 +260 @@
                 int i, num_interfaces;
 
-                num_interfaces = iface_count(ifaces);
+                num_interfaces = iface_list_count(ifaces);
                 for (i=0;i<num_interfaces;i++) {
-                        const char *bcast = iface_n_bcast(ifaces, i);
+                        const char *bcast = iface_list_n_bcast(ifaces, i);
                         if (bcast == NULL) continue;
                         status = do_node_query(nbtsock, bcast, nbt_port, 
@@ -358 +371 @@
         }
 
-        load_interfaces(NULL, lpcfg_interfaces(cmdline_lp_ctx), &ifaces);
+        load_interface_list(NULL, cmdline_lp_ctx, &ifaces);
 
         ev = s4_event_context_init(talloc_autofree_context());