Changeset 745 for trunk/server/source3/lib/netapi/getdc.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/getdc.c (modified) (6 diffs)

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

@@ -20 +20 @@
 #include "includes.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/cli_netlogon.h"
 
 /********************************************************************
@@ -42 +41 @@
                       struct NetGetDCName *r)
 {
-        struct rpc_pipe_client *pipe_cli = NULL;
         NTSTATUS status;
         WERROR werr;
+
 
-        werr = libnetapi_open_pipe(ctx, r->in.server_name,
-                                   &ndr_table_netlogon.syntax_id,
-                                   &pipe_cli);
+        werr = libnetapi_e(ctx, r->in.server_name,
+                                   &ndr_table_netlogon.syntax_id,
+                                );
         if (!W_ERROR_IS_OK(werr)) {
                 goto done;
         }
 
-        status = rpccli_netr_GetDcName(pipe_cli, talloc_tos(),
+        status = , talloc_tos(),
                                        r->in.server_name,
                                        r->in.domain_name,
@@ -82 +81 @@
                          struct NetGetAnyDCName *r)
 {
-        struct rpc_pipe_client *pipe_cli = NULL;
         NTSTATUS status;
         WERROR werr;
+
 
-        werr = libnetapi_open_pipe(ctx, r->in.server_name,
-                                   &ndr_table_netlogon.syntax_id,
-                                   &pipe_cli);
+        werr = libnetapi_e(ctx, r->in.server_name,
+                                   &ndr_table_netlogon.syntax_id,
+                                );
         if (!W_ERROR_IS_OK(werr)) {
                 goto done;
         }
 
-        status = rpccli_netr_GetAnyDCName(pipe_cli, talloc_tos(),
+        status = , talloc_tos(),
                                           r->in.server_name,
                                           r->in.domain_name,
@@ -99 +98 @@
                                           &werr);
         if (!NT_STATUS_IS_OK(status)) {
+
                 goto done;
         }
@@ -114 +114 @@
 {
         NTSTATUS status;
+
+
+
+
 
         status = dsgetdcname(ctx,
-                             NULL,
+                             ,
                              r->in.domain_name,
                              r->in.domain_guid,
@@ -139 +143 @@
         WERROR werr;
         NTSTATUS status = NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
-        struct rpc_pipe_client *pipe_cli = NULL;
+        struct ;
 
-        werr = libnetapi_open_pipe(ctx, r->in.server_name,
-                                   &ndr_table_netlogon.syntax_id,
-                                   &pipe_cli);
+        werr = libnetapi_e(ctx, r->in.server_name,
+                                   &ndr_table_netlogon.syntax_id,
+                                );
         if (!W_ERROR_IS_OK(werr)) {
                 goto done;
         }
 
-        status = rpccli_netr_DsRGetDCName(pipe_cli,
+        status = dcerpc_netr_DsRGetDCNameEx(b,
+                                            ctx,
+                                            r->in.server_name,
+                                            r->in.domain_name,
+                                            r->in.domain_guid,
+                                            r->in.site_name,
+                                            r->in.flags,
+                                            (struct netr_DsRGetDCNameInfo **)r->out.dc_info,
+                                            &werr);
+        if (NT_STATUS_IS_OK(status) && W_ERROR_IS_OK(werr)) {
+                goto done;
+        }
+
+        status = dcerpc_netr_DsRGetDCName(b,
                                           ctx,
                                           r->in.server_name,