Changeset 745 for trunk/server/source3/lib/netapi/samr.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/lib/netapi/samr.c (modified) (13 diffs)

trunk/server/source3/lib/netapi/samr.c

@@ -21 +21 @@
 #include "lib/netapi/netapi.h"
 #include "lib/netapi/netapi_private.h"
-#include "../librpc/gen_ndr/cli_samr.h"
+#include "rpc_client/rpc_client.h"
+#include "../librpc/gen_ndr/ndr_samr_c.h"
+#include "rpc_client/cli_samr.h"
+#include "rpc_client/init_lsa.h"
+#include "../libcli/security/security.h"
 
 /****************************************************************
@@ -34 +38 @@
                                   struct dom_sid2 **domain_sid)
 {
-        NTSTATUS status;
+        NTSTATUS status, result;
         WERROR werr;
         struct libnetapi_private_ctx *priv;
@@ -44 +48 @@
         bool domain_found = true;
         int i;
+        struct dcerpc_binding_handle *b = pipe_cli->binding_handle;
 
         priv = talloc_get_type_abort(mem_ctx->private_data,
@@ -78 +83 @@
 
         if (!is_valid_policy_hnd(connect_handle)) {
-                status = rpccli_try_samr_connects(pipe_cli, mem_ctx,
+                status = dcerpc_try_samr_connects(pipe_cli->binding_handle, mem_ctx,
+                                                  pipe_cli->srv_name_slash,
                                                   connect_mask,
-                                                  connect_handle);
+                                                  connect_handle,
+                                                  &result);
                 if (!NT_STATUS_IS_OK(status)) {
                         werr = ntstatus_to_werror(status);
                         goto done;
                 }
-        }
-
-        status = rpccli_samr_EnumDomains(pipe_cli, mem_ctx,
+                if (!NT_STATUS_IS_OK(result)) {
+                        werr = ntstatus_to_werror(result);
+                        goto done;
+                }
+        }
+
+        status = dcerpc_samr_EnumDomains(b, mem_ctx,
                                          connect_handle,
                                          &resume_handle,
                                          &sam,
                                          0xffffffff,
-                                         &num_entries);
+                                         &num_entries,
+                                         &result);
         if (!NT_STATUS_IS_OK(status)) {
                 werr = ntstatus_to_werror(status);
                 goto done;
         }
+        if (!NT_STATUS_IS_OK(result)) {
+                werr = ntstatus_to_werror(result);
+                goto done;
+        }
 
         for (i=0; i<num_entries; i++) {
@@ -117 +133 @@
         init_lsa_String(&lsa_domain_name, domain_name);
 
-        status = rpccli_samr_LookupDomain(pipe_cli, mem_ctx,
+        status = dcerpc_samr_LookupDomain(b, mem_ctx,
                                           connect_handle,
                                           &lsa_domain_name,
-                                          domain_sid);
+                                          domain_sid,
+                                          &result);
         if (!NT_STATUS_IS_OK(status)) {
                 werr = ntstatus_to_werror(status);
                 goto done;
         }
-
-        status = rpccli_samr_OpenDomain(pipe_cli, mem_ctx,
+        if (!NT_STATUS_IS_OK(result)) {
+                werr = ntstatus_to_werror(result);
+                goto done;
+        }
+
+        status = dcerpc_samr_OpenDomain(b, mem_ctx,
                                         connect_handle,
                                         domain_mask,
                                         *domain_sid,
-                                        domain_handle);
+                                        domain_handle,
+                                        &result);
         if (!NT_STATUS_IS_OK(status)) {
                 werr = ntstatus_to_werror(status);
+                goto done;
+        }
+        if (!NT_STATUS_IS_OK(result)) {
+                werr = ntstatus_to_werror(result);
                 goto done;
         }
@@ -163 +189 @@
                                           struct policy_handle *builtin_handle)
 {
-        NTSTATUS status;
+        NTSTATUS status, result;
         WERROR werr;
         struct libnetapi_private_ctx *priv;
+        struct dcerpc_binding_handle *b = pipe_cli->binding_handle;
 
         priv = talloc_get_type_abort(mem_ctx->private_data,
@@ -196 +223 @@
 
         if (!is_valid_policy_hnd(connect_handle)) {
-                status = rpccli_try_samr_connects(pipe_cli, mem_ctx,
+                status = dcerpc_try_samr_connects(pipe_cli->binding_handle, mem_ctx,
+                                                  pipe_cli->srv_name_slash,
                                                   connect_mask,
-                                                  connect_handle);
+                                                  connect_handle,
+                                                  &result);
                 if (!NT_STATUS_IS_OK(status)) {
                         werr = ntstatus_to_werror(status);
                         goto done;
                 }
-        }
-
-        status = rpccli_samr_OpenDomain(pipe_cli, mem_ctx,
+                if (!NT_STATUS_IS_OK(result)) {
+                        werr = ntstatus_to_werror(result);
+                        goto done;
+                }
+        }
+
+        status = dcerpc_samr_OpenDomain(b, mem_ctx,
                                         connect_handle,
                                         builtin_mask,
-                                        CONST_DISCARD(DOM_SID *, &global_sid_Builtin),
-                                        builtin_handle);
+                                        CONST_DISCARD(struct dom_sid *, &global_sid_Builtin),
+                                        builtin_handle,
+                                        &result);
         if (!NT_STATUS_IS_OK(status)) {
                 werr = ntstatus_to_werror(status);
                 goto done;
         }
+        if (!NT_STATUS_IS_OK(result)) {
+                werr = ntstatus_to_werror(result);
+                goto done;
+        }
 
         priv->samr.cli                  = pipe_cli;
@@ -236 +274 @@
 {
         struct libnetapi_private_ctx *priv;
+        struct dcerpc_binding_handle *b;
+        NTSTATUS result;
 
         if (!is_valid_policy_hnd(handle)) {
@@ -244 +284 @@
                 struct libnetapi_private_ctx);
 
-        if (!policy_hnd_equal(handle, &priv->samr.domain_handle)) {
-                return;
-        }
-
-        rpccli_samr_Close(priv->samr.cli, ctx, handle);
+        if (!policy_handle_equal(handle, &priv->samr.domain_handle)) {
+                return;
+        }
+
+        b = priv->samr.cli->binding_handle;
+
+        dcerpc_samr_Close(b, ctx, handle, &result);
 
         ZERO_STRUCT(priv->samr.domain_handle);
@@ -260 +302 @@
 {
         struct libnetapi_private_ctx *priv;
+        struct dcerpc_binding_handle *b;
+        NTSTATUS result;
 
         if (!is_valid_policy_hnd(handle)) {
@@ -268 +312 @@
                 struct libnetapi_private_ctx);
 
-        if (!policy_hnd_equal(handle, &priv->samr.builtin_handle)) {
-                return;
-        }
-
-        rpccli_samr_Close(priv->samr.cli, ctx, handle);
+        if (!policy_handle_equal(handle, &priv->samr.builtin_handle)) {
+                return;
+        }
+
+        b = priv->samr.cli->binding_handle;
+
+        dcerpc_samr_Close(b, ctx, handle, &result);
 
         ZERO_STRUCT(priv->samr.builtin_handle);
@@ -284 +330 @@
 {
         struct libnetapi_private_ctx *priv;
+        struct dcerpc_binding_handle *b;
+        NTSTATUS result;
 
         if (!is_valid_policy_hnd(handle)) {
@@ -292 +340 @@
                 struct libnetapi_private_ctx);
 
-        if (!policy_hnd_equal(handle, &priv->samr.connect_handle)) {
-                return;
-        }
-
-        rpccli_samr_Close(priv->samr.cli, ctx, handle);
+        if (!policy_handle_equal(handle, &priv->samr.connect_handle)) {
+                return;
+        }
+
+        b = priv->samr.cli->binding_handle;
+
+        dcerpc_samr_Close(b, ctx, handle, &result);
 
         ZERO_STRUCT(priv->samr.connect_handle);