s3-param Remove special case for lp_workgroup()

[kai/samba.git] / source3 / rpcclient / rpcclient.c

diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 60fda23a1997137b08beae8c79ea4d2bce698820..5808f371f0dd01be1ab0da5ad1c91fb1c458741c 100644 (file)
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -9,24 +9,40 @@
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    it under the terms of the GNU General Public License as published by
    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,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    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, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"

+#include "popt_common.h"

 #include "rpcclient.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "rpcclient.h"
 #include "../libcli/auth/libcli_auth.h"

+#include "../librpc/gen_ndr/ndr_lsa_c.h"
+#include "rpc_client/cli_lsarpc.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "rpc_client/cli_netlogon.h"
+#include "../libcli/smbreadline/smbreadline.h"
+#include "../libcli/security/security.h"
+#include "passdb.h"
+#include "libsmb/libsmb.h"
+
+enum pipe_auth_type_spnego {
+       PIPE_AUTH_TYPE_SPNEGO_NONE = 0,
+       PIPE_AUTH_TYPE_SPNEGO_NTLMSSP,
+       PIPE_AUTH_TYPE_SPNEGO_KRB5
+};

 
 

-DOM_SID domain_sid;
+struct dom_sid domain_sid;

 
 

-static enum pipe_auth_type pipe_default_auth_type = PIPE_AUTH_TYPE_NONE;
-static enum pipe_auth_level pipe_default_auth_level = PIPE_AUTH_LEVEL_NONE;
+static enum dcerpc_AuthType pipe_default_auth_type = DCERPC_AUTH_TYPE_NONE;
+static enum pipe_auth_type_spnego pipe_default_auth_spnego_type = 0;
+static enum dcerpc_AuthLevel pipe_default_auth_level = DCERPC_AUTH_LEVEL_NONE;

 static unsigned int timeout = 0;
 static enum dcerpc_transport_t default_transport = NCACN_NP;
 
 static unsigned int timeout = 0;
 static enum dcerpc_transport_t default_transport = NCACN_NP;
 


@@ -48,7 +64,7 @@ handle completion of commands for readline
 ****************************************************************************/
 static char **completion_fn(const char *text, int start, int end)
 {
 ****************************************************************************/
 static char **completion_fn(const char *text, int start, int end)
 {

-#define MAX_COMPLETIONS 100
+#define MAX_COMPLETIONS 1000

        char **matches;
        int i, count=0;
        struct cmd_list *commands = cmd_list;
        char **matches;
        int i, count=0;
        struct cmd_list *commands = cmd_list;


@@ -81,7 +97,7 @@ static char **completion_fn(const char *text, int start, int end)
                if (!commands->cmd_set) {
                        break;
                }
                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 &&
                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 &&


@@ -100,7 +116,6 @@ static char **completion_fn(const char *text, int start, int end)
                        }
                }
                commands = commands->next;
                        }
                }
                commands = commands->next;

-               

        }
 
        if (count == 2) {
        }
 
        if (count == 2) {


@@ -115,10 +130,10 @@ static char *next_command (char **cmdstr)
 {
        char *command;
        char                    *p;
 {
        char *command;
        char                    *p;

-       
+

        if (!cmdstr || !(*cmdstr))
                return NULL;
        if (!cmdstr || !(*cmdstr))
                return NULL;

-       
+

        p = strchr_m(*cmdstr, ';');
        if (p)
                *p = '\0';
        p = strchr_m(*cmdstr, ';');
        if (p)
                *p = '\0';


@@ -127,7 +142,7 @@ static char *next_command (char **cmdstr)
                *cmdstr = p + 1;
        else
                *cmdstr = NULL;
                *cmdstr = p + 1;
        else
                *cmdstr = NULL;

-       
+

        return command;
 }
 
        return command;
 }
 


@@ -136,11 +151,12 @@ static char *next_command (char **cmdstr)
 static void fetch_machine_sid(struct cli_state *cli)
 {
        struct policy_handle pol;
 static void fetch_machine_sid(struct cli_state *cli)
 {
        struct policy_handle pol;

-       NTSTATUS result = NT_STATUS_OK;
+       NTSTATUS result = NT_STATUS_OK, status;

        static bool got_domain_sid;
        TALLOC_CTX *mem_ctx;
        struct rpc_pipe_client *lsapipe = NULL;
        union lsa_PolicyInformation *info = NULL;
        static bool got_domain_sid;
        TALLOC_CTX *mem_ctx;
        struct rpc_pipe_client *lsapipe = NULL;
        union lsa_PolicyInformation *info = NULL;

+       struct dcerpc_binding_handle *b;

 
        if (got_domain_sid) return;
 
 
        if (got_domain_sid) return;
 


@@ -155,7 +171,9 @@ static void fetch_machine_sid(struct cli_state *cli)
                fprintf(stderr, "could not initialise lsa pipe. Error was %s\n", nt_errstr(result) );
                goto error;
        }
                fprintf(stderr, "could not initialise lsa pipe. Error was %s\n", nt_errstr(result) );
                goto error;
        }

-       
+
+       b = lsapipe->binding_handle;
+

        result = rpccli_lsa_open_policy(lsapipe, mem_ctx, True, 
                                     SEC_FLAG_MAXIMUM_ALLOWED,
                                     &pol);
        result = rpccli_lsa_open_policy(lsapipe, mem_ctx, True, 
                                     SEC_FLAG_MAXIMUM_ALLOWED,
                                     &pol);


@@ -163,10 +181,15 @@ static void fetch_machine_sid(struct cli_state *cli)
                goto error;
        }
 
                goto error;
        }
 

-       result = rpccli_lsa_QueryInfoPolicy(lsapipe, mem_ctx,
+       status = dcerpc_lsa_QueryInfoPolicy(b, mem_ctx,

                                            &pol,
                                            LSA_POLICY_INFO_ACCOUNT_DOMAIN,
                                            &pol,
                                            LSA_POLICY_INFO_ACCOUNT_DOMAIN,

-                                           &info);
+                                           &info,
+                                           &result);
+       if (!NT_STATUS_IS_OK(status)) {
+               result = status;
+               goto error;
+       }

        if (!NT_STATUS_IS_OK(result)) {
                goto error;
        }
        if (!NT_STATUS_IS_OK(result)) {
                goto error;
        }


@@ -174,7 +197,7 @@ static void fetch_machine_sid(struct cli_state *cli)
        got_domain_sid = True;
        sid_copy(&domain_sid, info->account_domain.sid);
 
        got_domain_sid = True;
        sid_copy(&domain_sid, info->account_domain.sid);
 

-       rpccli_lsa_Close(lsapipe, mem_ctx, &pol);
+       dcerpc_lsa_Close(b, mem_ctx, &pol, &result);

        TALLOC_FREE(lsapipe);
        talloc_destroy(mem_ctx);
 
        TALLOC_FREE(lsapipe);
        talloc_destroy(mem_ctx);
 


@@ -216,8 +239,8 @@ static NTSTATUS cmd_listcommands(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ct
        for (tmp = cmd_list; tmp; tmp = tmp->next) 
        {
                tmp_set = tmp->cmd_set;
        for (tmp = cmd_list; tmp; tmp = tmp->next) 
        {
                tmp_set = tmp->cmd_set;

-               
-               if (!StrCaseCmp(argv[1], tmp_set->name))
+
+               if (!strcasecmp_m(argv[1], tmp_set->name))

                {
                        printf("Available commands on the %s pipe:\n\n", tmp_set->name);
 
                {
                        printf("Available commands on the %s pipe:\n\n", tmp_set->name);
 


@@ -230,7 +253,7 @@ static NTSTATUS cmd_listcommands(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ct
                                if (i%3 == 0)
                                        printf("\n");
                        }
                                if (i%3 == 0)
                                        printf("\n");
                        }

-                       
+

                        /* drop out of the loop */
                        break;
                }
                        /* drop out of the loop */
                        break;
                }


@@ -259,7 +282,7 @@ static NTSTATUS cmd_help(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 
         if (argc == 2) {
                 for (tmp = cmd_list; tmp; tmp = tmp->next) {
 
         if (argc == 2) {
                 for (tmp = cmd_list; tmp; tmp = tmp->next) {

-                        
+

                         tmp_set = tmp->cmd_set;
 
                         while(tmp_set->name) {
                         tmp_set = tmp->cmd_set;
 
                         while(tmp_set->name) {


@@ -311,7 +334,7 @@ static NTSTATUS cmd_debuglevel(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
        }
 
        if (argc == 2) {
        }
 
        if (argc == 2) {

-               DEBUGLEVEL = atoi(argv[1]);
+               lp_set_cmdline("log level", argv[1]);

        }
 
        printf("debuglevel is %d\n", DEBUGLEVEL);
        }
 
        printf("debuglevel is %d\n", DEBUGLEVEL);


@@ -378,26 +401,34 @@ static NTSTATUS cmd_set_transport(void)
 static NTSTATUS cmd_sign(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
                          int argc, const char **argv)
 {
 static NTSTATUS cmd_sign(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
                          int argc, const char **argv)
 {

+       const char *p = "[KRB5|KRB5_SPNEGO|NTLMSSP|NTLMSSP_SPNEGO|SCHANNEL]";

        const char *type = "NTLMSSP";
 
        const char *type = "NTLMSSP";
 

-       pipe_default_auth_level = PIPE_AUTH_LEVEL_INTEGRITY;
-       pipe_default_auth_type = PIPE_AUTH_TYPE_NTLMSSP;
+       pipe_default_auth_level = DCERPC_AUTH_LEVEL_INTEGRITY;
+       pipe_default_auth_type = DCERPC_AUTH_TYPE_NTLMSSP;

 
        if (argc > 2) {
 
        if (argc > 2) {

-               printf("Usage: %s [NTLMSSP|NTLMSSP_SPNEGO|SCHANNEL]\n", argv[0]);
+               printf("Usage: %s %s\n", argv[0], p);

                return NT_STATUS_OK;
        }
 
        if (argc == 2) {
                type = argv[1];
                return NT_STATUS_OK;
        }
 
        if (argc == 2) {
                type = argv[1];

-               if (strequal(type, "NTLMSSP")) {
-                       pipe_default_auth_type = PIPE_AUTH_TYPE_NTLMSSP;
+               if (strequal(type, "KRB5")) {
+                       pipe_default_auth_type = DCERPC_AUTH_TYPE_KRB5;
+               } else if (strequal(type, "KRB5_SPNEGO")) {
+                       pipe_default_auth_type = DCERPC_AUTH_TYPE_SPNEGO;
+                       pipe_default_auth_spnego_type = PIPE_AUTH_TYPE_SPNEGO_KRB5;
+               } else if (strequal(type, "NTLMSSP")) {
+                       pipe_default_auth_type = DCERPC_AUTH_TYPE_NTLMSSP;

                } else if (strequal(type, "NTLMSSP_SPNEGO")) {
                } else if (strequal(type, "NTLMSSP_SPNEGO")) {

-                       pipe_default_auth_type = PIPE_AUTH_TYPE_SPNEGO_NTLMSSP;
+                       pipe_default_auth_type = DCERPC_AUTH_TYPE_SPNEGO;
+                       pipe_default_auth_spnego_type = PIPE_AUTH_TYPE_SPNEGO_NTLMSSP;

                } else if (strequal(type, "SCHANNEL")) {
                } else if (strequal(type, "SCHANNEL")) {

-                       pipe_default_auth_type = PIPE_AUTH_TYPE_SCHANNEL;
+                       pipe_default_auth_type = DCERPC_AUTH_TYPE_SCHANNEL;

                } else {
                        printf("unknown type %s\n", type);
                } else {
                        printf("unknown type %s\n", type);

+                       printf("Usage: %s %s\n", argv[0], p);

                        return NT_STATUS_INVALID_LEVEL;
                }
        }
                        return NT_STATUS_INVALID_LEVEL;
                }
        }


@@ -410,26 +441,34 @@ static NTSTATUS cmd_sign(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 static NTSTATUS cmd_seal(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
                          int argc, const char **argv)
 {
 static NTSTATUS cmd_seal(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
                          int argc, const char **argv)
 {

+       const char *p = "[KRB5|KRB5_SPNEGO|NTLMSSP|NTLMSSP_SPNEGO|SCHANNEL]";

        const char *type = "NTLMSSP";
 
        const char *type = "NTLMSSP";
 

-       pipe_default_auth_level = PIPE_AUTH_LEVEL_PRIVACY;
-       pipe_default_auth_type = PIPE_AUTH_TYPE_NTLMSSP;
+       pipe_default_auth_level = DCERPC_AUTH_LEVEL_PRIVACY;
+       pipe_default_auth_type = DCERPC_AUTH_TYPE_NTLMSSP;

 
        if (argc > 2) {
 
        if (argc > 2) {

-               printf("Usage: %s [NTLMSSP|NTLMSSP_SPNEGO|SCHANNEL]\n", argv[0]);
+               printf("Usage: %s %s\n", argv[0], p);

                return NT_STATUS_OK;
        }
 
        if (argc == 2) {
                type = argv[1];
                return NT_STATUS_OK;
        }
 
        if (argc == 2) {
                type = argv[1];

-               if (strequal(type, "NTLMSSP")) {
-                       pipe_default_auth_type = PIPE_AUTH_TYPE_NTLMSSP;
+               if (strequal(type, "KRB5")) {
+                       pipe_default_auth_type = DCERPC_AUTH_TYPE_KRB5;
+               } else if (strequal(type, "KRB5_SPNEGO")) {
+                       pipe_default_auth_type = DCERPC_AUTH_TYPE_SPNEGO;
+                       pipe_default_auth_spnego_type = PIPE_AUTH_TYPE_SPNEGO_KRB5;
+               } else if (strequal(type, "NTLMSSP")) {
+                       pipe_default_auth_type = DCERPC_AUTH_TYPE_NTLMSSP;

                } else if (strequal(type, "NTLMSSP_SPNEGO")) {
                } else if (strequal(type, "NTLMSSP_SPNEGO")) {

-                       pipe_default_auth_type = PIPE_AUTH_TYPE_SPNEGO_NTLMSSP;
+                       pipe_default_auth_type = DCERPC_AUTH_TYPE_SPNEGO;
+                       pipe_default_auth_spnego_type = PIPE_AUTH_TYPE_SPNEGO_NTLMSSP;

                } else if (strequal(type, "SCHANNEL")) {
                } else if (strequal(type, "SCHANNEL")) {

-                       pipe_default_auth_type = PIPE_AUTH_TYPE_SCHANNEL;
+                       pipe_default_auth_type = DCERPC_AUTH_TYPE_SCHANNEL;

                } else {
                        printf("unknown type %s\n", type);
                } else {
                        printf("unknown type %s\n", type);

+                       printf("Usage: %s %s\n", argv[0], p);

                        return NT_STATUS_INVALID_LEVEL;
                }
        }
                        return NT_STATUS_INVALID_LEVEL;
                }
        }


@@ -453,7 +492,7 @@ static NTSTATUS cmd_timeout(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
                timeout = atoi(argv[1]);
 
                for (tmp = cmd_list; tmp; tmp = tmp->next) {
                timeout = atoi(argv[1]);
 
                for (tmp = cmd_list; tmp; tmp = tmp->next) {

-                       
+

                        struct cmd_set *tmp_set;
 
                        for (tmp_set = tmp->cmd_set; tmp_set->name; tmp_set++) {
                        struct cmd_set *tmp_set;
 
                        for (tmp_set = tmp->cmd_set; tmp_set->name; tmp_set++) {


@@ -475,8 +514,9 @@ static NTSTATUS cmd_timeout(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
 static NTSTATUS cmd_none(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
                          int argc, const char **argv)
 {
 static NTSTATUS cmd_none(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
                          int argc, const char **argv)
 {

-       pipe_default_auth_level = PIPE_AUTH_LEVEL_NONE;
-       pipe_default_auth_type = PIPE_AUTH_TYPE_NONE;
+       pipe_default_auth_level = DCERPC_AUTH_LEVEL_NONE;
+       pipe_default_auth_type = DCERPC_AUTH_TYPE_NONE;
+       pipe_default_auth_spnego_type = PIPE_AUTH_TYPE_SPNEGO_NONE;

 
        return cmd_set_ss_level();
 }
 
        return cmd_set_ss_level();
 }


@@ -485,8 +525,8 @@ static NTSTATUS cmd_schannel(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
                             int argc, const char **argv)
 {
        d_printf("Setting schannel - sign and seal\n");
                             int argc, const char **argv)
 {
        d_printf("Setting schannel - sign and seal\n");

-       pipe_default_auth_level = PIPE_AUTH_LEVEL_PRIVACY;
-       pipe_default_auth_type = PIPE_AUTH_TYPE_SCHANNEL;
+       pipe_default_auth_level = DCERPC_AUTH_LEVEL_PRIVACY;
+       pipe_default_auth_type = DCERPC_AUTH_TYPE_SCHANNEL;

 
        return cmd_set_ss_level();
 }
 
        return cmd_set_ss_level();
 }


@@ -495,8 +535,8 @@ static NTSTATUS cmd_schannel_sign(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c
                             int argc, const char **argv)
 {
        d_printf("Setting schannel - sign only\n");
                             int argc, const char **argv)
 {
        d_printf("Setting schannel - sign only\n");

-       pipe_default_auth_level = PIPE_AUTH_LEVEL_INTEGRITY;
-       pipe_default_auth_type = PIPE_AUTH_TYPE_SCHANNEL;
+       pipe_default_auth_level = DCERPC_AUTH_LEVEL_INTEGRITY;
+       pipe_default_auth_type = DCERPC_AUTH_TYPE_SCHANNEL;

 
        return cmd_set_ss_level();
 }
 
        return cmd_set_ss_level();
 }


@@ -547,7 +587,7 @@ static struct cmd_set rpcclient_commands[] = {
        { "seal", RPC_RTYPE_NTSTATUS, cmd_seal, NULL,     NULL, NULL, "Force RPC pipe connections to be sealed", "" },
        { "schannel", RPC_RTYPE_NTSTATUS, cmd_schannel, NULL,     NULL, NULL,   "Force RPC pipe connections to be sealed with 'schannel'.  Assumes valid machine account to this domain controller.", "" },
        { "schannelsign", RPC_RTYPE_NTSTATUS, cmd_schannel_sign, NULL,    NULL, NULL, "Force RPC pipe connections to be signed (not sealed) with 'schannel'.  Assumes valid machine account to this domain controller.", "" },
        { "seal", RPC_RTYPE_NTSTATUS, cmd_seal, NULL,     NULL, NULL, "Force RPC pipe connections to be sealed", "" },
        { "schannel", RPC_RTYPE_NTSTATUS, cmd_schannel, NULL,     NULL, NULL,   "Force RPC pipe connections to be sealed with 'schannel'.  Assumes valid machine account to this domain controller.", "" },
        { "schannelsign", RPC_RTYPE_NTSTATUS, cmd_schannel_sign, NULL,    NULL, NULL, "Force RPC pipe connections to be signed (not sealed) with 'schannel'.  Assumes valid machine account to this domain controller.", "" },

-       { "timeout", RPC_RTYPE_NTSTATUS, cmd_timeout, NULL,       NULL, NULL, "Set timeout (in milliseonds) for RPC operations", "" },
+       { "timeout", RPC_RTYPE_NTSTATUS, cmd_timeout, NULL,       NULL, NULL, "Set timeout (in milliseconds) for RPC operations", "" },

        { "transport", RPC_RTYPE_NTSTATUS, cmd_choose_transport, NULL,    NULL, NULL, "Choose ncacn transport for RPC operations", "" },
        { "none", RPC_RTYPE_NTSTATUS, cmd_none, NULL,     NULL, NULL, "Force RPC pipe connections to have no special properties", "" },
 
        { "transport", RPC_RTYPE_NTSTATUS, cmd_choose_transport, NULL,    NULL, NULL, "Choose ncacn transport for RPC operations", "" },
        { "none", RPC_RTYPE_NTSTATUS, cmd_none, NULL,     NULL, NULL, "Force RPC pipe connections to have no special properties", "" },
 


@@ -577,6 +617,7 @@ extern struct cmd_set wkssvc_commands[];
 extern struct cmd_set ntsvcs_commands[];
 extern struct cmd_set drsuapi_commands[];
 extern struct cmd_set eventlog_commands[];
 extern struct cmd_set ntsvcs_commands[];
 extern struct cmd_set drsuapi_commands[];
 extern struct cmd_set eventlog_commands[];

+extern struct cmd_set winreg_commands[];

 
 static struct cmd_set *rpcclient_command_list[] = {
        rpcclient_commands,
 
 static struct cmd_set *rpcclient_command_list[] = {
        rpcclient_commands,


@@ -595,6 +636,7 @@ static struct cmd_set *rpcclient_command_list[] = {
        ntsvcs_commands,
        drsuapi_commands,
        eventlog_commands,
        ntsvcs_commands,
        drsuapi_commands,
        eventlog_commands,

+       winreg_commands,

        NULL
 };
 
        NULL
 };
 


@@ -627,7 +669,7 @@ static NTSTATUS do_cmd(struct cli_state *cli,
 {
        NTSTATUS ntresult;
        WERROR wresult;
 {
        NTSTATUS ntresult;
        WERROR wresult;

-       
+

        TALLOC_CTX *mem_ctx;
 
        /* Create mem_ctx */
        TALLOC_CTX *mem_ctx;
 
        /* Create mem_ctx */


@@ -641,51 +683,77 @@ static NTSTATUS do_cmd(struct cli_state *cli,
 
        if ((cmd_entry->interface != NULL) && (cmd_entry->rpc_pipe == NULL)) {
                switch (pipe_default_auth_type) {
 
        if ((cmd_entry->interface != NULL) && (cmd_entry->rpc_pipe == NULL)) {
                switch (pipe_default_auth_type) {

-                       case PIPE_AUTH_TYPE_NONE:
-                               ntresult = cli_rpc_pipe_open_noauth_transport(
-                                       cli, default_transport,
-                                       cmd_entry->interface,
-                                       &cmd_entry->rpc_pipe);
-                               break;
+               case DCERPC_AUTH_TYPE_NONE:
+                       ntresult = cli_rpc_pipe_open_noauth_transport(
+                               cli, default_transport,
+                               cmd_entry->interface,
+                               &cmd_entry->rpc_pipe);
+                       break;
+               case DCERPC_AUTH_TYPE_SPNEGO:
+                       switch (pipe_default_auth_spnego_type) {

                        case PIPE_AUTH_TYPE_SPNEGO_NTLMSSP:
                                ntresult = cli_rpc_pipe_open_spnego_ntlmssp(
                        case PIPE_AUTH_TYPE_SPNEGO_NTLMSSP:
                                ntresult = cli_rpc_pipe_open_spnego_ntlmssp(

-                                       cli, cmd_entry->interface,
-                                       default_transport,
-                                       pipe_default_auth_level,
-                                       lp_workgroup(),
-                                       get_cmdline_auth_info_username(auth_info),
-                                       get_cmdline_auth_info_password(auth_info),
-                                       &cmd_entry->rpc_pipe);
+                                               cli, cmd_entry->interface,
+                                               default_transport,
+                                               pipe_default_auth_level,
+                                               get_cmdline_auth_info_domain(auth_info),
+                                               get_cmdline_auth_info_username(auth_info),
+                                               get_cmdline_auth_info_password(auth_info),
+                                               &cmd_entry->rpc_pipe);

                                break;
                                break;

-                       case PIPE_AUTH_TYPE_NTLMSSP:
-                               ntresult = cli_rpc_pipe_open_ntlmssp(
-                                       cli, cmd_entry->interface,
-                                       default_transport,
-                                       pipe_default_auth_level,
-                                       lp_workgroup(),
-                                       get_cmdline_auth_info_username(auth_info),
-                                       get_cmdline_auth_info_password(auth_info),
-                                       &cmd_entry->rpc_pipe);
-                               break;
-                       case PIPE_AUTH_TYPE_SCHANNEL:
-                               ntresult = cli_rpc_pipe_open_schannel(
-                                       cli, cmd_entry->interface,
-                                       pipe_default_auth_level,
-                                       lp_workgroup(),
-                                       &cmd_entry->rpc_pipe);
+                       case PIPE_AUTH_TYPE_SPNEGO_KRB5:
+                               ntresult = cli_rpc_pipe_open_spnego_krb5(
+                                               cli, cmd_entry->interface,
+                                               default_transport,
+                                               pipe_default_auth_level,
+                                               cli->desthost,
+                                               NULL, NULL,
+                                               &cmd_entry->rpc_pipe);

                                break;
                        default:
                                break;
                        default:

-                               DEBUG(0, ("Could not initialise %s. Invalid "
-                                         "auth type %u\n",
-                                         get_pipe_name_from_iface(
-                                                 cmd_entry->interface),
-                                         pipe_default_auth_type ));
-                               return NT_STATUS_UNSUCCESSFUL;
+                               ntresult = NT_STATUS_INTERNAL_ERROR;
+                       }
+                       break;
+               case DCERPC_AUTH_TYPE_NTLMSSP:
+                       ntresult = cli_rpc_pipe_open_ntlmssp(
+                               cli, cmd_entry->interface,
+                               default_transport,
+                               pipe_default_auth_level,
+                               get_cmdline_auth_info_domain(auth_info),
+                               get_cmdline_auth_info_username(auth_info),
+                               get_cmdline_auth_info_password(auth_info),
+                               &cmd_entry->rpc_pipe);
+                       break;
+               case DCERPC_AUTH_TYPE_SCHANNEL:
+                       ntresult = cli_rpc_pipe_open_schannel(
+                               cli, cmd_entry->interface,
+                               default_transport,
+                               pipe_default_auth_level,
+                               get_cmdline_auth_info_domain(auth_info),
+                               &cmd_entry->rpc_pipe);
+                       break;
+               case DCERPC_AUTH_TYPE_KRB5:
+                       ntresult = cli_rpc_pipe_open_krb5(
+                               cli, cmd_entry->interface,
+                               default_transport,
+                               pipe_default_auth_level,
+                               cli->desthost,
+                               NULL, NULL,
+                               &cmd_entry->rpc_pipe);
+                       break;
+               default:
+                       DEBUG(0, ("Could not initialise %s. Invalid "
+                                 "auth type %u\n",
+                                 get_pipe_name_from_syntax(
+                                         talloc_tos(),
+                                         cmd_entry->interface),
+                                 pipe_default_auth_type ));
+                       return NT_STATUS_UNSUCCESSFUL;

                }
                if (!NT_STATUS_IS_OK(ntresult)) {
                        DEBUG(0, ("Could not initialise %s. Error was %s\n",
                }
                if (!NT_STATUS_IS_OK(ntresult)) {
                        DEBUG(0, ("Could not initialise %s. Error was %s\n",

-                                 get_pipe_name_from_iface(
-                                         cmd_entry->interface),
+                                 get_pipe_name_from_syntax(
+                                         talloc_tos(), cmd_entry->interface),

                                  nt_errstr(ntresult) ));
                        return ntresult;
                }
                                  nt_errstr(ntresult) ));
                        return ntresult;
                }


@@ -693,27 +761,30 @@ static NTSTATUS do_cmd(struct cli_state *cli,
                if (ndr_syntax_id_equal(cmd_entry->interface,
                                        &ndr_table_netlogon.syntax_id)) {
                        uint32_t neg_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS;
                if (ndr_syntax_id_equal(cmd_entry->interface,
                                        &ndr_table_netlogon.syntax_id)) {
                        uint32_t neg_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS;

-                       uint32 sec_channel_type;
+                       enum netr_SchannelType sec_channel_type;

                        uchar trust_password[16];
                        uchar trust_password[16];

-       
-                       if (!secrets_fetch_trust_account_password(lp_workgroup(),
-                                                       trust_password,
-                                                       NULL, &sec_channel_type)) {
-                               return NT_STATUS_UNSUCCESSFUL;
+                       const char *machine_account;
+
+                       if (!get_trust_pw_hash(get_cmdline_auth_info_domain(auth_info),
+                                              trust_password, &machine_account,
+                                              &sec_channel_type))
+                       {
+                               return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;

                        }
                        }

-               
+

                        ntresult = rpccli_netlogon_setup_creds(cmd_entry->rpc_pipe,
                                                cli->desthost,   /* server name */
                        ntresult = rpccli_netlogon_setup_creds(cmd_entry->rpc_pipe,
                                                cli->desthost,   /* server name */

-                                               lp_workgroup(),  /* domain */
+                                               get_cmdline_auth_info_domain(auth_info),  /* domain */

                                                global_myname(), /* client name */
                                                global_myname(), /* client name */

-                                               global_myname(), /* machine account name */
+                                               machine_account, /* machine account name */

                                                trust_password,
                                                sec_channel_type,
                                                &neg_flags);
 
                        if (!NT_STATUS_IS_OK(ntresult)) {
                                DEBUG(0, ("Could not initialise credentials for %s.\n",
                                                trust_password,
                                                sec_channel_type,
                                                &neg_flags);
 
                        if (!NT_STATUS_IS_OK(ntresult)) {
                                DEBUG(0, ("Could not initialise credentials for %s.\n",

-                                         get_pipe_name_from_iface(
+                                         get_pipe_name_from_syntax(
+                                                 talloc_tos(),

                                                  cmd_entry->interface)));
                                return ntresult;
                        }
                                                  cmd_entry->interface)));
                                return ntresult;
                        }


@@ -827,6 +898,7 @@ out_free:
        uint32_t flags = 0;
        struct dcerpc_binding *binding = NULL;
        const char *binding_string = NULL;
        uint32_t flags = 0;
        struct dcerpc_binding *binding = NULL;
        const char *binding_string = NULL;

+       char *user, *domain, *q;

 
        /* make sure the vars that get altered (4th field) are in
           a fixed location or certain compilers complain */
 
        /* make sure the vars that get altered (4th field) are in
           a fixed location or certain compilers complain */


@@ -850,7 +922,7 @@ out_free:
 
        /* the following functions are part of the Samba debugging
           facilities.  See lib/debug.c */
 
        /* the following functions are part of the Samba debugging
           facilities.  See lib/debug.c */

-       setup_logging("rpcclient", True);
+       setup_logging("rpcclient", DEBUG_STDOUT);

 
        rpcclient_auth_info = user_auth_info_init(frame);
        if (rpcclient_auth_info == NULL) {
 
        rpcclient_auth_info = user_auth_info_init(frame);
        if (rpcclient_auth_info == NULL) {


@@ -903,21 +975,13 @@ out_free:
                goto done;
        }
 
                goto done;
        }
 

-       /* save the workgroup...
-
-          FIXME!! do we need to do this for other options as well
-          (or maybe a generic way to keep lp_load() from overwriting
-          everything)?  */
-
-       fstrcpy( new_workgroup, lp_workgroup() );
-

        /* Load smb.conf file */
 
        if (!lp_load(get_dyn_CONFIGFILE(),True,False,False,True))
                fprintf(stderr, "Can't load %s\n", get_dyn_CONFIGFILE());
 
        if ( strlen(new_workgroup) != 0 )
        /* Load smb.conf file */
 
        if (!lp_load(get_dyn_CONFIGFILE(),True,False,False,True))
                fprintf(stderr, "Can't load %s\n", get_dyn_CONFIGFILE());
 
        if ( strlen(new_workgroup) != 0 )

-               set_global_myworkgroup( new_workgroup );
+               lp_set_cmdline("workgroup", new_workgroup );

 
        /*
         * Get password
 
        /*
         * Get password


@@ -959,21 +1023,74 @@ out_free:
                binding->transport = NCACN_NP;
        }
 
                binding->transport = NCACN_NP;
        }
 

+       if (binding->flags & DCERPC_SIGN) {
+               pipe_default_auth_level = DCERPC_AUTH_LEVEL_INTEGRITY;
+               pipe_default_auth_type = DCERPC_AUTH_TYPE_NTLMSSP;
+       }
+       if (binding->flags & DCERPC_SEAL) {
+               pipe_default_auth_level = DCERPC_AUTH_LEVEL_PRIVACY;
+               pipe_default_auth_type = DCERPC_AUTH_TYPE_NTLMSSP;
+       }
+       if (binding->flags & DCERPC_AUTH_SPNEGO) {
+               pipe_default_auth_type = DCERPC_AUTH_TYPE_SPNEGO;
+               pipe_default_auth_spnego_type = PIPE_AUTH_TYPE_SPNEGO_NTLMSSP;
+       }
+       if (binding->flags & DCERPC_AUTH_NTLM) {
+               /* If neither Integrity or Privacy are requested then
+                * Use just Connect level */
+               if (pipe_default_auth_level == DCERPC_AUTH_LEVEL_NONE) {
+                       pipe_default_auth_level = DCERPC_AUTH_LEVEL_CONNECT;
+               }
+
+               if (pipe_default_auth_type == DCERPC_AUTH_TYPE_SPNEGO) {
+                       pipe_default_auth_spnego_type = PIPE_AUTH_TYPE_SPNEGO_NTLMSSP;
+               } else {
+                       pipe_default_auth_type = DCERPC_AUTH_TYPE_NTLMSSP;
+               }
+       }
+       if (binding->flags & DCERPC_AUTH_KRB5) {
+               /* If neither Integrity or Privacy are requested then
+                * Use just Connect level */
+               if (pipe_default_auth_level == DCERPC_AUTH_LEVEL_NONE) {
+                       pipe_default_auth_level = DCERPC_AUTH_LEVEL_CONNECT;
+               }
+
+               if (pipe_default_auth_type == DCERPC_AUTH_TYPE_SPNEGO) {
+                       pipe_default_auth_spnego_type = PIPE_AUTH_TYPE_SPNEGO_KRB5;
+               } else {
+                       pipe_default_auth_type = DCERPC_AUTH_TYPE_KRB5;
+               }
+       }
+

        if (get_cmdline_auth_info_use_kerberos(rpcclient_auth_info)) {
                flags |= CLI_FULL_CONNECTION_USE_KERBEROS |
                         CLI_FULL_CONNECTION_FALLBACK_AFTER_KERBEROS;
        }
        if (get_cmdline_auth_info_use_kerberos(rpcclient_auth_info)) {
                flags |= CLI_FULL_CONNECTION_USE_KERBEROS |
                         CLI_FULL_CONNECTION_FALLBACK_AFTER_KERBEROS;
        }

+       if (get_cmdline_auth_info_use_ccache(rpcclient_auth_info)) {
+               flags |= CLI_FULL_CONNECTION_USE_CCACHE;
+       }
+
+       user = talloc_strdup(frame, get_cmdline_auth_info_username(rpcclient_auth_info));
+       SMB_ASSERT(user != NULL);
+       domain = talloc_strdup(frame, lp_workgroup());
+       SMB_ASSERT(domain != NULL);
+       set_cmdline_auth_info_domain(rpcclient_auth_info, domain);
+
+       if ((q = strchr_m(user,'\\'))) {
+               *q = 0;
+               set_cmdline_auth_info_domain(rpcclient_auth_info, user);
+               set_cmdline_auth_info_username(rpcclient_auth_info, q+1);
+       }

 
 
        nt_status = cli_full_connection(&cli, global_myname(), binding->host,
                                        opt_ipaddr ? &server_ss : NULL, opt_port,
                                        "IPC$", "IPC",
                                        get_cmdline_auth_info_username(rpcclient_auth_info),
 
 
        nt_status = cli_full_connection(&cli, global_myname(), binding->host,
                                        opt_ipaddr ? &server_ss : NULL, opt_port,
                                        "IPC$", "IPC",
                                        get_cmdline_auth_info_username(rpcclient_auth_info),

-                                       lp_workgroup(),
+                                       get_cmdline_auth_info_domain(rpcclient_auth_info),

                                        get_cmdline_auth_info_password(rpcclient_auth_info),
                                        flags,
                                        get_cmdline_auth_info_password(rpcclient_auth_info),
                                        flags,

-                                       get_cmdline_auth_info_signing_state(rpcclient_auth_info),
-                                       NULL);
+                                       get_cmdline_auth_info_signing_state(rpcclient_auth_info));

 
        if (!NT_STATUS_IS_OK(nt_status)) {
                DEBUG(0,("Cannot connect to server.  Error was %s\n", nt_errstr(nt_status)));
 
        if (!NT_STATUS_IS_OK(nt_status)) {
                DEBUG(0,("Cannot connect to server.  Error was %s\n", nt_errstr(nt_status)));


@@ -985,7 +1102,7 @@ out_free:
                nt_status = cli_cm_force_encryption(cli,
                                        get_cmdline_auth_info_username(rpcclient_auth_info),
                                        get_cmdline_auth_info_password(rpcclient_auth_info),
                nt_status = cli_cm_force_encryption(cli,
                                        get_cmdline_auth_info_username(rpcclient_auth_info),
                                        get_cmdline_auth_info_password(rpcclient_auth_info),

-                                       lp_workgroup(),
+                                       get_cmdline_auth_info_domain(rpcclient_auth_info),

                                        "IPC$");
                if (!NT_STATUS_IS_OK(nt_status)) {
                        result = 1;
                                        "IPC$");
                if (!NT_STATUS_IS_OK(nt_status)) {
                        result = 1;