r23779: Change from v2 or later to v3 or later.
[ira/wip.git] / source3 / utils / smbtree.c
index 41940d9a6cad0f0059d1f0ad2588289b71417b76..5deb29a149b3a03b5b3f66feea464e9376d03695 100644 (file)
@@ -1,13 +1,13 @@
 /* 
-   Unix SMB/Netbios implementation.
+   Unix SMB/CIFS implementation.
    Network neighbourhood browser.
-   Version 3.0
    
    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,
 
 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};
-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\
-");
-}
+static enum tree_level level = LEV_SHARE;
 
 /* Holds a list of workgroups or servers */
 
@@ -74,7 +51,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;
@@ -88,117 +65,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 workgroup */
-
-static struct cli_state *get_ipc_connect(char *server,
-                                         struct user_auth_info *user_info)
-{
-        struct nmb_name calling, called;
-        extern struct in_addr ipzero;
-        struct in_addr server_ip = ipzero;
-        struct cli_state *cli;
-        pstring myname;
-
-        get_myname(myname);
-
-        make_nmb_name(&called, myname, 0x0);
-        make_nmb_name(&calling, server, 0x20);
-
-        if (is_ipaddress(server))
-                if (!resolve_name(server, &server_ip, 0x20))
-                        return False;
-                
- again:
-       if (!(cli = cli_initialise(NULL))) {
-                DEBUG(4, ("Unable to initialise cli structure\n"));
-                goto error;
-        }
-
-        if (!cli_connect(cli, server, &server_ip)) {
-                DEBUG(4, ("Unable to connect to %s\n", server));
-                goto error;
-        }
-
-        if (!cli_session_request(cli, &calling, &called)) {
-                cli_shutdown(cli);
-                if (!strequal(called.name, "*SMBSERVER")) {
-                        make_nmb_name(&called , "*SMBSERVER", 0x20);
-                        goto again;
-                }
-                DEBUG(4, ("Session request failed to %s\n", called.name));
-                goto error;
-       }
-
-        if (!cli_negprot(cli)) {
-                DEBUG(4, ("Negprot failed\n"));
-                goto error;
-       }
-
-       if (!cli_session_setup(cli, user_info->username, user_info->password, 
-                               strlen(user_info->password),
-                              user_info->password, 
-                               strlen(user_info->password), server) &&
-           /* try an anonymous login if it failed */
-           !cli_session_setup(cli, "", "", 1,"", 0, server)) {
-                DEBUG(4, ("Session setup failed\n"));
-                goto error;
-       }
-
-       DEBUG(4,(" session setup ok\n"));
-
-       if (!cli_send_tconX(cli, "IPC$", "?????",
-                           user_info->password, 
-                            strlen(user_info->password)+1)) {
-                DEBUG(4, ("Tconx failed\n"));
-                goto error;
-       }
-
-        return cli;
-
-        /* Clean up after error */
-
- error:
-        if (cli && cli->initialised)
-                cli_shutdown(cli);
-
-        free(cli);
-        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(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
 ****************************************************************************/
@@ -214,19 +80,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), user_info)))
-                return False;
-
         if (!cli_NetServerEnum(cli, master_workgroup, 
                                SV_TYPE_DOMAIN_ENUM, add_name, &workgroups))
                 return False;
@@ -249,7 +117,7 @@ static BOOL get_servers(char *workgroup, struct user_auth_info *user_info)
                 return False;
         }
 
-        if (!(cli = get_ipc_connect(inet_ntoa(server_ip), user_info)))
+        if (!(cli = get_ipc_connect(inet_ntoa(server_ip), &server_ip, user_info)))
                 return False;
 
         if (!cli_NetServerEnum(cli, workgroup, SV_TYPE_ALL, add_name, 
@@ -259,13 +127,72 @@ 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;
+       uint32 enum_hnd;
+       struct srvsvc_NetShareCtr1 ctr1;
+       union srvsvc_NetShareCtr ctr;
+       uint32 numentries;
+       int i;
+       uint32 info_level = 1;
+
+       mem_ctx = talloc_new(NULL);
+       if (mem_ctx == NULL) {
+               DEBUG(0, ("talloc_new failed\n"));
+               return False;
+       }
+
+       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;
+       }
+
+       ZERO_STRUCT(ctr1);
+       level = 1;
+       ctr.ctr1 = &ctr1;
+
+       status = rpccli_srvsvc_NetShareEnum(pipe_hnd, mem_ctx, NULL,
+                                           &info_level, &ctr,
+                                           0xffffffff, &numentries,
+                                           &enum_hnd);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(mem_ctx);
+               cli_rpc_pipe_close(pipe_hnd);
+               return False;
+       }
+
+       for (i=0; i<numentries; i++) {
+               fn(ctr.ctr1->array[i].name, ctr.ctr1->array[i].type, 
+                  ctr.ctr1->array[i].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;
 
-        if (!(cli = get_ipc_connect(server_name, 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;
 
@@ -323,105 +250,47 @@ static BOOL print_tree(struct user_auth_info *user_info)
 ****************************************************************************/
  int main(int argc,char *argv[])
 {
-       extern char *optarg;
-       extern int optind;
-       extern FILE *dbf;
-       int opt;
-       char *p;
-       pstring servicesf = CONFIGFILE;
-       struct user_auth_info user_info;
-       BOOL got_pass = False;
-
+       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);
 
-       dbf = stderr;
+       dbf = x_stderr;
 
        setup_logging(argv[0],True);
 
-       TimeInit();
+       pc = poptGetContext("smbtree", argc, (const char **)argv, long_options, 
+                                               POPT_CONTEXT_KEEP_FIRST);
+       while(poptGetNextOpt(pc) != -1);
+       poptFreeContext(pc);
 
-       lp_load(servicesf,True,False,False);
+       lp_load(dyn_CONFIGFILE,True,False,False,True);
        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));
-               }
-       }
-
-        pstrcpy(user_info.workgroup, lp_workgroup());
-
        /* 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))
                 return 1;
 
        return 0;