git.samba.org / ira / wip.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
s3: piddir creation fix part 2.
[ira/wip.git] / source3 / lib / netapi / joindomain.c
diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index d15e2e733c25f901d55205ae1ea18e5c56b62a3f..b6fb57ae0260496c03fae33c79ad781138b376d0 100644 (file)
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -18,12 +18,17 @@
  */
 
 #include "includes.h"
-
+#include "ads.h"
 #include "librpc/gen_ndr/libnetapi.h"
+#include "libcli/auth/libcli_auth.h"
 #include "lib/netapi/netapi.h"
 #include "lib/netapi/netapi_private.h"
 #include "lib/netapi/libnetapi.h"
-#include "libnet/libnet.h"
+#include "librpc/gen_ndr/libnet_join.h"
+#include "libnet/libnet_join.h"
+#include "../librpc/gen_ndr/ndr_wkssvc_c.h"
+#include "rpc_client/cli_pipe.h"
+#include "secrets.h"
 
 /****************************************************************
 ****************************************************************/
@@ -32,8 +37,12 @@ WERROR NetJoinDomain_l(struct libnetapi_ctx *mem_ctx,
                       struct NetJoinDomain *r)
 {
        struct libnet_JoinCtx *j = NULL;
+       struct libnetapi_private_ctx *priv;
        WERROR werr;
 
+       priv = talloc_get_type_abort(mem_ctx->private_data,
+               struct libnetapi_private_ctx);
+
        if (!r->in.domain) {
                return WERR_INVALID_PARAM;
        }
@@ -51,7 +60,7 @@ WERROR NetJoinDomain_l(struct libnetapi_ctx *mem_ctx,
                uint32_t flags = DS_DIRECTORY_SERVICE_REQUIRED |
                                 DS_WRITABLE_REQUIRED |
                                 DS_RETURN_DNS_NAME;
-               status = dsgetdcname(mem_ctx, NULL, r->in.domain,
+               status = dsgetdcname(mem_ctx, priv->msg_ctx, r->in.domain,
                                     NULL, NULL, flags, &info);
                if (!NT_STATUS_IS_OK(status)) {
                        libnetapi_set_error_string(mem_ctx,
@@ -98,31 +107,40 @@ WERROR NetJoinDomain_l(struct libnetapi_ctx *mem_ctx,
 WERROR NetJoinDomain_r(struct libnetapi_ctx *ctx,
                       struct NetJoinDomain *r)
 {
-       struct cli_state *cli = NULL;
        struct rpc_pipe_client *pipe_cli = NULL;
        struct wkssvc_PasswordBuffer *encrypted_password = NULL;
        NTSTATUS status;
        WERROR werr;
        unsigned int old_timeout = 0;
+       struct dcerpc_binding_handle *b;
+       DATA_BLOB session_key;
 
        werr = libnetapi_open_pipe(ctx, r->in.server,
                                   &ndr_table_wkssvc.syntax_id,
-                                  &cli,
                                   &pipe_cli);
        if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }
 
+       b = pipe_cli->binding_handle;
+
        if (r->in.password) {
+
+               status = cli_get_session_key(talloc_tos(), pipe_cli, &session_key);
+               if (!NT_STATUS_IS_OK(status)) {
+                       werr = ntstatus_to_werror(status);
+                       goto done;
+               }
+
                encode_wkssvc_join_password_buffer(ctx,
                                                   r->in.password,
-                                                  &cli->user_session_key,
+                                                  &session_key,
                                                   &encrypted_password);
        }
 
-       old_timeout = cli_set_timeout(cli, 600000);
+       old_timeout = rpccli_set_timeout(pipe_cli, 600000);
 
-       status = rpccli_wkssvc_NetrJoinDomain2(pipe_cli, ctx,
+       status = dcerpc_wkssvc_NetrJoinDomain2(b, talloc_tos(),
                                               r->in.server,
                                               r->in.domain,
                                               r->in.account_ou,
@@ -136,10 +154,8 @@ WERROR NetJoinDomain_r(struct libnetapi_ctx *ctx,
        }
 
  done:
-       if (cli) {
-               if (old_timeout) {
-                       cli_set_timeout(cli, old_timeout);
-               }
+       if (pipe_cli && old_timeout) {
+               rpccli_set_timeout(pipe_cli, old_timeout);
        }
 
        return werr;
@@ -154,6 +170,10 @@ WERROR NetUnjoinDomain_l(struct libnetapi_ctx *mem_ctx,
        struct dom_sid domain_sid;
        const char *domain = NULL;
        WERROR werr;
+       struct libnetapi_private_ctx *priv;
+
+       priv = talloc_get_type_abort(mem_ctx->private_data,
+               struct libnetapi_private_ctx);
 
        if (!secrets_fetch_domain_sid(lp_workgroup(), &domain_sid)) {
                return WERR_SETUP_NOT_JOINED;
@@ -178,7 +198,7 @@ WERROR NetUnjoinDomain_l(struct libnetapi_ctx *mem_ctx,
                uint32_t flags = DS_DIRECTORY_SERVICE_REQUIRED |
                                 DS_WRITABLE_REQUIRED |
                                 DS_RETURN_DNS_NAME;
-               status = dsgetdcname(mem_ctx, NULL, domain,
+               status = dsgetdcname(mem_ctx, priv->msg_ctx, domain,
                                     NULL, NULL, flags, &info);
                if (!NT_STATUS_IS_OK(status)) {
                        libnetapi_set_error_string(mem_ctx,
@@ -207,6 +227,7 @@ WERROR NetUnjoinDomain_l(struct libnetapi_ctx *mem_ctx,
 
        u->in.domain_name = domain;
        u->in.unjoin_flags = r->in.unjoin_flags;
+       u->in.delete_machine_account = false;
        u->in.modify_config = true;
        u->in.debug = true;
 
@@ -227,31 +248,40 @@ WERROR NetUnjoinDomain_l(struct libnetapi_ctx *mem_ctx,
 WERROR NetUnjoinDomain_r(struct libnetapi_ctx *ctx,
                         struct NetUnjoinDomain *r)
 {
-       struct cli_state *cli = NULL;
        struct rpc_pipe_client *pipe_cli = NULL;
        struct wkssvc_PasswordBuffer *encrypted_password = NULL;
        NTSTATUS status;
        WERROR werr;
        unsigned int old_timeout = 0;
+       struct dcerpc_binding_handle *b;
+       DATA_BLOB session_key;
 
        werr = libnetapi_open_pipe(ctx, r->in.server_name,
                                   &ndr_table_wkssvc.syntax_id,
-                                  &cli,
                                   &pipe_cli);
        if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }
 
+       b = pipe_cli->binding_handle;
+
        if (r->in.password) {
+
+               status = cli_get_session_key(talloc_tos(), pipe_cli, &session_key);
+               if (!NT_STATUS_IS_OK(status)) {
+                       werr = ntstatus_to_werror(status);
+                       goto done;
+               }
+
                encode_wkssvc_join_password_buffer(ctx,
                                                   r->in.password,
-                                                  &cli->user_session_key,
+                                                  &session_key,
                                                   &encrypted_password);
        }
 
-       old_timeout = cli_set_timeout(cli, 60000);
+       old_timeout = rpccli_set_timeout(pipe_cli, 60000);
 
-       status = rpccli_wkssvc_NetrUnjoinDomain2(pipe_cli, ctx,
+       status = dcerpc_wkssvc_NetrUnjoinDomain2(b, talloc_tos(),
                                                 r->in.server_name,
                                                 r->in.account,
                                                 encrypted_password,
@@ -263,10 +293,8 @@ WERROR NetUnjoinDomain_r(struct libnetapi_ctx *ctx,
        }
 
  done:
-       if (cli) {
-               if (old_timeout) {
-                       cli_set_timeout(cli, old_timeout);
-               }
+       if (pipe_cli && old_timeout) {
+               rpccli_set_timeout(pipe_cli, old_timeout);
        }
 
        return werr;
@@ -278,21 +306,22 @@ WERROR NetUnjoinDomain_r(struct libnetapi_ctx *ctx,
 WERROR NetGetJoinInformation_r(struct libnetapi_ctx *ctx,
                               struct NetGetJoinInformation *r)
 {
-       struct cli_state *cli = NULL;
        struct rpc_pipe_client *pipe_cli = NULL;
        NTSTATUS status;
        WERROR werr;
        const char *buffer = NULL;
+       struct dcerpc_binding_handle *b;
 
        werr = libnetapi_open_pipe(ctx, r->in.server_name,
                                   &ndr_table_wkssvc.syntax_id,
-                                  &cli,
                                   &pipe_cli);
        if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }
 
-       status = rpccli_wkssvc_NetrGetJoinInformation(pipe_cli, ctx,
+       b = pipe_cli->binding_handle;
+
+       status = dcerpc_wkssvc_NetrGetJoinInformation(b, talloc_tos(),
                                                      r->in.server_name,
                                                      &buffer,
                                                      (enum wkssvc_NetJoinStatus *)r->out.name_type,
@@ -302,6 +331,10 @@ WERROR NetGetJoinInformation_r(struct libnetapi_ctx *ctx,
                goto done;
        }
 
+       if (!W_ERROR_IS_OK(werr)) {
+               goto done;
+       }
+
        *r->out.name_buffer = talloc_strdup(ctx, buffer);
        W_ERROR_HAVE_NO_MEMORY(*r->out.name_buffer);
 
@@ -345,7 +378,7 @@ WERROR NetGetJoinInformation_l(struct libnetapi_ctx *ctx,
 WERROR NetGetJoinableOUs_l(struct libnetapi_ctx *ctx,
                           struct NetGetJoinableOUs *r)
 {
-#ifdef WITH_ADS
+#ifdef HAVE_ADS
        NTSTATUS status;
        ADS_STATUS ads_status;
        ADS_STRUCT *ads = NULL;
@@ -353,8 +386,12 @@ WERROR NetGetJoinableOUs_l(struct libnetapi_ctx *ctx,
        const char *dc = NULL;
        uint32_t flags = DS_DIRECTORY_SERVICE_REQUIRED |
                         DS_RETURN_DNS_NAME;
+       struct libnetapi_private_ctx *priv;
 
-       status = dsgetdcname(ctx, NULL, r->in.domain,
+       priv = talloc_get_type_abort(ctx->private_data,
+               struct libnetapi_private_ctx);
+
+       status = dsgetdcname(ctx, priv->msg_ctx, r->in.domain,
                             NULL, NULL, flags, &info);
        if (!NT_STATUS_IS_OK(status)) {
                libnetapi_set_error_string(ctx, "%s",
@@ -410,28 +447,37 @@ WERROR NetGetJoinableOUs_l(struct libnetapi_ctx *ctx,
 WERROR NetGetJoinableOUs_r(struct libnetapi_ctx *ctx,
                           struct NetGetJoinableOUs *r)
 {
-       struct cli_state *cli = NULL;
        struct rpc_pipe_client *pipe_cli = NULL;
        struct wkssvc_PasswordBuffer *encrypted_password = NULL;
        NTSTATUS status;
        WERROR werr;
+       struct dcerpc_binding_handle *b;
+       DATA_BLOB session_key;
 
        werr = libnetapi_open_pipe(ctx, r->in.server_name,
                                   &ndr_table_wkssvc.syntax_id,
-                                  &cli,
                                   &pipe_cli);
        if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }
 
+       b = pipe_cli->binding_handle;
+
        if (r->in.password) {
+
+               status = cli_get_session_key(talloc_tos(), pipe_cli, &session_key);
+               if (!NT_STATUS_IS_OK(status)) {
+                       werr = ntstatus_to_werror(status);
+                       goto done;
+               }
+
                encode_wkssvc_join_password_buffer(ctx,
                                                   r->in.password,
-                                                  &cli->user_session_key,
+                                                  &session_key,
                                                   &encrypted_password);
        }
 
-       status = rpccli_wkssvc_NetrGetJoinableOus2(pipe_cli, ctx,
+       status = dcerpc_wkssvc_NetrGetJoinableOus2(b, talloc_tos(),
                                                   r->in.server_name,
                                                   r->in.domain,
                                                   r->in.account,
@@ -454,28 +500,37 @@ WERROR NetGetJoinableOUs_r(struct libnetapi_ctx *ctx,
 WERROR NetRenameMachineInDomain_r(struct libnetapi_ctx *ctx,
                                  struct NetRenameMachineInDomain *r)
 {
-       struct cli_state *cli = NULL;
        struct rpc_pipe_client *pipe_cli = NULL;
        struct wkssvc_PasswordBuffer *encrypted_password = NULL;
        NTSTATUS status;
        WERROR werr;
+       struct dcerpc_binding_handle *b;
+       DATA_BLOB session_key;
 
        werr = libnetapi_open_pipe(ctx, r->in.server_name,
                                   &ndr_table_wkssvc.syntax_id,
-                                  &cli,
                                   &pipe_cli);
        if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }
 
+       b = pipe_cli->binding_handle;
+
        if (r->in.password) {
+
+               status = cli_get_session_key(talloc_tos(), pipe_cli, &session_key);
+               if (!NT_STATUS_IS_OK(status)) {
+                       werr = ntstatus_to_werror(status);
+                       goto done;
+               }
+
                encode_wkssvc_join_password_buffer(ctx,
                                                   r->in.password,
-                                                  &cli->user_session_key,
+                                                  &session_key,
                                                   &encrypted_password);
        }
 
-       status = rpccli_wkssvc_NetrRenameMachineInDomain2(pipe_cli, ctx,
+       status = dcerpc_wkssvc_NetrRenameMachineInDomain2(b, talloc_tos(),
                                                          r->in.server_name,
                                                          r->in.new_machine_name,
                                                          r->in.account,
Unnamed repository; edit this file 'description' to name the repository.