Changeset 745 for trunk/server/source3/rpcclient/cmd_epmapper.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/rpcclient/cmd_epmapper.c (modified) (7 diffs)

trunk/server/source3/rpcclient/cmd_epmapper.c

@@ -21 +21 @@
 #include "includes.h"
 #include "rpcclient.h"
-#include "../librpc/gen_ndr/cli_epmapper.h"
+#include "../librpc/gen_ndr/ndr_epmapper_c.h"
+#include "../librpc/gen_ndr/ndr_lsa.h"
 
 static NTSTATUS cmd_epmapper_map(struct rpc_pipe_client *p,
@@ -27 +28 @@
                                  int argc, const char **argv)
 {
+        struct dcerpc_binding_handle *b = p->binding_handle;
         struct dcerpc_binding map_binding;
         struct epm_twr_t map_tower;
-        struct epm_twr_t res_tower;
-        struct epm_twr_p_t towers;
+        struct epm_twr_p_t towers[500];
         struct policy_handle entry_handle;
         struct ndr_syntax_id abstract_syntax;
@@ -36 +37 @@
         TALLOC_CTX *tmp_ctx = talloc_stackframe();
         NTSTATUS status;
+        uint32_t result;
+        uint32_t i;
 
         abstract_syntax = ndr_table_lsarpc.syntax_id;
@@ -52 +55 @@
         }
 
-        towers.twr = &res_tower;
+        ZERO_STRUCT(towers);
+        ZERO_STRUCT(entry_handle);
 
-        ZERO_STRUCT(entry_handle);
-        status = rpccli_epm_Map(
-                p, tmp_ctx, &abstract_syntax.uuid,
-                &map_tower, &entry_handle, 1,
-                &num_towers, &towers);
+        status = dcerpc_epm_Map(
+                b, tmp_ctx, &abstract_syntax.uuid,
+                &map_tower, &entry_handle, ARRAY_SIZE(towers),
+                &num_towers, towers, &result);
+        if (!NT_STATUS_IS_OK(status)) {
+                d_fprintf(stderr, "dcerpc_epm_Map returned %s\n",
+                          nt_errstr(status));
+                return status;
+        }
 
-        return status;
+        if (result != EPMAPPER_STATUS_OK) {
+                d_fprintf(stderr, "epm_Map returned %u (0x%08X)\n",
+                          result, result);
+                return NT_STATUS_UNSUCCESSFUL;
+        }
+
+        d_printf("num_tower[%u]\n", num_towers);
+
+        for (i=0; i < num_towers; i++) {
+                struct dcerpc_binding *binding;
+
+                if (towers[i].twr == NULL) {
+                        d_fprintf(stderr, "tower[%u] NULL\n", i);
+                        break;
+                }
+
+                status = dcerpc_binding_from_tower(tmp_ctx, &towers[i].twr->tower,
+                                                   &binding);
+                if (!NT_STATUS_IS_OK(status)) {
+                        break;
+                }
+
+                d_printf("tower[%u] %s\n", i, dcerpc_binding_string(tmp_ctx, binding));
+        }
+
+        return NT_STATUS_OK;
 }
 
@@ -67 +100 @@
                                     int argc, const char **argv)
 {
+        struct dcerpc_binding_handle *b = p->binding_handle;
         struct policy_handle entry_handle;
 
@@ -78 +112 @@
                 char *guid_string;
                 struct dcerpc_binding *binding;
+                uint32_t result;
 
-                status = rpccli_epm_Lookup(p, tmp_ctx,
+                status = dcerpc_epm_Lookup(b, tmp_ctx,
                                    0, /* rpc_c_ep_all */
                                    NULL,
@@ -86 +121 @@
                                    &entry_handle,
                                    1, /* max_ents */
-                                   &num_entries, &entry);
+                                   &num_entries, &entry,
+                                   &result);
                 if (!NT_STATUS_IS_OK(status)) {
-                        d_fprintf(stderr, "rpccli_epm_Lookup returned %s\n",
+                        d_fprintf(stderr, "dcerpc_epm_Lookup returned %s\n",
                                   nt_errstr(status));
                         break;
                 }
 
+                if (result == EPMAPPER_STATUS_NO_MORE_ENTRIES) {
+                        d_fprintf(stderr, "epm_Lookup no more entries\n");
+                        break;
+                }
+
+                if (result != EPMAPPER_STATUS_OK) {
+                        d_fprintf(stderr, "epm_Lookup returned %u (0x%08X)\n",
+                                  result, result);
+                        break;
+                }
+
                 if (num_entries != 1) {
-                        d_fprintf(stderr, "rpccli_epm_Lookup returned %d "
+                        d_fprintf(stderr, "epm_Lookup returned %d "
                                   "entries, expected one\n", (int)num_entries);
                         break;