git.samba.org / jra / samba / .git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Use rpccli_samr_Connect2() all over the place.
[jra/samba/.git] / source3 / libnet / libnet_join.c
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 538cca7994c283f37f068da9dbe3a5078dc1ded5..f855a57f32927b8f7aee585350218194cf15174e 100644 (file)
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -50,6 +50,11 @@
 #define LIBNET_UNJOIN_OUT_DUMP_CTX(ctx, r) \
        LIBNET_UNJOIN_DUMP_CTX(ctx, r, NDR_OUT)
 
+static void init_lsa_String(struct lsa_String *name, const char *s)
+{
+       name->string = s;
+}
+
 /****************************************************************
 ****************************************************************/
 
@@ -591,6 +596,7 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
        NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
        char *acct_name;
        const char *const_acct_name;
+       struct lsa_String lsa_acct_name;
        uint32 user_rid;
        uint32 num_rids, *name_types, *user_rids;
        uint32 flags = 0x3e8;
@@ -665,16 +671,19 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
                goto done;
        }
 
-       status = rpccli_samr_connect(pipe_hnd, mem_ctx,
-                                    SEC_RIGHTS_MAXIMUM_ALLOWED, &sam_pol);
+       status = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                     pipe_hnd->cli->desthost,
+                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                     &sam_pol);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
 
-       status = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &sam_pol,
-                                        SEC_RIGHTS_MAXIMUM_ALLOWED,
-                                        r->out.domain_sid,
-                                        &domain_pol);
+       status = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       &sam_pol,
+                                       SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                       r->out.domain_sid,
+                                       &domain_pol);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
@@ -683,17 +692,25 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
        strlower_m(acct_name);
        const_acct_name = acct_name;
 
+       init_lsa_String(&lsa_acct_name, acct_name);
+
        if (r->in.join_flags & WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE) {
-               uint32 acct_flags = SAMR_GENERIC_READ | SAMR_GENERIC_WRITE |
-                       SAMR_GENERIC_EXECUTE | SAMR_STANDARD_WRITEDAC |
-                       SAMR_STANDARD_DELETE | SAMR_USER_SETPASS |
-                       SAMR_USER_GETATTR | SAMR_USER_SETATTR;
-
-               status = rpccli_samr_create_dom_user(pipe_hnd, mem_ctx,
-                                                    &domain_pol,
-                                                    acct_name, ACB_WSTRUST,
-                                                    acct_flags, &user_pol,
-                                                    &user_rid);
+               uint32_t acct_flags =
+                       SEC_GENERIC_READ | SEC_GENERIC_WRITE | SEC_GENERIC_EXECUTE |
+                       SEC_STD_WRITE_DAC | SEC_STD_DELETE |
+                       SAMR_USER_ACCESS_SET_PASSWORD |
+                       SAMR_USER_ACCESS_GET_ATTRIBUTES |
+                       SAMR_USER_ACCESS_SET_ATTRIBUTES;
+               uint32_t access_granted = 0;
+
+               status = rpccli_samr_CreateUser2(pipe_hnd, mem_ctx,
+                                                &domain_pol,
+                                                &lsa_acct_name,
+                                                ACB_WSTRUST,
+                                                acct_flags,
+                                                &user_pol,
+                                                &access_granted,
+                                                &user_rid);
                if (NT_STATUS_EQUAL(status, NT_STATUS_USER_EXISTS)) {
                        if (!(r->in.join_flags &
                              WKSSVC_JOIN_FLAGS_DOMAIN_JOIN_IF_JOINED)) {
@@ -702,7 +719,7 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
                }
 
                if (NT_STATUS_IS_OK(status)) {
-                       rpccli_samr_close(pipe_hnd, mem_ctx, &user_pol);
+                       rpccli_samr_Close(pipe_hnd, mem_ctx, &user_pol);
                }
        }
 
@@ -721,9 +738,11 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
 
        user_rid = user_rids[0];
 
-       status = rpccli_samr_open_user(pipe_hnd, mem_ctx, &domain_pol,
-                                      SEC_RIGHTS_MAXIMUM_ALLOWED, user_rid,
-                                      &user_pol);
+       status = rpccli_samr_OpenUser(pipe_hnd, mem_ctx,
+                                     &domain_pol,
+                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                     user_rid,
+                                     &user_pol);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
@@ -767,7 +786,7 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
                goto done;
        }
 
-       rpccli_samr_close(pipe_hnd, mem_ctx, &user_pol);
+       rpccli_samr_Close(pipe_hnd, mem_ctx, &user_pol);
        cli_rpc_pipe_close(pipe_hnd);
 
        status = NT_STATUS_OK;
@@ -832,16 +851,19 @@ static NTSTATUS libnet_join_unjoindomain_rpc(TALLOC_CTX *mem_ctx,
                goto done;
        }
 
-       status = rpccli_samr_connect(pipe_hnd, mem_ctx,
-                                    SEC_RIGHTS_MAXIMUM_ALLOWED, &sam_pol);
+       status = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+                                     pipe_hnd->cli->desthost,
+                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                     &sam_pol);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
 
-       status = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &sam_pol,
-                                        SEC_RIGHTS_MAXIMUM_ALLOWED,
-                                        r->in.domain_sid,
-                                        &domain_pol);
+       status = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       &sam_pol,
+                                       SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                       r->in.domain_sid,
+                                       &domain_pol);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
@@ -865,9 +887,11 @@ static NTSTATUS libnet_join_unjoindomain_rpc(TALLOC_CTX *mem_ctx,
 
        user_rid = user_rids[0];
 
-       status = rpccli_samr_open_user(pipe_hnd, mem_ctx, &domain_pol,
-                                      SEC_RIGHTS_MAXIMUM_ALLOWED,
-                                      user_rid, &user_pol);
+       status = rpccli_samr_OpenUser(pipe_hnd, mem_ctx,
+                                     &domain_pol,
+                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                     user_rid,
+                                     &user_pol);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
@@ -875,7 +899,7 @@ static NTSTATUS libnet_join_unjoindomain_rpc(TALLOC_CTX *mem_ctx,
        status = rpccli_samr_query_userinfo(pipe_hnd, mem_ctx,
                                            &user_pol, 16, &qctr);
        if (!NT_STATUS_IS_OK(status)) {
-               rpccli_samr_close(pipe_hnd, mem_ctx, &user_pol);
+               rpccli_samr_Close(pipe_hnd, mem_ctx, &user_pol);
                goto done;
        }
 
@@ -888,12 +912,12 @@ static NTSTATUS libnet_join_unjoindomain_rpc(TALLOC_CTX *mem_ctx,
        status = rpccli_samr_set_userinfo2(pipe_hnd, mem_ctx, &user_pol, 16,
                                           &cli->user_session_key, &ctr);
 
-       rpccli_samr_close(pipe_hnd, mem_ctx, &user_pol);
+       rpccli_samr_Close(pipe_hnd, mem_ctx, &user_pol);
 
 done:
        if (pipe_hnd) {
-               rpccli_samr_close(pipe_hnd, mem_ctx, &domain_pol);
-               rpccli_samr_close(pipe_hnd, mem_ctx, &sam_pol);
+               rpccli_samr_Close(pipe_hnd, mem_ctx, &domain_pol);
+               rpccli_samr_Close(pipe_hnd, mem_ctx, &sam_pol);
                cli_rpc_pipe_close(pipe_hnd);
        }
 
@@ -1171,7 +1195,6 @@ static WERROR libnet_DomainJoin(TALLOC_CTX *mem_ctx,
        if (!r->in.dc_name) {
                struct DS_DOMAIN_CONTROLLER_INFO *info;
                status = dsgetdcname(mem_ctx,
-                                    NULL,
                                     r->in.domain_name,
                                     NULL,
                                     NULL,
@@ -1299,7 +1322,6 @@ static WERROR libnet_DomainUnjoin(TALLOC_CTX *mem_ctx,
        if (!r->in.dc_name) {
                struct DS_DOMAIN_CONTROLLER_INFO *info;
                status = dsgetdcname(mem_ctx,
-                                    NULL,
                                     r->in.domain_name,
                                     NULL,
                                     NULL,
Experimental branches for jra