s3-secrets: only include secrets.h when needed.

[nivanova/samba-autobuild/.git] / source3 / lib / netapi / joindomain.c

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index a33e0eeee56f30f79b3219097aa6c3061c547494..13a06c7136c97b7d8637802648c88195f73d0809 100644 (file)
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -18,12 +18,16 @@
  */
 
 #include "includes.h"
-
+#include "ads.h"
 #include "librpc/gen_ndr/libnetapi.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 "libcli/auth/libcli_auth.h"
+#include "../librpc/gen_ndr/cli_wkssvc.h"
+#include "secrets.h"
 
 /****************************************************************
 ****************************************************************/
@@ -98,19 +102,15 @@ 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;
 
-       werr = libnetapi_open_ipc_connection(ctx, r->in.server, &cli);
-       if (!W_ERROR_IS_OK(werr)) {
-               goto done;
-       }
-
-       werr = libnetapi_open_pipe(ctx, cli, PI_WKSSVC, &pipe_cli);
+       werr = libnetapi_open_pipe(ctx, r->in.server,
+                                  &ndr_table_wkssvc.syntax_id,
+                                  &pipe_cli);
        if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }
@@ -118,11 +118,11 @@ WERROR NetJoinDomain_r(struct libnetapi_ctx *ctx,
        if (r->in.password) {
                encode_wkssvc_join_password_buffer(ctx,
                                                   r->in.password,
-                                                  &cli->user_session_key,
+                                                  &pipe_cli->auth->user_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,
                                               r->in.server,
@@ -138,10 +138,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;
@@ -209,6 +207,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;
 
@@ -229,19 +228,15 @@ 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;
 
-       werr = libnetapi_open_ipc_connection(ctx, r->in.server_name, &cli);
-       if (!W_ERROR_IS_OK(werr)) {
-               goto done;
-       }
-
-       werr = libnetapi_open_pipe(ctx, cli, PI_WKSSVC, &pipe_cli);
+       werr = libnetapi_open_pipe(ctx, r->in.server_name,
+                                  &ndr_table_wkssvc.syntax_id,
+                                  &pipe_cli);
        if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }
@@ -249,11 +244,11 @@ WERROR NetUnjoinDomain_r(struct libnetapi_ctx *ctx,
        if (r->in.password) {
                encode_wkssvc_join_password_buffer(ctx,
                                                   r->in.password,
-                                                  &cli->user_session_key,
+                                                  &pipe_cli->auth->user_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,
                                                 r->in.server_name,
@@ -267,10 +262,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;
@@ -282,18 +275,14 @@ 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;
 
-       werr = libnetapi_open_ipc_connection(ctx, r->in.server_name, &cli);
-       if (!W_ERROR_IS_OK(werr)) {
-               goto done;
-       }
-
-       werr = libnetapi_open_pipe(ctx, cli, PI_WKSSVC, &pipe_cli);
+       werr = libnetapi_open_pipe(ctx, r->in.server_name,
+                                  &ndr_table_wkssvc.syntax_id,
+                                  &pipe_cli);
        if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }
@@ -370,7 +359,7 @@ WERROR NetGetJoinableOUs_l(struct libnetapi_ctx *ctx,
 
        dc = strip_hostname(info->dc_unc);
 
-       ads = ads_init(r->in.domain, r->in.domain, dc);
+       ads = ads_init(info->domain_name, info->domain_name, dc);
        if (!ads) {
                return WERR_GENERAL_FAILURE;
        }
@@ -416,18 +405,14 @@ 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;
 
-       werr = libnetapi_open_ipc_connection(ctx, r->in.server_name, &cli);
-       if (!W_ERROR_IS_OK(werr)) {
-               goto done;
-       }
-
-       werr = libnetapi_open_pipe(ctx, cli, PI_WKSSVC, &pipe_cli);
+       werr = libnetapi_open_pipe(ctx, r->in.server_name,
+                                  &ndr_table_wkssvc.syntax_id,
+                                  &pipe_cli);
        if (!W_ERROR_IS_OK(werr)) {
                goto done;
        }
@@ -435,7 +420,7 @@ WERROR NetGetJoinableOUs_r(struct libnetapi_ctx *ctx,
        if (r->in.password) {
                encode_wkssvc_join_password_buffer(ctx,
                                                   r->in.password,
-                                                  &cli->user_session_key,
+                                                  &pipe_cli->auth->user_session_key,
                                                   &encrypted_password);
        }
 
@@ -453,9 +438,55 @@ WERROR NetGetJoinableOUs_r(struct libnetapi_ctx *ctx,
        }
 
  done:
-       if (cli) {
-               cli_shutdown(cli);
+       return werr;
+}
+
+/****************************************************************
+****************************************************************/
+
+WERROR NetRenameMachineInDomain_r(struct libnetapi_ctx *ctx,
+                                 struct NetRenameMachineInDomain *r)
+{
+       struct rpc_pipe_client *pipe_cli = NULL;
+       struct wkssvc_PasswordBuffer *encrypted_password = NULL;
+       NTSTATUS status;
+       WERROR werr;
+
+       werr = libnetapi_open_pipe(ctx, r->in.server_name,
+                                  &ndr_table_wkssvc.syntax_id,
+                                  &pipe_cli);
+       if (!W_ERROR_IS_OK(werr)) {
+               goto done;
+       }
+
+       if (r->in.password) {
+               encode_wkssvc_join_password_buffer(ctx,
+                                                  r->in.password,
+                                                  &pipe_cli->auth->user_session_key,
+                                                  &encrypted_password);
        }
 
+       status = rpccli_wkssvc_NetrRenameMachineInDomain2(pipe_cli, ctx,
+                                                         r->in.server_name,
+                                                         r->in.new_machine_name,
+                                                         r->in.account,
+                                                         encrypted_password,
+                                                         r->in.rename_options,
+                                                         &werr);
+       if (!NT_STATUS_IS_OK(status)) {
+               werr = ntstatus_to_werror(status);
+               goto done;
+       }
+
+ done:
        return werr;
 }
+
+/****************************************************************
+****************************************************************/
+
+WERROR NetRenameMachineInDomain_l(struct libnetapi_ctx *ctx,
+                                 struct NetRenameMachineInDomain *r)
+{
+       LIBNETAPI_REDIRECT_TO_LOCALHOST(ctx, r, NetRenameMachineInDomain);
+}