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

[samba.git] / source3 / lib / netapi / joindomain.c

diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index d15e2e733c25f901d55205ae1ea18e5c56b62a3f..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,7 +102,6 @@ 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;
@@ -107,7 +110,6 @@ WERROR NetJoinDomain_r(struct libnetapi_ctx *ctx,
 
        werr = libnetapi_open_pipe(ctx, r->in.server,
                                   &ndr_table_wkssvc.syntax_id,
-                                  &cli,
                                   &pipe_cli);
        if (!W_ERROR_IS_OK(werr)) {
                goto done;
@@ -116,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,
@@ -136,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;
@@ -207,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;
 
@@ -227,7 +228,6 @@ 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;
@@ -236,7 +236,6 @@ WERROR NetUnjoinDomain_r(struct libnetapi_ctx *ctx,
 
        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;
@@ -245,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,
@@ -263,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;
@@ -278,7 +275,6 @@ 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;
@@ -286,7 +282,6 @@ WERROR NetGetJoinInformation_r(struct libnetapi_ctx *ctx,
 
        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;
@@ -410,7 +405,6 @@ 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;
@@ -418,7 +412,6 @@ WERROR NetGetJoinableOUs_r(struct libnetapi_ctx *ctx,
 
        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;
@@ -427,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);
        }
 
@@ -454,7 +447,6 @@ 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;
@@ -462,7 +454,6 @@ WERROR NetRenameMachineInDomain_r(struct libnetapi_ctx *ctx,
 
        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;
@@ -471,7 +462,7 @@ WERROR NetRenameMachineInDomain_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);
        }