Changeset 988 for vendor/current/source3/utils/smbtree.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/smbtree.c (modified) (9 diffs)

vendor/current/source3/utils/smbtree.c

@@ -39 +39 @@
         struct smb_name_list *prev, *next;
         char *name, *comment;
-        uint32 server_type;
+        uint32_t server_type;
 };
 
@@ -50 +50 @@
 }
 
-static void add_name(const char *machine_name, uint32 server_type,
+static void add_name(const char *machine_name, uint32_t server_type,
                      const char *comment, void *state)
 {
@@ -96 +96 @@
         }
 
-        if (!use_bcast && !find_master_ip(lp_workgroup(), &server_ss)) {
-                DEBUG(4, ("Unable to find master browser for workgroup %s, falling back to broadcast\n", 
-                          master_workgroup));
-                                use_bcast = True;
-                } else if(!use_bcast) {
-                        char addr[INET6_ADDRSTRLEN];
-                        print_sockaddr(addr, sizeof(addr), &server_ss);
-                        if (!(cli = get_ipc_connect(addr, &server_ss, user_info)))
-                                return False;
+        if (!use_bcast && !find_master_ip(lp_workgroup(), &server_ss)) {
+                DEBUG(4,("Unable to find master browser for workgroup %s, "
+                         "falling back to broadcast\n",
+                         master_workgroup));
+                use_bcast = true;
+        }
+
+        if (!use_bcast) {
+                char addr[INET6_ADDRSTRLEN];
+
+                print_sockaddr(addr, sizeof(addr), &server_ss);
+
+                cli = get_ipc_connect(addr, &server_ss, user_info);
+                if (cli == NULL) {
+                        return false;
                 }
-
-                if (!(cli = get_ipc_connect_master_ip_bcast(talloc_tos(),
-                                                        user_info,
-                                                        &master_workgroup))) {
+        } else {
+                cli = get_ipc_connect_master_ip_bcast(talloc_tos(),
+                                                      user_info,
+                                                      &master_workgroup);
+                if (cli == NULL) {
                         DEBUG(4, ("Unable to find master browser by "
                                   "broadcast\n"));
-                        return False;
-        }
+                        return false;
+                }
+        }
 
         if (!cli_NetServerEnum(cli, master_workgroup,
@@ -150 +158 @@
 
 static bool get_rpc_shares(struct cli_state *cli,
-                           void (*fn)(const char *, uint32, const char *, void *),
+                           void (*fn)(const char *, uint32_t, const char *, void *),
                            void *state)
 {
@@ -170 +178 @@
         }
 
-        status = cli_rpc_pipe_open_noauth(cli, &ndr_table_srvsvc.syntax_id,
+        status = cli_rpc_pipe_open_noauth(cli, &ndr_table_srvsvc,
                                           &pipe_hnd);
 
@@ -202 +210 @@
         }
 
-        for (i=0; i<total_entries; i++) {
+        for (i=0; i < info_ctr.ctr.ctr1->count; i++) {
                 struct srvsvc_NetShareInfo1 info = info_ctr.ctr.ctr1->array[i];
                 fn(info.name, info.type, info.comment, state);
@@ -278 +286 @@
   main program
 ****************************************************************************/
- int main(int argc,char *argv[])
+int main(int argc, char *argv[])
 {
         TALLOC_CTX *frame = talloc_stackframe();
+        const char **argv_const = discard_const_p(const char *, argv);
         struct user_auth_info *auth_info;
         struct poptOption long_options[] = {
@@ -294 +303 @@
 
         /* Initialise samba stuff */
-        load_case_tables();
+        smb_init_locale();
 
         setlinebuf(stdout);
@@ -306 +315 @@
         popt_common_set_auth_info(auth_info);
 
-        pc = poptGetContext("smbtree", argc, (const char **)argv, long_options,
-                                                POPT_CONTEXT_KEEP_FIRST);
+        pc = poptGetContext("smbtree", argc, argv_const, long_options,
+                            POPT_CONTEXT_KEEP_FIRST);
         while(poptGetNextOpt(pc) != -1);
         poptFreeContext(pc);
-
-        lp_load(get_dyn_CONFIGFILE(),True,False,False,True);
+        popt_burn_cmdline_password(argc, argv);
+
+        lp_load_global(get_dyn_CONFIGFILE());
         load_interfaces();