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 d678029c466cdff2bf2b27cc1a4d1a862eca9ba8..ea3bb10c226717dcb6dda0d904f20d91eba81564 100644 (file)
--- a/source3/utils/net_rpc_join.c
+++ b/source3/utils/net_rpc_join.c
@@ -3,6 +3,7 @@
    Distributed SMB/CIFS Server Management Utility 
    Copyright (C) 2001 Andrew Bartlett (abartlet@samba.org)
    Copyright (C) Tim Potter     2001
+   Copyright (C) 2008 Guenther Deschner
 
    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
@@ -34,12 +35,6 @@
                 goto done; \
         }
 
-static void init_lsa_String(struct lsa_String *name, const char *s)
-{
-       name->string = s;
-}
-
-
 /**
  * confirm that a domain join is still valid
  *
@@ -51,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;
@@ -138,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;
 
@@ -152,23 +147,21 @@ int net_rpc_join_newstyle(int argc, const char **argv)
 
        char *clear_trust_password = NULL;
        uchar pwbuf[516];
-       SAM_USERINFO_CTR ctr;
-       SAM_USER_INFO_24 p24;
-       SAM_USER_INFO_16 p16;
        uchar md4_trust_password[16];
+       union samr_UserInfo set_info;
 
        /* Misc */
 
        NTSTATUS result;
        int retval = 1;
        const char *domain = NULL;
-       uint32 num_rids, *name_types, *user_rids;
-       uint32 flags = 0x3e8;
        char *acct_name;
-       const char *const_acct_name;
        struct lsa_String lsa_acct_name;
        uint32 acct_flags=0;
        uint32_t access_granted = 0;
+       union lsa_PolicyInformation *info = NULL;
+       struct samr_Ids user_rids;
+       struct samr_Ids name_types;
 
        /* check what type of join */
        if (argc >= 0) {
@@ -218,10 +211,15 @@ int net_rpc_join_newstyle(int argc, const char **argv)
                                          &lsa_pol),
                      "error opening lsa policy handle");
 
-       CHECK_RPC_ERR(rpccli_lsa_query_info_policy(pipe_hnd, mem_ctx, &lsa_pol,
-                                               5, &domain, &domain_sid),
+       CHECK_RPC_ERR(rpccli_lsa_QueryInfoPolicy(pipe_hnd, mem_ctx,
+                                                &lsa_pol,
+                                                LSA_POLICY_INFO_ACCOUNT_DOMAIN,
+                                                &info),
                      "error querying info policy");
 
+       domain = info->account_domain.name.string;
+       domain_sid = info->account_domain.sid;
+
        rpccli_lsa_Close(pipe_hnd, mem_ctx, &lsa_pol);
        cli_rpc_pipe_close(pipe_hnd); /* Done with this pipe */
 
@@ -259,7 +257,6 @@ int net_rpc_join_newstyle(int argc, const char **argv)
                goto done;
        }
        strlower_m(acct_name);
-       const_acct_name = acct_name;
 
        init_lsa_String(&lsa_acct_name, acct_name);
 
@@ -300,21 +297,22 @@ int net_rpc_join_newstyle(int argc, const char **argv)
                rpccli_samr_Close(pipe_hnd, mem_ctx, &user_pol);
        }
 
-       CHECK_RPC_ERR_DEBUG(rpccli_samr_lookup_names(pipe_hnd, mem_ctx,
-                                                 &domain_pol, flags,
-                                                 1, &const_acct_name, 
-                                                 &num_rids,
-                                                 &user_rids, &name_types),
+       CHECK_RPC_ERR_DEBUG(rpccli_samr_LookupNames(pipe_hnd, mem_ctx,
+                                                   &domain_pol,
+                                                   1,
+                                                   &lsa_acct_name,
+                                                   &user_rids,
+                                                   &name_types),
                            ("error looking up rid for user %s: %s\n",
                             acct_name, nt_errstr(result)));
 
-       if (name_types[0] != SID_NAME_USER) {
-               DEBUG(0, ("%s is not a user account (type=%d)\n", acct_name, name_types[0]));
+       if (name_types.ids[0] != SID_NAME_USER) {
+               DEBUG(0, ("%s is not a user account (type=%d)\n", acct_name, name_types.ids[0]));
                goto done;
        }
 
-       user_rid = user_rids[0];
-               
+       user_rid = user_rids.ids[0];
+
        /* Open handle on user */
 
        CHECK_RPC_ERR_DEBUG(
@@ -339,16 +337,15 @@ int net_rpc_join_newstyle(int argc, const char **argv)
 
        /* Set password on machine account */
 
-       ZERO_STRUCT(ctr);
-       ZERO_STRUCT(p24);
-
-       init_sam_user_info24(&p24, (char *)pwbuf,24);
+       init_samr_user_info24(&set_info.info24, pwbuf, 24);
 
-       ctr.switch_value = 24;
-       ctr.info.id24 = &p24;
+       SamOEMhashBlob(set_info.info24.password.data, 516,
+                      &cli->user_session_key);
 
-       CHECK_RPC_ERR(rpccli_samr_set_userinfo(pipe_hnd, mem_ctx, &user_pol, 24, 
-                                           &cli->user_session_key, &ctr),
+       CHECK_RPC_ERR(rpccli_samr_SetUserInfo2(pipe_hnd, mem_ctx,
+                                              &user_pol,
+                                              24,
+                                              &set_info),
                      "error setting trust account password");
 
        /* Why do we have to try to (re-)set the ACB to be the same as what
@@ -360,17 +357,15 @@ int net_rpc_join_newstyle(int argc, const char **argv)
           seems to cope with either value so don't bomb out if the set
           userinfo2 level 0x10 fails.  -tpot */
 
-       ZERO_STRUCT(ctr);
-       ctr.switch_value = 16;
-       ctr.info.id16 = &p16;
-
-       init_sam_user_info16(&p16, acb_info);
+       set_info.info16.acct_flags = acb_info;
 
        /* Ignoring the return value is necessary for joining a domain
           as a normal user with "Add workstation to domain" privilege. */
 
-       result = rpccli_samr_set_userinfo2(pipe_hnd, mem_ctx, &user_pol, 16, 
-                                       &cli->user_session_key, &ctr);
+       result = rpccli_samr_SetUserInfo(pipe_hnd, mem_ctx,
+                                        &user_pol,
+                                        16,
+                                        &set_info);
 
        rpccli_samr_Close(pipe_hnd, mem_ctx, &user_pol);
        cli_rpc_pipe_close(pipe_hnd); /* Done with this pipe */
@@ -490,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;
        }