Fix lsa_TrustedDomainInfo callers.

[ira/wip.git] / source3 / utils / net_rpc_join.c

diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c
index 8259ec46e66754ebc6f1f1e7cc3e312e4fe64acb..ea3bb10c226717dcb6dda0d904f20d91eba81564 100644 (file)
--- a/source3/utils/net_rpc_join.c
+++ b/source3/utils/net_rpc_join.c
@@ -46,7 +46,7 @@ NTSTATUS net_rpc_join_ok(const char *domain, const char *server,
 {
        enum security_types sec;
        unsigned int conn_flags = NET_FLAGS_PDC;
-       uint32 neg_flags = NETLOGON_NEG_SELECT_AUTH2_FLAGS|NETLOGON_NEG_SCHANNEL;
+       uint32_t neg_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS;
        struct cli_state *cli = NULL;
        struct rpc_pipe_client *pipe_hnd = NULL;
        struct rpc_pipe_client *netlogon_pipe = NULL;
@@ -133,7 +133,7 @@ int net_rpc_join_newstyle(int argc, const char **argv)
        struct cli_state *cli;
        TALLOC_CTX *mem_ctx;
         uint32 acb_info = ACB_WSTRUST;
-       uint32 neg_flags = NETLOGON_NEG_SELECT_AUTH2_FLAGS|(lp_client_schannel() ? NETLOGON_NEG_SCHANNEL : 0);
+       uint32_t neg_flags = NETLOGON_NEG_AUTH2_ADS_FLAGS;
        uint32 sec_channel_type;
        struct rpc_pipe_client *pipe_hnd = NULL;
 
@@ -485,7 +485,7 @@ int net_rpc_testjoin(int argc, const char **argv)
        nt_status = net_rpc_join_ok(domain, NULL, NULL);
        if (!NT_STATUS_IS_OK(nt_status)) {
                fprintf(stderr,"Join to domain '%s' is not valid: %s\n",
-                       nt_errstr(nt_status), domain);
+                       domain, nt_errstr(nt_status));
                free(domain);
                return -1;
        }