Changeset 988 for vendor/current/source3/utils/nmblookup.c

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/source3/utils/nmblookup.c (modified) (14 diffs)

vendor/current/source3/utils/nmblookup.c

@@ -41 +41 @@
 {
         struct sockaddr_storage ss;
-        const char *sock_addr = lp_socket_address();
+        const char *sock_addr = lp_nbt_client_socket_address();
 
         if (!interpret_string_addr(&ss, sock_addr,
@@ -108 +108 @@
 ****************************************************************************/
 
-static void do_node_status(const char *name,
+static bool do_node_status(const char *name,
                 int type,
                 struct sockaddr_storage *pss)
@@ -143 +143 @@
                 d_printf("\n");
                 TALLOC_FREE(addrs);
+                return true;
         } else {
                 d_printf("No reply from %s\n\n",addr);
+                return false;
         }
 }
@@ -169 +171 @@
                                     &ip_list, &count, &flags);
         } else {
-                const struct in_addr *bcast;
-                for (j=iface_count() - 1;
-                     !ip_list && j >= 0;
-                     j--) {
-                        char addr[INET6_ADDRSTRLEN];
-                        struct sockaddr_storage bcast_ss;
-
-                        bcast = iface_n_bcast_v4(j);
-                        if (!bcast) {
-                                continue;
-                        }
-                        in_addr_to_sockaddr_storage(&bcast_ss, *bcast);
-                        print_sockaddr(addr, sizeof(addr), &bcast_ss);
-                        d_printf("querying %s on %s\n",
-                               lookup, addr);
-                        status = name_query(lookup,lookup_type,
-                                            use_bcast,
-                                            use_bcast?True:recursion_desired,
-                                            &bcast_ss, talloc_tos(),
-                                            &ip_list, &count, &flags);
-                }
+                status = name_resolve_bcast(
+                        lookup, lookup_type,
+                        talloc_tos(), &ip_list, &count);
         }
 
@@ -220 +204 @@
                  */
                 if (find_status) {
-                        do_node_status(lookup, lookup_type, &ip_list[j]);
+                        if (!do_node_status(lookup, lookup_type, &ip_list[j])) {
+                                status = NT_STATUS_UNSUCCESSFUL;
+                        }
                 }
         }
@@ -233 +219 @@
   main program
 ****************************************************************************/
-int main(int argc,char *argv[])
+int main(int argc, const char *argv[])
 {
         int opt;
@@ -240 +226 @@
         static bool find_master=False;
         static bool lookup_by_ip = False;
-        poptContext pc;
+        poptContext pc = NULL;
         TALLOC_CTX *frame = talloc_stackframe();
+        int rc = 0;
 
         struct poptOption long_options[] = {
@@ -261 +248 @@
         *lookup = 0;
 
-        load_case_tables();
+        smb_init_locale();
 
         setup_logging(argv[0], DEBUG_STDOUT);
 
-        pc = poptGetContext("nmblookup", argc, (const char **)argv,
+        pc = poptGetContext("nmblookup", argc, argv,
                         long_options, POPT_CONTEXT_KEEP_FIRST);
 
@@ -316 +303 @@
         if(!poptPeekArg(pc)) {
                 poptPrintUsage(pc, stderr, 0);
-                exit(1);
-        }
-
-        if (!lp_load(get_dyn_CONFIGFILE(),True,False,False,True)) {
+                rc = 1;
+                goto out;
+        }
+
+        if (!lp_load_global(get_dyn_CONFIGFILE())) {
                 fprintf(stderr, "Can't load %s - run testparm to debug it\n",
                                 get_dyn_CONFIGFILE());
@@ -326 +314 @@
         load_interfaces();
         if (!open_sockets()) {
-                return(1);
+                rc = 1;
+                goto out;
         }
 
@@ -332 +321 @@
                 char *p;
                 struct in_addr ip;
+                size_t nbt_len;
 
                 fstrcpy(lookup,poptGetArg(pc));
@@ -340 +330 @@
                         in_addr_to_sockaddr_storage(&ss, ip);
                         fstrcpy(lookup,"*");
-                        do_node_status(lookup, lookup_type, &ss);
+                        if (!do_node_status(lookup, lookup_type, &ss)) {
+                                rc = 1;
+                        }
                         continue;
                 }
@@ -359 +351 @@
                 }
 
+                nbt_len = strlen(lookup);
+                if (nbt_len > MAX_NETBIOSNAME_LEN - 1) {
+                        d_printf("The specified netbios name [%s] is too long!\n",
+                                 lookup);
+                        continue;
+                }
+
+
                 if (!query_one(lookup, lookup_type)) {
+                        rc = 1;
                         d_printf( "name_query failed to find name %s", lookup );
                         if( 0 != lookup_type ) {
@@ -368 +369 @@
         }
 
+out:
         poptFreeContext(pc);
         TALLOC_FREE(frame);
-        return(0);
-}
+        return rc;
+}