s3-rpcclient: add object_uuid argument to cmd_epmapper_map()

[samba.git] / source3 / rpcclient / cmd_epmapper.c

diff --git a/source3/rpcclient/cmd_epmapper.c b/source3/rpcclient/cmd_epmapper.c
index 68fa701e8bea2067206dc0ffba79ec4e4da0e62b..289b086718fa6366b75cfd4a87aa5a46be164dc5 100644 (file)
--- a/source3/rpcclient/cmd_epmapper.c
+++ b/source3/rpcclient/cmd_epmapper.c
@@ -21,14 +21,14 @@
 #include "includes.h"
 #include "rpcclient.h"
 #include "../librpc/gen_ndr/ndr_epmapper_c.h"
-#include "../librpc/gen_ndr/ndr_lsa.h"
+#include "librpc/ndr/ndr_table.h"
 
 static NTSTATUS cmd_epmapper_map(struct rpc_pipe_client *p,
                                 TALLOC_CTX *mem_ctx,
                                 int argc, const char **argv)
 {
        struct dcerpc_binding_handle *b = p->binding_handle;
-       struct dcerpc_binding map_binding;
+       struct dcerpc_binding *map_binding;
        struct epm_twr_t map_tower;
        struct epm_twr_p_t towers[500];
        struct policy_handle entry_handle;
@@ -38,15 +38,82 @@ static NTSTATUS cmd_epmapper_map(struct rpc_pipe_client *p,
        NTSTATUS status;
        uint32_t result;
        uint32_t i;
+       const struct ndr_interface_list *l;
+       const char *interface_name = "lsarpc";
+       enum dcerpc_transport_t transport = NCACN_NP;
+       bool ok = false;
+       struct GUID object_uuid = GUID_zero();
+
+       if (argc > 4) {
+               d_fprintf(stderr,
+                         "Usage: %s [interface_name] [transport] "
+                         "[object_uuid]\n",
+                         argv[0]);
+               return NT_STATUS_OK;
+       }
+
+       if (argc >= 2) {
+               interface_name = argv[1];
+       }
+
+       for (l = ndr_table_list(); l != NULL; l = l->next) {
+
+               ok = strequal(interface_name, l->table->name);
+               if (ok) {
+                       abstract_syntax = l->table->syntax_id;
+                       break;
+               }
+       }
+
+       if (!ok) {
+               d_fprintf(stderr, "unknown interface: %s\n",
+                       interface_name);
+               status = NT_STATUS_UNSUCCESSFUL;
+               goto done;
+       }
+
+       if (argc >= 3) {
+               transport = dcerpc_transport_by_name(argv[2]);
+               if (transport == NCA_UNKNOWN) {
+                       d_fprintf(stderr, "unknown transport: %s\n",
+                               argv[2]);
+                       status = NT_STATUS_UNSUCCESSFUL;
+                       goto done;
+               }
+       }
+
+       if (argc >= 4) {
+               status = GUID_from_string(argv[3], &object_uuid);
+               if (!NT_STATUS_IS_OK(status)) {
+                       goto done;
+               }
+       }
+
+       /* 127.0.0.1[0] => correct? needed? */
+       status = dcerpc_parse_binding(tmp_ctx, "ncacn_np:127.0.0.1[0]",
+                                     &map_binding);
+       if (!NT_STATUS_IS_OK(status)) {
+               d_fprintf(stderr, "dcerpc_parse_binding returned %s\n",
+                         nt_errstr(status));
+               goto done;
+       }
 
-       abstract_syntax = ndr_table_lsarpc.syntax_id;
+       status = dcerpc_binding_set_transport(map_binding, transport);
+       if (!NT_STATUS_IS_OK(status)) {
+               d_fprintf(stderr, "dcerpc_binding_set_transport returned %s\n",
+                         nt_errstr(status));
+               goto done;
+       }
 
-       map_binding.transport = NCACN_NP;
-        map_binding.object = abstract_syntax;
-        map_binding.host = "127.0.0.1"; /* needed? */
-        map_binding.endpoint = "0"; /* correct? needed? */
+       status = dcerpc_binding_set_abstract_syntax(map_binding,
+                                                   &abstract_syntax);
+       if (!NT_STATUS_IS_OK(status)) {
+               d_fprintf(stderr, "dcerpc_binding_set_abstract_syntax returned %s\n",
+                         nt_errstr(status));
+               goto done;
+       }
 
-       status = dcerpc_binding_build_tower(tmp_ctx, &map_binding,
+       status = dcerpc_binding_build_tower(tmp_ctx, map_binding,
                                            &map_tower.tower);
        if (!NT_STATUS_IS_OK(status)) {
                d_fprintf(stderr, "dcerpc_binding_build_tower returned %s\n",
@@ -58,7 +125,7 @@ static NTSTATUS cmd_epmapper_map(struct rpc_pipe_client *p,
        ZERO_STRUCT(entry_handle);
 
        status = dcerpc_epm_Map(
-               b, tmp_ctx, &abstract_syntax.uuid,
+               b, tmp_ctx, &object_uuid,
                &map_tower, &entry_handle, ARRAY_SIZE(towers),
                &num_towers, towers, &result);
        if (!NT_STATUS_IS_OK(status)) {