netapi: use private samr structure in libnetapi_samr_open_domain().

Guenther

diff --git a/source/lib/netapi/netapi_private.h b/source/lib/netapi/netapi_private.h
index db4eb6f0a3e94d3a433d23a4851ef395432e3f31..246672a3491c351dad8c73eed11ff2c5585a2e95 100644 (file)
--- a/source/lib/netapi/netapi_private.h
+++ b/source/lib/netapi/netapi_private.h
@@ -51,7 +51,7 @@ WERROR libnetapi_open_pipe(struct libnetapi_ctx *ctx,
                           struct cli_state *cli,
                           int pipe_idx,
                           struct rpc_pipe_client **pipe_cli);
-WERROR libnetapi_samr_open_domain(TALLOC_CTX *mem_ctx,
+WERROR libnetapi_samr_open_domain(struct libnetapi_ctx *mem_ctx,
                                  struct rpc_pipe_client *pipe_cli,
                                  uint32_t connect_mask,
                                  uint32_t domain_mask,

diff --git a/source/lib/netapi/samr.c b/source/lib/netapi/samr.c
index bd90067a6d3de8fe34549434e90a84c7ef3cd506..e83b8eba9c512e1c171b5eac7f122baf13f08e3a 100644 (file)
--- a/source/lib/netapi/samr.c
+++ b/source/lib/netapi/samr.c
@@ -18,11 +18,13 @@
  */
 
 #include "includes.h"
+#include "lib/netapi/netapi.h"
+#include "lib/netapi/netapi_private.h"
 
 /****************************************************************
 ****************************************************************/
 
-WERROR libnetapi_samr_open_domain(TALLOC_CTX *mem_ctx,
+WERROR libnetapi_samr_open_domain(struct libnetapi_ctx *mem_ctx,
                                  struct rpc_pipe_client *pipe_cli,
                                  uint32_t connect_mask,
                                  uint32_t domain_mask,
@@ -32,6 +34,7 @@ WERROR libnetapi_samr_open_domain(TALLOC_CTX *mem_ctx,
 {
        NTSTATUS status;
        WERROR werr;
+       struct libnetapi_private_ctx *priv;
        uint32_t resume_handle = 0;
        uint32_t num_entries = 0;
        struct samr_SamArray *sam = NULL;
@@ -40,6 +43,38 @@ WERROR libnetapi_samr_open_domain(TALLOC_CTX *mem_ctx,
        bool domain_found = true;
        int i;
 
+       priv = talloc_get_type_abort(mem_ctx->private_data,
+               struct libnetapi_private_ctx);
+
+       if (is_valid_policy_hnd(&priv->samr.connect_handle)) {
+               if ((priv->samr.connect_mask & connect_mask) == connect_mask) {
+                       *connect_handle = priv->samr.connect_handle;
+               } else {
+                       libnetapi_samr_close_connect_handle(mem_ctx,
+                               &priv->samr.connect_handle);
+               }
+       }
+
+       if (is_valid_policy_hnd(&priv->samr.domain_handle)) {
+               if ((priv->samr.domain_mask & domain_mask) == domain_mask) {
+                       *domain_handle = priv->samr.domain_handle;
+               } else {
+                       libnetapi_samr_close_domain_handle(mem_ctx,
+                               &priv->samr.domain_handle);
+               }
+       }
+
+       if (priv->samr.domain_sid) {
+               *domain_sid = priv->samr.domain_sid;
+       }
+
+       if (is_valid_policy_hnd(&priv->samr.connect_handle) &&
+           ((priv->samr.connect_mask & connect_mask) == connect_mask) &&
+           is_valid_policy_hnd(&priv->samr.domain_handle) &&
+           (priv->samr.domain_mask & domain_mask) == domain_mask) {
+               return WERR_OK;
+       }
+
        if (!is_valid_policy_hnd(connect_handle)) {
                status = rpccli_try_samr_connects(pipe_cli, mem_ctx,
                                                  connect_mask,
@@ -99,6 +134,17 @@ WERROR libnetapi_samr_open_domain(TALLOC_CTX *mem_ctx,
                goto done;
        }
 
+       priv->samr.cli                  = pipe_cli;
+
+       priv->samr.domain_name          = domain_name;
+       priv->samr.domain_sid           = *domain_sid;
+
+       priv->samr.connect_mask         = connect_mask;
+       priv->samr.connect_handle       = *connect_handle;
+
+       priv->samr.domain_mask          = domain_mask;
+       priv->samr.domain_handle        = *domain_handle;
+
        werr = WERR_OK;
 
  done: