rpcclient: Add RPC_RTYPE_BINDING

Purely transport-related commands don't need the cli_state. Signed-off-by: Volker Lendecke <[email protected]> Reviewed-by: Jeremy Allison <[email protected]>
httpstorm · Mar 16, 2021 · e856402 · e856402
1 parent cf2a943
commit e856402
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
@@ -870,6 +870,11 @@ static NTSTATUS do_cmd(struct cli_state *cli,
 		if (!NT_STATUS_IS_OK(ntresult)) {
 			printf("result was %s\n", nt_errstr(ntresult));
 		}
+	} else if (cmd_entry->returntype == RPC_RTYPE_BINDING) {
+		ntresult = cmd_entry->bfn(binding, mem_ctx, argc, argv);
+		if (!NT_STATUS_IS_OK(ntresult)) {
+			printf("result was %s\n", nt_errstr(ntresult));
+		}
 	} else {
 		wresult = cmd_entry->wfn(cmd_entry->rpc_pipe, mem_ctx, argc, argv);
 		/* print out the DOS error */
@@ -922,7 +927,9 @@ static NTSTATUS process_cmd(struct user_auth_info *auth_info,
 			if (((set->returntype == RPC_RTYPE_NTSTATUS) &&
 			     (set->ntfn == NULL)) ||
 			    ((set->returntype == RPC_RTYPE_WERROR) &&
-			     (set->wfn == NULL))) {
+			     (set->wfn == NULL)) ||
+			    ((set->returntype == RPC_RTYPE_BINDING) &&
+			     (set->bfn == NULL))) {
 				fprintf (stderr, "Invalid command\n");
 				goto out_free;
 			}

diff --git a/source3/rpcclient/rpcclient.h b/source3/rpcclient/rpcclient.h
@@ -26,6 +26,7 @@
 typedef enum {
         RPC_RTYPE_NTSTATUS = 0,
         RPC_RTYPE_WERROR,
+	RPC_RTYPE_BINDING,
         MAX_RPC_RETURN_TYPE
 } RPC_RETURN_TYPE;
 
@@ -35,6 +36,10 @@ struct cmd_set {
 	NTSTATUS (*ntfn)(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, int argc, 
 			const char **argv);
 	WERROR (*wfn)(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv);
+	NTSTATUS (*bfn)(struct dcerpc_binding *binding,
+			TALLOC_CTX *mem_ctx,
+			int argc,
+			const char **argv);
 	const struct ndr_interface_table *table;
 	struct rpc_pipe_client *rpc_pipe;
 	const char *description;