[GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch.
[samba.git] / source / utils / smbtree.c
index b733f8112f382de50255155d90b846bba7c1b3ba..7d62d65b05695e926242b8b9f36ca7536954cbc1 100644 (file)
@@ -3,10 +3,11 @@
    Network neighbourhood browser.
    
    Copyright (C) Tim Potter      2000
+   Copyright (C) Jelmer Vernooij 2003
    
    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,
    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"
 
 static BOOL use_bcast;
 
-struct user_auth_info {
-       pstring username;
-       pstring password;
-       pstring workgroup;
-};
-
 /* How low can we go? */
 
 enum tree_level {LEV_WORKGROUP, LEV_SERVER, LEV_SHARE};
 static enum tree_level level = LEV_SHARE;
 
-static void usage(void)
-{
-       printf(
-"Usage: smbtree [options]\n\
-\n\
-\t-d debuglevel           set debug output level\n\
-\t-U username             user to autheticate as\n\
-\t-W workgroup            workgroup of user to authenticate as\n\
-\t-D                      list only domains (workgroups) of tree\n\
-\t-S                      list domains and servers of tree\n\
-\t-b                      use bcast instead of using the master browser\n\
-\n\
-The username can be of the form username%%password or\n\
-workgroup\\username%%password.\n\n\
-");
-}
-
 /* Holds a list of workgroups or servers */
 
 struct name_list {
@@ -73,7 +50,7 @@ static void add_name(const char *machine_name, uint32 server_type,
         struct name_list **name_list = (struct name_list **)state;
         struct name_list *new_name;
 
-        new_name = (struct name_list *)malloc(sizeof(struct name_list));
+        new_name = SMB_MALLOC_P(struct name_list);
 
         if (!new_name)
                 return;
@@ -87,62 +64,6 @@ static void add_name(const char *machine_name, uint32 server_type,
         DLIST_ADD(*name_list, new_name);
 }
 
-/* Return a cli_state pointing at the IPC$ share for the given server */
-
-static struct cli_state *get_ipc_connect(char *server, struct in_addr *server_ip,
-                                         struct user_auth_info *user_info)
-{
-        struct cli_state *cli;
-        pstring myname;
-       NTSTATUS nt_status;
-
-        get_myname(myname);
-       
-       nt_status = cli_full_connection(&cli, myname, server, server_ip, 0, "IPC$", "IPC", 
-                                       user_info->username, lp_workgroup(), user_info->password, 
-                                       CLI_FULL_CONNECTION_ANNONYMOUS_FALLBACK);
-
-       if (NT_STATUS_IS_OK(nt_status)) {
-               return cli;
-       } else {
-               return NULL;
-       }
-}
-
-/* Return the IP address and workgroup of a master browser on the 
-   network. */
-
-static BOOL find_master_ip_bcast(pstring workgroup, struct in_addr *server_ip)
-{
-       struct in_addr *ip_list;
-       int i, count;
-
-        /* Go looking for workgroups by broadcasting on the local network */ 
-
-        if (!name_resolve_bcast(MSBROWSE, 1, &ip_list, &count)) {
-                return False;
-        }
-
-       for (i = 0; i < count; i++) {
-               static fstring name;
-
-               if (!name_status_find("*", 0, 0x1d, ip_list[i], name))
-                       continue;
-
-                if (!find_master_ip(name, server_ip))
-                       continue;
-
-                pstrcpy(workgroup, name);
-
-                DEBUG(4, ("found master browser %s, %s\n", 
-                          name, inet_ntoa(ip_list[i])));
-
-                return True;
-       }
-
-       return False;
-}
-
 /****************************************************************************
   display tree of smb workgroups, servers and shares
 ****************************************************************************/
@@ -158,19 +79,21 @@ static BOOL get_workgroups(struct user_auth_info *user_info)
 
        pstrcpy(master_workgroup, lp_workgroup());
 
-        if (use_bcast || !find_master_ip(lp_workgroup(), &server_ip)) {
-                DEBUG(4, ("Unable to find master browser for workgroup %s\n", 
+        if (!use_bcast && !find_master_ip(lp_workgroup(), &server_ip)) {
+                DEBUG(4, ("Unable to find master browser for workgroup %s, falling back to broadcast\n", 
                          master_workgroup));
-               if (!find_master_ip_bcast(master_workgroup, &server_ip)) {
+                               use_bcast = True;
+               } else if(!use_bcast) {
+               if (!(cli = get_ipc_connect(inet_ntoa(server_ip), &server_ip, user_info)))
+                               return False;
+               }
+               
+               if (!(cli = get_ipc_connect_master_ip_bcast(master_workgroup, user_info))) {
                        DEBUG(4, ("Unable to find master browser by "
                                  "broadcast\n"));
                        return False;
-               }
         }
 
-        if (!(cli = get_ipc_connect(inet_ntoa(server_ip), &server_ip, user_info)))
-                return False;
-
         if (!cli_NetServerEnum(cli, master_workgroup, 
                                SV_TYPE_DOMAIN_ENUM, add_name, &workgroups))
                 return False;
@@ -203,6 +126,60 @@ static BOOL get_servers(char *workgroup, struct user_auth_info *user_info)
         return True;
 }
 
+static BOOL get_rpc_shares(struct cli_state *cli, 
+                          void (*fn)(const char *, uint32, const char *, void *),
+                          void *state)
+{
+       NTSTATUS status;
+       struct rpc_pipe_client *pipe_hnd;
+       TALLOC_CTX *mem_ctx;
+       ENUM_HND enum_hnd;
+       WERROR werr;
+       SRV_SHARE_INFO_CTR ctr;
+       int i;
+
+       mem_ctx = talloc_new(NULL);
+       if (mem_ctx == NULL) {
+               DEBUG(0, ("talloc_new failed\n"));
+               return False;
+       }
+
+       init_enum_hnd(&enum_hnd, 0);
+
+       pipe_hnd = cli_rpc_pipe_open_noauth(cli, PI_SRVSVC, &status);
+
+       if (pipe_hnd == NULL) {
+               DEBUG(10, ("Could not connect to srvsvc pipe: %s\n",
+                          nt_errstr(status)));
+               TALLOC_FREE(mem_ctx);
+               return False;
+       }
+
+       werr = rpccli_srvsvc_net_share_enum(pipe_hnd, mem_ctx, 1, &ctr,
+                                           0xffffffff, &enum_hnd);
+
+       if (!W_ERROR_IS_OK(werr)) {
+               TALLOC_FREE(mem_ctx);
+               cli_rpc_pipe_close(pipe_hnd);
+               return False;
+       }
+
+       for (i=0; i<ctr.num_entries; i++) {
+               SRV_SHARE_INFO_1 *info = &ctr.share.info1[i];
+               char *name, *comment;
+               name = rpcstr_pull_unistr2_talloc(
+                       mem_ctx, &info->info_1_str.uni_netname);
+               comment = rpcstr_pull_unistr2_talloc(
+                       mem_ctx, &info->info_1_str.uni_remark);
+               fn(name, info->info_1.type, comment, state);
+       }
+
+       TALLOC_FREE(mem_ctx);
+       cli_rpc_pipe_close(pipe_hnd);
+       return True;
+}
+
+
 static BOOL get_shares(char *server_name, struct user_auth_info *user_info)
 {
         struct cli_state *cli;
@@ -210,6 +187,9 @@ static BOOL get_shares(char *server_name, struct user_auth_info *user_info)
         if (!(cli = get_ipc_connect(server_name, NULL, user_info)))
                 return False;
 
+       if (get_rpc_shares(cli, add_name, &shares))
+               return True;
+       
         if (!cli_RNetShareEnum(cli, add_name, &shares))
                 return False;
 
@@ -267,14 +247,20 @@ static BOOL print_tree(struct user_auth_info *user_info)
 ****************************************************************************/
  int main(int argc,char *argv[])
 {
-       extern char *optarg;
-       extern int optind;
-       int opt;
-       char *p;
-       struct user_auth_info user_info;
-       BOOL got_pass = False;
-
+       TALLOC_CTX *frame = talloc_stackframe();
+       struct poptOption long_options[] = {
+               POPT_AUTOHELP
+               { "broadcast", 'b', POPT_ARG_VAL, &use_bcast, True, "Use broadcast instead of using the master browser" },
+               { "domains", 'D', POPT_ARG_VAL, &level, LEV_WORKGROUP, "List only domains (workgroups) of tree" },
+               { "servers", 'S', POPT_ARG_VAL, &level, LEV_SERVER, "List domains(workgroups) and servers of tree" },
+               POPT_COMMON_SAMBA
+               POPT_COMMON_CREDENTIALS
+               POPT_TABLEEND
+       };
+       poptContext pc;
+       
        /* Initialise samba stuff */
+       load_case_tables();
 
        setlinebuf(stdout);
 
@@ -282,87 +268,31 @@ static BOOL print_tree(struct user_auth_info *user_info)
 
        setup_logging(argv[0],True);
 
-       lp_load(dyn_CONFIGFILE,True,False,False);
-       load_interfaces();
-
-       if (getenv("USER")) {
-               pstrcpy(user_info.username, getenv("USER"));
-
-               if ((p=strchr(user_info.username, '%'))) {
-                       *p = 0;
-                       pstrcpy(user_info.password, p+1);
-                       got_pass = True;
-                       memset(strchr(getenv("USER"), '%') + 1, 'X',
-                              strlen(user_info.password));
-               }
-       }
+       pc = poptGetContext("smbtree", argc, (const char **)argv, long_options, 
+                                               POPT_CONTEXT_KEEP_FIRST);
+       while(poptGetNextOpt(pc) != -1);
+       poptFreeContext(pc);
 
-        pstrcpy(user_info.workgroup, lp_workgroup());
+       lp_load(dyn_CONFIGFILE,True,False,False,True);
+       load_interfaces();
 
        /* Parse command line args */
 
-       while ((opt = getopt(argc, argv, "U:hd:W:DSb")) != EOF) {
-               switch (opt) {
-               case 'U':
-                       pstrcpy(user_info.username,optarg);
-                       p = strchr(user_info.username,'%');
-                       if (p) {
-                               *p = 0;
-                               pstrcpy(user_info.password, p+1);
-                               got_pass = 1;
-                       }
-                       break;
-
-               case 'b':
-                       use_bcast = True;
-                       break;
-
-               case 'h':
-                       usage();
-                       exit(1);
-
-               case 'd':
-                       DEBUGLEVEL = atoi(optarg);
-                       break;
-
-               case 'W':
-                       pstrcpy(user_info.workgroup, optarg);
-                       break;
-
-                case 'D':
-                        level = LEV_WORKGROUP;
-                        break;
-
-                case 'S':
-                        level = LEV_SERVER;
-                        break;
-
-               default:
-                       printf("Unknown option %c (%d)\n", (char)opt, opt);
-                       exit(1);
-               }
-       }
-
-       argc -= optind;
-       argv += optind;
-       
-       if (argc > 0) {
-               usage();
-               exit(1);
-       }
-
-       if (!got_pass) {
+       if (!cmdline_auth_info.got_pass) {
                char *pass = getpass("Password: ");
                if (pass) {
-                       pstrcpy(user_info.password, pass);
+                       pstrcpy(cmdline_auth_info.password, pass);
                }
-                got_pass = True;
+        cmdline_auth_info.got_pass = True;
        }
 
        /* Now do our stuff */
 
-        if (!print_tree(&user_info))
+        if (!print_tree(&cmdline_auth_info)) {
+               TALLOC_FREE(frame);
                 return 1;
+       }
 
+       TALLOC_FREE(frame);
        return 0;
 }