trying to get HEAD building again. If you want the code
[kai/samba-autobuild/.git] / source3 / rpcclient / rpcclient.c
index fce66b6b9b81fafb1f658780a4e5110f5ffd21b6..af021962f5d40bb1012605792c4b194168794640 100644 (file)
@@ -1,9 +1,9 @@
 /* 
-   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
+   Copyright (C) Martin Pool 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
 */
 
 #include "includes.h"
+#include "rpcclient.h"
 
-extern int DEBUGLEVEL;
-       
-/* Connect info */
+DOM_SID domain_sid;
 
-pstring password;
-pstring username;
-pstring workgroup;
-pstring server;
 
-/* Various pipe commands */
+/* List to hold groups of commands.
+ *
+ * Commands are defined in a list of arrays: arrays are easy to
+ * statically declare, and lists are easier to dynamically extend.
+ */
 
-extern struct cmd_set lsarpc_commands[];
-extern struct cmd_set samr_commands[];
-extern struct cmd_set spoolss_commands[];
+static struct cmd_list {
+       struct cmd_list *prev, *next;
+       struct cmd_set *cmd_set;
+} *cmd_list;
 
-DOM_SID domain_sid;
+/*****************************************************************************
+ stubb functions
+****************************************************************************/
+
+void become_root( void )
+{
+        return;
+}
+
+void unbecome_root( void )
+{
+        return;
+}
 
-/* Fetch the SID for this domain */
 
-void fetch_domain_sid(void)
+/****************************************************************************
+handle completion of commands for readline
+****************************************************************************/
+static char **completion_fn(char *text, int start, int end)
+{
+#define MAX_COMPLETIONS 100
+       char **matches;
+       int i, count=0;
+       struct cmd_list *commands = cmd_list;
+
+#if 0  /* JERRY */
+       /* FIXME!!!  -- what to do when completing argument? */
+       /* for words not at the start of the line fallback 
+          to filename completion */
+       if (start) 
+               return NULL;
+#endif
+
+       /* make sure we have a list of valid commands */
+       if (!commands) 
+               return NULL;
+
+       matches = (char **)malloc(sizeof(matches[0])*MAX_COMPLETIONS);
+       if (!matches) return NULL;
+
+       matches[count++] = strdup(text);
+       if (!matches[0]) return NULL;
+
+       while (commands && count < MAX_COMPLETIONS-1) 
+       {
+               if (!commands->cmd_set)
+                       break;
+               
+               for (i=0; commands->cmd_set[i].name; i++)
+               {
+                       if ((strncmp(text, commands->cmd_set[i].name, strlen(text)) == 0) &&
+                               (( commands->cmd_set[i].returntype == RPC_RTYPE_NTSTATUS &&
+                        commands->cmd_set[i].ntfn ) || 
+                      ( commands->cmd_set[i].returntype == RPC_RTYPE_WERROR &&
+                        commands->cmd_set[i].wfn)))
+                       {
+                               matches[count] = strdup(commands->cmd_set[i].name);
+                               if (!matches[count]) 
+                                       return NULL;
+                               count++;
+                       }
+               }
+               
+               commands = commands->next;
+               
+       }
+
+       if (count == 2) {
+               SAFE_FREE(matches[0]);
+               matches[0] = strdup(matches[1]);
+       }
+       matches[count] = NULL;
+       return matches;
+}
+
+static char* next_command (char** cmdstr)
+{
+       static pstring          command;
+       char                    *p;
+       
+       if (!cmdstr || !(*cmdstr))
+               return NULL;
+       
+       p = strchr_m(*cmdstr, ';');
+       if (p)
+               *p = '\0';
+       pstrcpy(command, *cmdstr);
+       if (p)
+               *cmdstr = p + 1;
+       else
+               *cmdstr = NULL;
+       
+       return command;
+}
+
+/* Fetch the SID for this computer */
+
+static void fetch_machine_sid(struct cli_state *cli)
 {
-       struct cli_state cli;
        POLICY_HND pol;
-       uint32 result = 0, info_class = 5;
-       struct ntuser_creds creds;
+       NTSTATUS result = NT_STATUS_OK;
+       uint32 info_class = 5;
        fstring domain_name;
        static BOOL got_domain_sid;
+       TALLOC_CTX *mem_ctx;
 
        if (got_domain_sid) return;
 
-       ZERO_STRUCT(cli);
-       init_rpcclient_creds(&creds);
+       if (!(mem_ctx=talloc_init("fetch_machine_sid")))
+       {
+               DEBUG(0,("fetch_machine_sid: talloc_init returned NULL!\n"));
+               goto error;
+       }
+
 
-       if (cli_lsa_initialise(&cli, server, &creds) == NULL) {
+       if (!cli_nt_session_open (cli, PI_LSARPC)) {
                fprintf(stderr, "could not initialise lsa pipe\n");
                goto error;
        }
-
-       if ((result = cli_lsa_open_policy(&cli, 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, &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;
        }
 
        got_domain_sid = True;
 
-       cli_lsa_close(&cli, &pol);
-       cli_lsa_shutdown(&cli);
+       cli_lsa_close(cli, mem_ctx, &pol);
+       cli_nt_session_close(cli);
+       talloc_destroy(mem_ctx);
 
        return;
 
  error:
-       fprintf(stderr, "could not obtain sid for domain %s\n", workgroup);
+       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)
+static NTSTATUS cmd_listcommands(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+                                int argc, const 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;
 
-       fstrcpy(creds->user_name, username);
-       fstrcpy(creds->domain, workgroup);
-}
+        /* Usage */
 
-/* List to hold groups of commands */
+        if (argc != 2) {
+                printf("Usage: %s <pipe>\n", argv[0]);
+                return NT_STATUS_OK;
+        }
 
-static struct cmd_list {
-       struct cmd_list *prev, *next;
-       struct cmd_set *cmd_set;
-} *cmd_list;
+        /* Help on one command */
 
-static uint32 cmd_help(int argc, char **argv)
+       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 NTSTATUS cmd_help(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+                         int argc, const 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("%s\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(int argc, char **argv)
+/* Change the debug level */
+
+static NTSTATUS cmd_debuglevel(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+                               int argc, const char **argv)
 {
        if (argc > 2) {
                printf("Usage: %s [debuglevel]\n", argv[0]);
-               return NT_STATUS_NOPROBLEMO;
+               return NT_STATUS_OK;
        }
 
        if (argc == 2) {
@@ -142,26 +309,182 @@ static uint32 cmd_debuglevel(int argc, char **argv)
 
        printf("debuglevel is %d\n", DEBUGLEVEL);
 
-       return NT_STATUS_NOPROBLEMO;
+       return NT_STATUS_OK;
 }
 
-static uint32 cmd_quit(int argc, char **argv)
+static NTSTATUS cmd_quit(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+                         int argc, const char **argv)
 {
        exit(0);
+       return NT_STATUS_OK; /* NOTREACHED */
 }
 
-/* Build in rpcclient commands */
+static NTSTATUS cmd_sign(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+                         int argc, const char **argv)
+{
+       if (cli->pipe_auth_flags == (AUTH_PIPE_NTLMSSP|AUTH_PIPE_SIGN)) {
+               return NT_STATUS_OK;
+       } else {
+               /* still have session, just need to use it again */
+               cli->pipe_auth_flags = AUTH_PIPE_NTLMSSP;
+               cli->pipe_auth_flags |= AUTH_PIPE_SIGN;
+               if (cli->nt_pipe_fnum != 0)
+                       cli_nt_session_close(cli);
+       }
+
+       return NT_STATUS_OK; 
+}
+
+static NTSTATUS cmd_seal(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+                         int argc, const char **argv)
+{
+       if (cli->pipe_auth_flags == (AUTH_PIPE_NTLMSSP|AUTH_PIPE_SIGN|AUTH_PIPE_SEAL)) {
+               return NT_STATUS_OK;
+       } else {
+               /* still have session, just need to use it again */
+               cli->pipe_auth_flags = AUTH_PIPE_NTLMSSP;
+               cli->pipe_auth_flags |= AUTH_PIPE_SIGN;
+               cli->pipe_auth_flags |= AUTH_PIPE_SEAL;
+               if (cli->nt_pipe_fnum != 0)
+                       cli_nt_session_close(cli);
+       }
+       return NT_STATUS_OK; 
+}
+
+static NTSTATUS cmd_none(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+                         int argc, const char **argv)
+{
+       if (cli->pipe_auth_flags == 0) {
+               return NT_STATUS_OK;
+       } else {
+               /* still have session, just need to use it again */
+               cli->pipe_auth_flags = 0;
+               if (cli->nt_pipe_fnum != 0)
+                       cli_nt_session_close(cli);
+       }
+       cli->pipe_auth_flags = 0;
+
+       return NT_STATUS_OK; 
+}
+
+static NTSTATUS cmd_schannel(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+                            int argc, const char **argv)
+{
+       uchar trust_password[16];
+       uint32 sec_channel_type;
+       uint32 neg_flags = 0x000001ff;
+       NTSTATUS result;
+       static uchar zeros[16];
+
+       /* Cleanup */
+
+       if ((memcmp(cli->auth_info.sess_key, zeros, sizeof(cli->auth_info.sess_key)) != 0) 
+           && (cli->saved_netlogon_pipe_fnum != 0)) {
+               if (cli->pipe_auth_flags == (AUTH_PIPE_NETSEC|AUTH_PIPE_SIGN|AUTH_PIPE_SEAL)) {
+                       return NT_STATUS_OK;
+               } else {
+                       /* still have session, just need to use it again */
+                       cli->pipe_auth_flags = AUTH_PIPE_NETSEC;
+                       cli->pipe_auth_flags |= AUTH_PIPE_SIGN;
+                       cli->pipe_auth_flags |= AUTH_PIPE_SEAL;
+                       if (cli->nt_pipe_fnum != 0)
+                               cli_nt_session_close(cli);
+               }
+       }
+       
+       if (cli->nt_pipe_fnum != 0)
+               cli_nt_session_close(cli);
+
+       cli->pipe_auth_flags = 0;
+       
+       if (!secrets_fetch_trust_account_password(lp_workgroup(),
+                                                 trust_password,
+                                                 NULL, &sec_channel_type)) {
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+       
+       if (!cli_nt_session_open(cli, PI_NETLOGON)) {
+               DEBUG(0, ("Could not initialise %s\n",
+                         get_pipe_name_from_index(PI_NETLOGON)));
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       neg_flags |= NETLOGON_NEG_SCHANNEL;
+
+       result = cli_nt_setup_creds(cli, sec_channel_type, trust_password,
+                                   &neg_flags, 2);
+
+       if (!NT_STATUS_IS_OK(result)) {
+               ZERO_STRUCT(cli->auth_info.sess_key);
+               cli->pipe_auth_flags = 0;
+               return result;
+       }
+
+       memcpy(cli->auth_info.sess_key, cli->sess_key,
+              sizeof(cli->auth_info.sess_key));
+
+       cli->saved_netlogon_pipe_fnum = cli->nt_pipe_fnum;
+
+       cli->pipe_auth_flags = AUTH_PIPE_NETSEC;
+       cli->pipe_auth_flags |= AUTH_PIPE_SIGN;
+       cli->pipe_auth_flags |= AUTH_PIPE_SEAL;
+
+       return NT_STATUS_OK; 
+}
+
+/* Built in rpcclient commands */
 
 static struct cmd_set rpcclient_commands[] = {
-       { "help", cmd_help, "Print list of commands" },
-       { "debuglevel", cmd_debuglevel, "Set debug level" },
-       { "quit", cmd_quit, "Exit program" },
-       { "?", cmd_help, "Print list of commands" },
 
-       { NULL, NULL, NULL }
+       { "GENERAL OPTIONS" },
+
+       { "help", RPC_RTYPE_NTSTATUS, cmd_help, NULL,     -1,   "Get help on commands", "[command]" },
+       { "?",  RPC_RTYPE_NTSTATUS, cmd_help, NULL,       -1,   "Get help on commands", "[command]" },
+       { "debuglevel", RPC_RTYPE_NTSTATUS, cmd_debuglevel, NULL,   -1, "Set debug level", "level" },
+       { "list",       RPC_RTYPE_NTSTATUS, cmd_listcommands, NULL, -1, "List available commands on <pipe>", "pipe" },
+       { "exit", RPC_RTYPE_NTSTATUS, cmd_quit, NULL,   -1,     "Exit program", "" },
+       { "quit", RPC_RTYPE_NTSTATUS, cmd_quit, NULL,     -1,   "Exit program", "" },
+       { "sign", RPC_RTYPE_NTSTATUS, cmd_sign, NULL,     -1,   "Force RPC pipe connections to be signed", "" },
+       { "seal", RPC_RTYPE_NTSTATUS, cmd_seal, NULL,     -1,   "Force RPC pipe connections to be sealed", "" },
+       { "schannel", RPC_RTYPE_NTSTATUS, cmd_schannel, NULL,     -1,   "Force RPC pipe connections to be sealed with 'schannel' (NETSEC).  Assumes valid machine account to this domain controller.", "" },
+       { "none", RPC_RTYPE_NTSTATUS, cmd_none, NULL,     -1,   "Force RPC pipe connections to have no special properties", "" },
+
+       { NULL }
 };
 
-void add_command_set(struct cmd_set *cmd_set)
+static struct cmd_set separator_command[] = {
+       { "---------------", MAX_RPC_RETURN_TYPE, NULL, NULL,   -1,     "----------------------" },
+       { NULL }
+};
+
+
+/* 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[];
+extern struct cmd_set ds_commands[];
+extern struct cmd_set echo_commands[];
+
+static struct cmd_set *rpcclient_command_list[] = {
+       rpcclient_commands,
+       lsarpc_commands,
+       ds_commands,
+       samr_commands,
+       spoolss_commands,
+       netlogon_commands,
+       srvsvc_commands,
+       dfs_commands,
+       reg_commands,
+       echo_commands,
+       NULL
+};
+
+static void add_command_set(struct cmd_set *cmd_set)
 {
        struct cmd_list *entry;
 
@@ -176,256 +499,301 @@ void add_command_set(struct cmd_set *cmd_set)
        DLIST_ADD(cmd_list, entry);
 }
 
-static uint32 do_cmd(struct cmd_set *cmd_entry, char *cmd)
-{
-       char *p = cmd, **argv = NULL;
-       uint32 result;
-       pstring buf;
-       int argc = 1, i;
 
-       next_token(&p, buf, " ", sizeof(buf));
+/**
+ * Call an rpcclient function, passing an argv array.
+ *
+ * @param cmd Command to run, as a single string.
+ **/
+static NTSTATUS do_cmd(struct cli_state *cli,
+                      struct cmd_set *cmd_entry,
+                      int argc, char **argv)
+{
+       NTSTATUS ntresult;
+       WERROR wresult;
+       uchar trust_password[16];
+       
+       TALLOC_CTX *mem_ctx;
 
-       /* Count number of arguments first time through the loop then
-          allocate memory and strdup them. */
+       /* Create mem_ctx */
 
- again:
-       while(next_token(NULL, buf, " ", sizeof(buf))) {
-               if (argv) {
-                       argv[argc] = strdup(buf);
-               }
-               
-               argc++;
+       if (!(mem_ctx = talloc_init("do_cmd"))) {
+               DEBUG(0, ("talloc_init() failed\n"));
+               return NT_STATUS_NO_MEMORY;
        }
-                               
-       if (!argv) {
 
-               /* Create argument list */
+       /* Open pipe */
 
-               argv = (char **)malloc(sizeof(char *) * argc);
+       if (cmd_entry->pipe_idx != -1
+           && cmd_entry->pipe_idx != cli->pipe_idx) {
+               if (cli->nt_pipe_fnum != 0)
+                       cli_nt_session_close(cli);
+               
+               if (!cli_nt_session_open(cli, cmd_entry->pipe_idx)) {
+                       DEBUG(0, ("Could not initialise %s\n",
+                                 get_pipe_name_from_index(cmd_entry->pipe_idx)));
+                       return NT_STATUS_UNSUCCESSFUL;
+               }
+       }
 
-               if (!argv) {
-                       fprintf(stderr, "out of memoryx\n");
-                       return 0;
+       if ((cmd_entry->pipe_idx == PI_NETLOGON) && !(cli->pipe_auth_flags & AUTH_PIPE_NETSEC)) {
+               uint32 neg_flags = 0x000001ff;
+               uint32 sec_channel_type;
+       
+               if (!secrets_fetch_trust_account_password(lp_workgroup(),
+                                                         trust_password,
+                                                         NULL, &sec_channel_type)) {
+                       return NT_STATUS_UNSUCCESSFUL;
                }
-                                       
-               p = cmd;
-               next_token(&p, buf, " ", sizeof(buf));
-               argv[0] = strdup(buf);
-               argc = 1;
-                                       
-               goto again;
+               
+               ntresult = cli_nt_setup_creds(cli, sec_channel_type, 
+                                             trust_password,
+                                             &neg_flags, 2);
+               if (!NT_STATUS_IS_OK(ntresult)) {
+                       ZERO_STRUCT(cli->auth_info.sess_key);
+                       printf("nt_setup_creds failed with %s\n", nt_errstr(ntresult));
+                       return ntresult;
+               }
+               
        }
 
-       /* Call the function */
+     /* Run command */
+
+     if ( cmd_entry->returntype == RPC_RTYPE_NTSTATUS ) {
+          ntresult = cmd_entry->ntfn(cli, mem_ctx, argc, (const char **) argv);
+          if (!NT_STATUS_IS_OK(ntresult)) {
+              printf("result was %s\n", nt_errstr(ntresult));
+          }
+     } else {
+          wresult = cmd_entry->wfn( cli, mem_ctx, argc, (const char **) argv);
+          /* print out the DOS error */
+          if (!W_ERROR_IS_OK(wresult)) {
+                  printf( "result was %s\n", dos_errstr(wresult));
+          }
+          ntresult = W_ERROR_IS_OK(wresult)?NT_STATUS_OK:NT_STATUS_UNSUCCESSFUL;
+     }
+            
 
-       result = cmd_entry->fn(argc, argv);
-                               
        /* Cleanup */
 
-       for (i = 0; i < argc; i++) {
-               free(argv[i]);
-       }
-       
-       free(argv);
-       
-       return result;
+       talloc_destroy(mem_ctx);
+
+       return ntresult;
 }
 
-/* Process a command entered at the prompt or as part of -c */
 
-static uint32 process_cmd(char *cmd)
+/**
+ * Process a command entered at the prompt or as part of -c
+ *
+ * @returns The NTSTATUS from running the command.
+ **/
+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;
-
-       if (!next_token(&p, buf, " ", sizeof(buf))) {
-               return 0;
+       NTSTATUS result = NT_STATUS_OK;
+       int ret;
+       int argc;
+       char **argv = NULL;
+
+       if ((ret = poptParseArgvString(cmd, &argc, (const char ***) &argv)) != 0) {
+               fprintf(stderr, "rpcclient: %s\n", poptStrerror(ret));
+               return NT_STATUS_UNSUCCESSFUL;
        }
 
-       /* Search for matching commands */
 
+       /* Walk through a dlist of arrays of commands. */
        for (temp_list = cmd_list; temp_list; temp_list = temp_list->next) {
                struct cmd_set *temp_set = temp_list->cmd_set;
 
-               while(temp_set->name) {
-                       if (strequal(buf, temp_set->name)) {
-                               found = True;
-                               result = do_cmd(temp_set, cmd);
-                               goto done;
+               while (temp_set->name) {
+                       if (strequal(argv[0], temp_set->name)) {
+                               if (!(temp_set->returntype == RPC_RTYPE_NTSTATUS && temp_set->ntfn ) &&
+                         !(temp_set->returntype == RPC_RTYPE_WERROR && temp_set->wfn )) {
+                                       fprintf (stderr, "Invalid command\n");
+                                       goto out_free;
+                               }
+
+                               result = do_cmd(cli, temp_set, argc, argv);
+
+                               goto out_free;
                        }
                        temp_set++;
                }
        }
 
- done:
-       if (!found && buf[0]) {
-               printf("command not found: %s\n", buf);
-               return 0;
+       if (argv[0]) {
+               printf("command not found: %s\n", argv[0]);
        }
 
-       if (result != 0) {
-               printf("result was %s\n", get_nt_error_msg(result));
+out_free:
+/* moved to do_cmd()
+       if (!NT_STATUS_IS_OK(result)) {
+               printf("result was %s\n", nt_errstr(result));
        }
+*/
 
+       if (argv) {
+               /* NOTE: popt allocates the whole argv, including the
+                * strings, as a single block.  So a single free is
+                * enough to release it -- we don't free the
+                * individual strings.  rtfm. */
+               free(argv);
+       }
+       
        return result;
 }
 
-/* Print usage information */
-
-static void usage(char *pname)
-{
-       printf("Usage: %s server [options]\n", pname);
-
-       printf("\t-N                    don't ask for a password\n");
-       printf("\t-d debuglevel         set the debuglevel\n");
-       printf("\t-h                    Print this help message.\n");
-       printf("\t-U username           set the network username\n");
-       printf("\t-W workgroup          set the workgroup name\n");
-       printf("\t-c command string     execute semicolon separated cmds\n");
-       printf("\n");
-}
 
 /* Main function */
 
  int main(int argc, char *argv[])
 {
-       extern char *optarg;
-       extern int optind;
-       struct in_addr dest_ip;
-       extern pstring global_myname;
-       BOOL got_pass = False;
-       BOOL have_ip = False;
-       int opt;
-       pstring cmdstr = "", servicesf = CONFIGFILE;
-       extern FILE *dbf;
+       BOOL                    interactive = True;
+       int                     opt;
+       static char             *cmdstr = NULL;
+       const char *server;
+       struct cli_state        *cli;
+       static char             *opt_ipaddr=NULL;
+       struct cmd_set          **cmd_set;
+       struct in_addr          server_ip;
+       NTSTATUS                nt_status;
+
+       /* 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
+               {"command",     'c', POPT_ARG_STRING,   &cmdstr, 'c', "Execute semicolon separated cmds", "COMMANDS"},
+               {"dest-ip", 'I', POPT_ARG_STRING,   &opt_ipaddr, 'I', "Specify destination IP address", "IP"},
+               POPT_COMMON_SAMBA
+               POPT_COMMON_CONNECTION
+               POPT_COMMON_CREDENTIALS
+               POPT_TABLEEND
+       };
+
+       ZERO_STRUCT(server_ip);
 
        setlinebuf(stdout);
-       dbf = stderr;
-
-       setup_logging(argv[0], True);
 
-#ifdef HAVE_LIBREADLINE
-       /* Allow conditional parsing of the ~/.inputrc file. */
-       rl_readline_name = "rpcclient";
-#endif    
+       /* the following functions are part of the Samba debugging
+          facilities.  See lib/debug.c */
+       setup_logging("rpcclient", interactive);
+       if (!interactive) 
+               reopen_logs();
        
-       DEBUGLEVEL = 2;
-
        /* Load smb.conf file */
 
-       charset_initialise();
-
-       if (!lp_load(servicesf,True,False,False)) {
-               fprintf(stderr, "Can't load %s\n", servicesf);
-       }
-
-       codepage_initialise(lp_client_code_page());
-       load_interfaces();
-
-       TimeInit();
-
-       get_myname((*global_myname)?NULL:global_myname);
-       strupper(global_myname);
+       if (!lp_load(dyn_CONFIGFILE,True,False,False))
+               fprintf(stderr, "Can't load %s\n", dyn_CONFIGFILE);
 
        /* Parse options */
 
-       if (argc < 2) {
-               usage(argv[0]);
+       pc = poptGetContext("rpcclient", argc, (const char **) argv,
+                           long_options, 0);
+
+       if (argc == 1) {
+               poptPrintHelp(pc, stderr, 0);
                return 0;
        }
-
-       pstrcpy(server, argv[1]);
-
-       argv++;
-       argc--;
-
-       while ((opt = getopt(argc, argv, "s:Nd:I:U:W:c:")) != EOF) {
+       
+       while((opt = poptGetNextOpt(pc)) != -1) {
                switch (opt) {
-               case 's':
-                       pstrcpy(servicesf, optarg);
-                       break;
-               case 'N':
-                       got_pass = True;
-                       break;
-               case 'd':
-                       DEBUGLEVEL = atoi(optarg);
-                       break;
+
                case 'I':
-                       dest_ip = *interpret_addr2(optarg);
-                       have_ip = True;
-                       break;
-               case 'U': {
-                       char *lp;
-                       pstrcpy(username,optarg);
-                       if ((lp=strchr(username,'%'))) {
-                               *lp = 0;
-                               pstrcpy(password,lp+1);
-                               got_pass = True;
-                               memset(strchr(optarg,'%')+1,'X',strlen(password));
+                       if ( (server_ip.s_addr=inet_addr(opt_ipaddr)) == INADDR_NONE ) {
+                               fprintf(stderr, "%s not a valid IP address\n",
+                                       opt_ipaddr);
+                               return 1;
                        }
-                       break;
-               }
-               case 'W':
-                       pstrcpy(workgroup, optarg);
-                       break;
-               case 'c':
-                       pstrcpy(cmdstr, optarg);
-                       got_pass = True;
-                       break;
-               case 'h':
-               default:
-                       usage(argv[0]);
-                       exit(1);
                }
        }
 
-       /* Load command lists */
+       /* Get server as remaining unparsed argument.  Print usage if more
+          than one unparsed argument is present. */
 
-       add_command_set(rpcclient_commands);
-       add_command_set(lsarpc_commands);
-       add_command_set(samr_commands);
-       add_command_set(spoolss_commands);
+       server = poptGetArg(pc);
+       
+       if (!server || poptGetArg(pc)) {
+               poptPrintHelp(pc, stderr, 0);
+               return 1;
+       }
 
-       /* Do anything specified with -c */
+       poptFreeContext(pc);
 
-       if (cmdstr[0]) {
-               pstring cmd;
-               char *p = cmdstr;
-               uint32 result;
+       load_interfaces();
 
-               while(next_token(&p, cmd, ";", sizeof(pstring))) {
-                       result = process_cmd(cmd);
+       if (!init_names())
+               return 1;
+
+       /*
+        * Get password
+        * from stdin if necessary
+        */
+
+       if (!cmdline_auth_info.got_pass) {
+               char *pass = getpass("Password:");
+               if (pass) {
+                       pstrcpy(cmdline_auth_info.password, pass);
                }
+       }
+       
+       nt_status = cli_full_connection(&cli, global_myname(), server, 
+                                       opt_ipaddr ? &server_ip : NULL, 0,
+                                       "IPC$", "IPC",  
+                                       cmdline_auth_info.username, lp_workgroup(),
+                                       cmdline_auth_info.password, 0, NULL);
+       
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               DEBUG(0,("Cannot connect to server.  Error was %s\n", nt_errstr(nt_status)));
+               return 1;
+       }
 
-               return 0;
+       memset(cmdline_auth_info.password,'X',sizeof(cmdline_auth_info.password));
+
+       /* Load command lists */
+
+       cmd_set = rpcclient_command_list;
+
+       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 && cmdstr[0]) {
+                char    *cmd;
+                char    *p = cmdstr;
+               int result = 0;
+                while((cmd=next_command(&p)) != NULL) {
+                        NTSTATUS cmd_result = process_cmd(cli, cmd);
+                       result = NT_STATUS_IS_ERR(cmd_result);
+                }
+               
+               cli_shutdown(cli);
+                return result;
+        }
+
        /* Loop around accepting commands */
 
        while(1) {
-               pstring prompt, cmd;
-               uint32 result;
+               pstring prompt;
+               char *line;
 
-               ZERO_STRUCT(cmd);
-               
-               slprintf(prompt, sizeof(prompt) - 1, "rpcclient> ");
+               slprintf(prompt, sizeof(prompt) - 1, "rpcclient $> ");
 
-#if HAVE_READLINE
-               cmd = readline(prompt);
-#else
-               printf("%s", prompt);
+               line = smb_readline(prompt, NULL, completion_fn);
 
-               if (!fgets(cmd, sizeof(cmd) - 1, stdin)) {
+               if (line == NULL)
                        break;
-               }
 
-               cmd[strlen(cmd) - 1] = '\0';
-#endif
-               result = process_cmd(cmd);
+               if (line[0] != '\n')
+                       process_cmd(cli, line);
        }
-
+       
+       cli_shutdown(cli);
        return 0;
 }