Forgot to remove old usage() function
[gd/samba-autobuild/.git] / source3 / rpcclient / rpcclient.c
index d50510212ef51a6fc4a6f55d41c43cac9e7f2bf5..5f15c57577489c139c9e42b19de42a12c1fc41fd 100644 (file)
@@ -1,9 +1,8 @@
 /* 
-   Unix SMB/Netbios implementation.
-   Version 2.2
+   Unix SMB/CIFS implementation.
    RPC pipe client
 
-   Copyright (C) Tim Potter 2000
+   Copyright (C) Tim Potter 2000-2001
 
    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
 */
 
 #include "includes.h"
+#include "rpcclient.h"
 
-extern int DEBUGLEVEL;
-extern fstring debugf;
-
-/* Various pipe commands */
-extern struct cmd_set lsarpc_commands[];
-extern struct cmd_set samr_commands[];
-extern struct cmd_set spoolss_commands[];
+DOM_SID domain_sid;
 
 /* List to hold groups of commands */
+
 static struct cmd_list {
        struct cmd_list *prev, *next;
        struct cmd_set *cmd_set;
 } *cmd_list;
 
-
-DOM_SID domain_sid;
-
 /****************************************************************************
 handle completion of commands for readline
 ****************************************************************************/
@@ -89,7 +81,7 @@ static char **completion_fn(char *text, int start, int end)
        }
 
        if (count == 2) {
-               free(matches[0]);
+               SAFE_FREE(matches[0]);
                matches[0] = strdup(matches[1]);
        }
        matches[count] = NULL;
@@ -137,7 +129,7 @@ static void read_authfile (
                /* break up the line into parameter & value.
                   will need to eat a little whitespace possibly */
                param = buf;
-               if (!(ptr = strchr (buf, '=')))
+               if (!(ptr = strchr_m(buf, '=')))
                        continue;
                val = ptr+1;
                *ptr = '\0';
@@ -160,9 +152,7 @@ static void read_authfile (
        return;
 }
 
-static char* next_command (
-       char**  cmdstr
-)
+static char* next_command (char** cmdstr)
 {
        static pstring          command;
        char                    *p;
@@ -170,7 +160,7 @@ static char* next_command (
        if (!cmdstr || !(*cmdstr))
                return NULL;
        
-       p = strchr(*cmdstr, ';');
+       p = strchr_m(*cmdstr, ';');
        if (p)
                *p = '\0';
        pstrcpy(command, *cmdstr);
@@ -194,11 +184,13 @@ static void get_username (char *username)
        return;
 }
 
-/* Fetch the SID for this domain */
-void fetch_domain_sid(struct cli_state *cli)
+/* Fetch the SID for this computer */
+
+static void fetch_machine_sid(struct cli_state *cli)
 {
        POLICY_HND pol;
-       uint32 result = 0, info_class = 5;
+       NTSTATUS result = NT_STATUS_OK;
+       uint32 info_class = 5;
        fstring domain_name;
        static BOOL got_domain_sid;
        TALLOC_CTX *mem_ctx;
@@ -207,7 +199,7 @@ void fetch_domain_sid(struct cli_state *cli)
 
        if (!(mem_ctx=talloc_init()))
        {
-               DEBUG(0,("fetch_domain_sid: talloc_init returned NULL!\n"));
+               DEBUG(0,("fetch_machine_sid: talloc_init returned NULL!\n"));
                goto error;
        }
 
@@ -217,15 +209,16 @@ void fetch_domain_sid(struct cli_state *cli)
                goto error;
        }
        
-       if ((result = cli_lsa_open_policy(cli, mem_ctx, True, 
-                                         SEC_RIGHTS_MAXIMUM_ALLOWED,
-                                         &pol) != NT_STATUS_NOPROBLEMO)) {
+       result = cli_lsa_open_policy(cli, mem_ctx, True, 
+                                    SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                    &pol);
+       if (!NT_STATUS_IS_OK(result)) {
                goto error;
        }
 
-       if ((result = cli_lsa_query_info_policy(cli, mem_ctx, &pol, info_class, 
-                                               domain_name, &domain_sid))
-           != NT_STATUS_NOPROBLEMO) {
+       result = cli_lsa_query_info_policy(cli, mem_ctx, &pol, info_class, 
+                                          domain_name, &domain_sid);
+       if (!NT_STATUS_IS_OK(result)) {
                goto error;
        }
 
@@ -240,53 +233,126 @@ void fetch_domain_sid(struct cli_state *cli)
  error:
        fprintf(stderr, "could not obtain sid for domain %s\n", cli->domain);
 
-       if (result != NT_STATUS_NOPROBLEMO) {
-               fprintf(stderr, "error: %s\n", get_nt_error_msg(result));
+       if (!NT_STATUS_IS_OK(result)) {
+               fprintf(stderr, "error: %s\n", nt_errstr(result));
        }
 
        exit(1);
 }
 
-/* Initialise client credentials for authenticated pipe access */
+/* List the available commands on a given pipe */
 
-void init_rpcclient_creds(struct ntuser_creds *creds, char* username,
-                         char* domain, char* password)
+static NTSTATUS cmd_listcommands(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+                         int argc, char **argv)
 {
-       ZERO_STRUCTP(creds);
-       
-       if (lp_encrypted_passwords()) {
-               pwd_make_lm_nt_16(&creds->pwd, password);
-       } else {
-               pwd_set_cleartext(&creds->pwd, password);
-       }
+       struct cmd_list *tmp;
+        struct cmd_set *tmp_set;
+       int i;
+
+        /* Usage */
 
-       fstrcpy(creds->user_name, username);
-       fstrcpy(creds->domain, domain);
+        if (argc != 2) {
+                printf("Usage: %s <pipe>\n", argv[0]);
+                return NT_STATUS_OK;
+        }
+
+        /* Help on one command */
+
+       for (tmp = cmd_list; tmp; tmp = tmp->next) 
+       {
+               tmp_set = tmp->cmd_set;
+               
+               if (!StrCaseCmp(argv[1], tmp_set->name))
+               {
+                       printf("Available commands on the %s pipe:\n\n", tmp_set->name);
+
+                       i = 0;
+                       tmp_set++;
+                       while(tmp_set->name) {
+                               printf("%20s", tmp_set->name);
+                                tmp_set++;
+                               i++;
+                               if (i%4 == 0)
+                                       printf("\n");
+                       }
+                       
+                       /* drop out of the loop */
+                       break;
+               }
+        }
+       printf("\n\n");
+
+       return NT_STATUS_OK;
 }
 
+/* Display help on commands */
 
-static uint32 cmd_help(struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_help(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+                         int argc, char **argv)
 {
-       struct cmd_list *temp_list;
+       struct cmd_list *tmp;
+        struct cmd_set *tmp_set;
 
-       for (temp_list = cmd_list; temp_list; temp_list = temp_list->next) {
-               struct cmd_set *temp_set = temp_list->cmd_set;
+        /* Usage */
 
-               while(temp_set->name) {
-                       printf("%15s\t\t%s\n", temp_set->name,
-                              temp_set->description);
-                       temp_set++;
+        if (argc > 2) {
+                printf("Usage: %s [command]\n", argv[0]);
+                return NT_STATUS_OK;
+        }
+
+        /* Help on one command */
+
+        if (argc == 2) {
+                for (tmp = cmd_list; tmp; tmp = tmp->next) {
+                        
+                        tmp_set = tmp->cmd_set;
+
+                        while(tmp_set->name) {
+                                if (strequal(argv[1], tmp_set->name)) {
+                                        if (tmp_set->usage &&
+                                            tmp_set->usage[0])
+                                                printf("%s\n", tmp_set->usage);
+                                        else
+                                                printf("No help for %s\n", tmp_set->name);
+
+                                        return NT_STATUS_OK;
+                                }
+
+                                tmp_set++;
+                        }
+                }
+
+                printf("No such command: %s\n", argv[1]);
+                return NT_STATUS_OK;
+        }
+
+        /* List all commands */
+
+       for (tmp = cmd_list; tmp; tmp = tmp->next) {
+
+               tmp_set = tmp->cmd_set;
+
+               while(tmp_set->name) {
+
+                       printf("%15s\t\t%s\n", tmp_set->name,
+                              tmp_set->description ? tmp_set->description:
+                              "");
+
+                       tmp_set++;
                }
        }
 
-       return 0;
+       return NT_STATUS_OK;
 }
 
-static uint32 cmd_debuglevel(struct cli_state *cli, int argc, char **argv)
+/* Change the debug level */
+
+static NTSTATUS cmd_debuglevel(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+                               int argc, char **argv)
 {
        if (argc > 2) {
                printf("Usage: %s [debuglevel]\n", argv[0]);
-               return NT_STATUS_NOPROBLEMO;
+               return NT_STATUS_OK;
        }
 
        if (argc == 2) {
@@ -295,35 +361,61 @@ static uint32 cmd_debuglevel(struct cli_state *cli, int argc, char **argv)
 
        printf("debuglevel is %d\n", DEBUGLEVEL);
 
-       return NT_STATUS_NOPROBLEMO;
+       return NT_STATUS_OK;
 }
 
-static uint32 cmd_quit(struct cli_state *cli, int argc, char **argv)
+static NTSTATUS cmd_quit(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+                         int argc, char **argv)
 {
        exit(0);
-       return NT_STATUS_NOPROBLEMO; /* NOTREACHED */
+       return NT_STATUS_OK; /* NOTREACHED */
 }
 
 /* Build in rpcclient commands */
 
 static struct cmd_set rpcclient_commands[] = {
-       { "GENERAL OPTIONS",    NULL,   "" },
-       { "help",       cmd_help,       "Print list of commands" },
-       { "?",          cmd_help,       "Print list of commands" },
-       { "debuglevel", cmd_debuglevel, "Set debug level" },
-       { "exit",       cmd_quit,       "Exit program" },
-       { "quit",       cmd_quit,       "Exit program" },
-
-       { NULL, NULL, NULL }
+
+       { "GENERAL OPTIONS" },
+
+       { "help",       cmd_help,       NULL,   "Get help on commands", "[command]" },
+       { "?",          cmd_help,       NULL,   "Get help on commands", "[command]" },
+       { "debuglevel", cmd_debuglevel, NULL,   "Set debug level", "level" },
+       { "list",       cmd_listcommands, NULL, "List available commands on <pipe>", "pipe" },
+       { "exit",       cmd_quit,       NULL,   "Exit program", "" },
+       { "quit",       cmd_quit,       NULL,   "Exit program", "" },
+
+       { NULL }
 };
 
 static struct cmd_set separator_command[] = {
-       { "---------------", NULL,      "----------------------" },
-       { NULL, NULL, NULL }
+       { "---------------", NULL,      NULL,   "----------------------" },
+       { NULL }
 };
 
 
-void add_command_set(struct cmd_set *cmd_set)
+/* Various pipe commands */
+
+extern struct cmd_set lsarpc_commands[];
+extern struct cmd_set samr_commands[];
+extern struct cmd_set spoolss_commands[];
+extern struct cmd_set netlogon_commands[];
+extern struct cmd_set srvsvc_commands[];
+extern struct cmd_set dfs_commands[];
+extern struct cmd_set reg_commands[];
+
+static struct cmd_set *rpcclient_command_list[] = {
+       rpcclient_commands,
+       lsarpc_commands,
+       samr_commands,
+       spoolss_commands,
+       netlogon_commands,
+       srvsvc_commands,
+       dfs_commands,
+       reg_commands,
+       NULL
+};
+
+static void add_command_set(struct cmd_set *cmd_set)
 {
        struct cmd_list *entry;
 
@@ -338,20 +430,19 @@ void add_command_set(struct cmd_set *cmd_set)
        DLIST_ADD(cmd_list, entry);
 }
 
-static uint32 do_cmd(struct cli_state *cli, struct cmd_set *cmd_entry, char *cmd)
+static NTSTATUS do_cmd(struct cli_state *cli, struct cmd_set *cmd_entry, 
+                       char *cmd)
 {
        char *p = cmd, **argv = NULL;
-       uint32 result;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        pstring buf;
-       int argc = 1, i;
-
-       next_token(&p, buf, " ", sizeof(buf));
+       int argc = 0, i;
 
        /* Count number of arguments first time through the loop then
           allocate memory and strdup them. */
 
  again:
-       while(next_token(NULL, buf, " ", sizeof(buf))) {
+       while(next_token(&p, buf, " ", sizeof(buf))) {
                if (argv) {
                        argv[argc] = strdup(buf);
                }
@@ -364,54 +455,94 @@ static uint32 do_cmd(struct cli_state *cli, struct cmd_set *cmd_entry, char *cmd
                /* Create argument list */
 
                argv = (char **)malloc(sizeof(char *) * argc);
+                memset(argv, 0, sizeof(char *) * argc);
 
                if (!argv) {
-                       fprintf(stderr, "out of memoryx\n");
-                       return 0;
+                       fprintf(stderr, "out of memory\n");
+                       result = NT_STATUS_NO_MEMORY;
+                        goto done;
                }
                                        
                p = cmd;
-               next_token(&p, buf, " ", sizeof(buf));
-               argv[0] = strdup(buf);
-               argc = 1;
+               argc = 0;
                                        
                goto again;
        }
 
        /* Call the function */
+
        if (cmd_entry->fn) {
-               result = cmd_entry->fn(cli, argc, argv);
-       }
-       else {
+                TALLOC_CTX *mem_ctx;
+
+                /* Create mem_ctx */
+
+                if (!(mem_ctx = talloc_init())) {
+                        DEBUG(0, ("talloc_init() failed\n"));
+                        goto done;
+                }
+
+                /* Open pipe */
+
+                if (cmd_entry->pipe)
+                        if (!cli_nt_session_open(cli, cmd_entry->pipe)) {
+                                DEBUG(0, ("Could not initialise %s\n",
+                                          cmd_entry->pipe));
+                                goto done;
+                        }
+
+                /* Run command */
+
+                result = cmd_entry->fn(cli, mem_ctx, argc, argv);
+
+                /* Cleanup */
+
+                if (cmd_entry->pipe)
+                        cli_nt_session_close(cli);
+
+                talloc_destroy(mem_ctx);
+
+       } else {
                fprintf (stderr, "Invalid command\n");
-               result = NT_STATUS_INVALID_PARAMETER;
-       }
+                goto done;
+        }
 
+ done:
                                                
        /* Cleanup */
-       for (i = 0; i < argc; i++) {
-               free(argv[i]);
-       }
+
+        if (argv) {
+                for (i = 0; i < argc; i++)
+                        SAFE_FREE(argv[i]);
        
-       free(argv);
+                SAFE_FREE(argv);
+        }
        
        return result;
 }
 
 /* Process a command entered at the prompt or as part of -c */
 
-static uint32 process_cmd(struct cli_state *cli, char *cmd)
+static NTSTATUS process_cmd(struct cli_state *cli, char *cmd)
 {
        struct cmd_list *temp_list;
        BOOL found = False;
        pstring buf;
        char *p = cmd;
-       uint32 result=0;
+       NTSTATUS result = NT_STATUS_OK;
+       int len = 0;
+
+       if (cmd[strlen(cmd) - 1] == '\n')
+               cmd[strlen(cmd) - 1] = '\0';
 
        if (!next_token(&p, buf, " ", sizeof(buf))) {
-               return 0;
+               return NT_STATUS_OK;
        }
 
+        /* strip the trainly \n if it exsists */
+       len = strlen(buf);
+       if (buf[len-1] == '\n')
+               buf[len-1] = '\0';
+
        /* Search for matching commands */
 
        for (temp_list = cmd_list; temp_list; temp_list = temp_list->next) {
@@ -419,8 +550,9 @@ static uint32 process_cmd(struct cli_state *cli, char *cmd)
 
                while(temp_set->name) {
                        if (strequal(buf, temp_set->name)) {
-                               found = True;
+                                found = True;
                                result = do_cmd(cli, temp_set, cmd);
+
                                goto done;
                        }
                        temp_set++;
@@ -430,238 +562,215 @@ static uint32 process_cmd(struct cli_state *cli, char *cmd)
  done:
        if (!found && buf[0]) {
                printf("command not found: %s\n", buf);
-               return 0;
+               return NT_STATUS_OK;
        }
 
-       if (result != 0) {
-               printf("result was %s\n", get_nt_error_msg(result));
+       if (!NT_STATUS_IS_OK(result)) {
+               printf("result was %s\n", nt_errstr(result));
        }
 
        return result;
 }
 
-/************************************************************************/
-struct cli_state *setup_connection(struct cli_state *cli, char *system_name,
-                                  struct ntuser_creds *creds)
-{
-       struct in_addr dest_ip;
-       struct nmb_name calling, called;
-       fstring dest_host;
-       extern pstring global_myname;
-       struct ntuser_creds anon;
-
-       /* Initialise cli_state information */
-       if (!cli_initialise(cli)) {
-               return NULL;
-       }
-
-       if (!creds) {
-               ZERO_STRUCT(anon);
-               anon.pwd.null_pwd = 1;
-               creds = &anon;
-       }
-
-       cli_init_creds(cli, creds);
-
-       /* Establish a SMB connection */
-       if (!resolve_srv_name(system_name, dest_host, &dest_ip)) {
-               return NULL;
-       }
-
-       make_nmb_name(&called, dns_to_netbios_name(dest_host), 0x20);
-       make_nmb_name(&calling, dns_to_netbios_name(global_myname), 0);
-
-       if (!cli_establish_connection(cli, dest_host, &dest_ip, &calling, 
-                                     &called, "IPC$", "IPC", False, True)) {
-               return NULL;
-       }
-       
-       return cli;
-}
-
-
-/* Print usage information */
-static void usage(char *pname)
-{
-       printf("Usage: %s server [options]\n", pname);
-
-       printf("\t-A authfile           file containing user credentials\n");
-       printf("\t-c \"command string\"   execute semicolon separated cmds\n");
-       printf("\t-d debuglevel         set the debuglevel\n");
-       printf("\t-l logfile            name of logfile to use as opposed to stdout\n");
-       printf("\t-h                    Print this help message.\n");
-       printf("\t-N                    don't ask for a password\n");
-       printf("\t-s configfile         specify an alternative config file\n");
-       printf("\t-U username           set the network username\n");
-       printf("\t-W domain             set the domain name for user account\n");
-       printf("\n");
-}
 
 /* Main function */
 
  int main(int argc, char *argv[])
 {
-       extern char             *optarg;
-       extern int              optind;
        extern pstring          global_myname;
-       BOOL                    got_pass = False;
+       static int              got_pass = 0;
        BOOL                    interactive = True;
        int                     opt;
        int                     olddebug;
-       pstring                 cmdstr = "", 
-                               servicesf = CONFIGFILE;
-       struct ntuser_creds     creds;
-       struct cli_state        cli;
-       fstring                 password,
-                               username,
-                               domain,
-                               server;
-
-       charset_initialise();
+       static char             *cmdstr = "";
+       const char *server;
+       struct cli_state        *cli;
+       fstring                 password="",
+                               username="",
+               domain="";
+       static char             *opt_authfile=NULL,
+                               *opt_username=NULL,
+                               *opt_domain=NULL,
+                               *opt_configfile=NULL,
+                               *opt_logfile=NULL,
+                               *opt_ipaddr=NULL;
+       pstring                 logfile;
+       struct cmd_set          **cmd_set;
+       struct in_addr          server_ip;
+       NTSTATUS                nt_status;
+       extern BOOL             AllowDebugChange;
+
+       /* make sure the vars that get altered (4th field) are in
+          a fixed location or certain compilers complain */
+       poptContext pc;
+       struct poptOption long_options[] = {
+               POPT_AUTOHELP
+               {"authfile",    'A', POPT_ARG_STRING,   &opt_authfile, 'A', "File containing user credentials"},
+               {"conf",        's', POPT_ARG_STRING,   &opt_configfile, 's', "Specify an alternative config file"},
+               {"nopass",      'N', POPT_ARG_NONE,     &got_pass, 'N', "Don't ask for a password"},
+               {"user",        'U', POPT_ARG_STRING,   &opt_username, 'U', "Set the network username"},
+               {"workgroup",   'W', POPT_ARG_STRING,   &opt_domain, 'W', "Set the domain name for user account"},
+               {"command",     'c', POPT_ARG_STRING,   &cmdstr, 'c', "Execute semicolon separated cmds"},
+               {"logfile",     'l', POPT_ARG_STRING,   &opt_logfile, 'l', "Logfile to use instead of stdout"},
+               {"dest-ip",     'I', POPT_ARG_STRING,   &opt_ipaddr, 'I', "Specify destination IP address"},
+               { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug },
+               { NULL }
+       };
+
        setlinebuf(stdout);
 
        DEBUGLEVEL = 1;
+       AllowDebugChange = False;
 
        /* Parse options */
-       if (argc < 2) {
-               usage(argv[0]);
-               return 0;
-       }
 
-       pstrcpy(server, argv[1]);
+       pc = poptGetContext("rpcclient", argc, (const char **) argv,
+                           long_options, 0);
 
-       argv++;
-       argc--;
-
-       while ((opt = getopt(argc, argv, "A:s:Nd:U:W:c:l:")) != EOF) {
+       if (argc == 1) {
+               poptPrintHelp(pc, stderr, 0);
+               return 0;
+       }
+       
+       while((opt = poptGetNextOpt(pc)) != -1) {
                switch (opt) {
                case 'A':
                        /* only get the username, password, and domain from the file */
-                       read_authfile (optarg, username, password, domain);
+                       read_authfile (opt_authfile, username, password, domain);
                        if (strlen (password))
-                               got_pass = True;
-                       break;
-
-               case 'c':
-                       pstrcpy(cmdstr, optarg);
-                       break;
-
-               case 'd':
-                       DEBUGLEVEL = atoi(optarg);
+                               got_pass = 1;
                        break;
-
+                       
                case 'l':
-                       slprintf(debugf, sizeof(debugf) - 1, "%s.client", optarg);
+                       slprintf(logfile, sizeof(logfile) - 1, "%s.client", 
+                                opt_logfile);
+                       lp_set_logfile(logfile);
                        interactive = False;
                        break;
-
-               case 'N':
-                       got_pass = True;
-                       break;
                        
                case 's':
-                       pstrcpy(servicesf, optarg);
+                       pstrcpy(dyn_CONFIGFILE, opt_configfile);
                        break;
-
+                       
                case 'U': {
                        char *lp;
-                       pstrcpy(username,optarg);
-                       if ((lp=strchr(username,'%'))) {
+
+                       pstrcpy(username,opt_username);
+
+                       if ((lp=strchr_m(username,'%'))) {
                                *lp = 0;
                                pstrcpy(password,lp+1);
-                               got_pass = True;
-                               memset(strchr(optarg,'%')+1,'X',strlen(password));
+                               got_pass = 1;
+                               memset(strchr_m(opt_username,'%') + 1, 'X',
+                                      strlen(password));
                        }
                        break;
                }
-               
+               case 'I':
+                       if (!inet_aton(opt_ipaddr, &server_ip)) {
+                               fprintf(stderr, "%s not a valid IP address\n",
+                                       opt_ipaddr);
+                               return 1;
+                       }
                case 'W':
-                       pstrcpy(domain, optarg);
+                       pstrcpy(domain, opt_domain);
                        break;
-                       
-               case 'h':
-               default:
-                       usage(argv[0]);
-                       exit(1);
                }
        }
+
+       /* Get server as remaining unparsed argument.  Print usage if more
+          than one unparsed argument is present. */
+
+       server = poptGetArg(pc);
        
+       if (!server || poptGetArg(pc)) {
+               poptPrintHelp(pc, stderr, 0);
+               return 1;
+       }
+
+       poptFreeContext(pc);
+
        /* the following functions are part of the Samba debugging
           facilities.  See lib/debug.c */
-       setup_logging (argv[0], interactive);
+       setup_logging("rpcclient", interactive);
        if (!interactive) 
                reopen_logs();
        
        /* Load smb.conf file */
        /* FIXME!  How to get this DEBUGLEVEL to last over lp_load()? */
        olddebug = DEBUGLEVEL;
-       if (!lp_load(servicesf,True,False,False)) {
-               fprintf(stderr, "Can't load %s\n", servicesf);
+       if (!lp_load(dyn_CONFIGFILE,True,False,False)) {
+               fprintf(stderr, "Can't load %s\n", dyn_CONFIGFILE);
        }
        DEBUGLEVEL = olddebug;
 
-       codepage_initialise(lp_client_code_page());
        load_interfaces();
 
-       TimeInit();
-
        get_myname((*global_myname)?NULL:global_myname);
        strupper(global_myname);
+
+       /* Resolve the IP address */
+
+       if (!opt_ipaddr && !resolve_name(server, &server_ip, 0x20))  {
+               DEBUG(1,("Unable to resolve %s\n", server));
+               return 1;
+       }
        
        /*
-        * initialize the credentials struct.  Get password
+        * Get password
         * from stdin if necessary
         */
-       if (!strlen(username))
-               get_username (username);
-               
-       if (!got_pass) {
-               init_rpcclient_creds (&creds, username, domain, "");
-               pwd_read(&creds.pwd, "Enter Password: ", lp_encrypted_passwords());
-       }
-       else {
-               init_rpcclient_creds (&creds, username, domain, password);
-       }
-       memset(password,'X',strlen(password));
 
-       /* open a connection to the specified server */
-       ZERO_STRUCTP (&cli);
-       if (!setup_connection (&cli, server, &creds)) {
-               return 0;
+       if (!got_pass) {
+               char *pass = getpass("Password:");
+               if (pass) {
+                       fstrcpy(password, pass);
+               }
        }
        
-       /* There are no pointers in ntuser_creds struct so zero it out */
-       ZERO_STRUCTP (&creds);
+       if (!strlen(username) && !got_pass)
+               get_username(username);
+               
+       nt_status = cli_full_connection(&cli, global_myname, server, 
+                                       &server_ip, 0,
+                                       "IPC$", "IPC",  
+                                       username, domain,
+                                       password, 0);
        
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               DEBUG(0,("Cannot connect to server.  Error was %s\n", nt_errstr(nt_status)));
+               return 1;
+       }
 
-       /* Load command lists */
-       add_command_set(rpcclient_commands);
-       add_command_set(separator_command);
-
-       add_command_set(spoolss_commands);
-       add_command_set(separator_command);
-
-       add_command_set(lsarpc_commands);
-       add_command_set(separator_command);
-
-       add_command_set(samr_commands);
-       add_command_set(separator_command);
+       memset(password,'X',sizeof(password));
 
+       /* Load command lists */
 
-       /* Do anything specified with -c */
-       if (cmdstr[0]) {
-               char    *cmd;
-               char    *p = cmdstr;
+       cmd_set = rpcclient_command_list;
 
-               while((cmd=next_command(&p)) != NULL) {
-                       process_cmd(&cli, cmd);
-               }
-
-               return 0;
+       while(*cmd_set) {
+               add_command_set(*cmd_set);
+               add_command_set(separator_command);
+               cmd_set++;
        }
 
+       fetch_machine_sid(cli);
+       /* Do anything specified with -c */
+        if (cmdstr[0]) {
+                char    *cmd;
+                char    *p = cmdstr;
+                while((cmd=next_command(&p)) != NULL) {
+                        process_cmd(cli, cmd);
+                }
+               
+               cli_shutdown(cli);
+                return 0;
+        }
 
        /* Loop around accepting commands */
+
        while(1) {
                pstring prompt;
                char *line;
@@ -670,7 +779,13 @@ static void usage(char *pname)
 
                line = smb_readline(prompt, NULL, completion_fn);
 
-               process_cmd(&cli, line);
+               if (line == NULL)
+                       break;
+
+               if (line[0] != '\n')
+                       process_cmd(cli, line);
        }
+       
+       cli_shutdown(cli);
+       return 0;
 }
-