1 files changed, 3 insertions, 44 deletions

diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c
index 46e85e7c15..decbc8e161 100644
--- a/source3/rpcclient/cmd_lsarpc.c
+++ b/source3/rpcclient/cmd_lsarpc.c
@@ -23,43 +23,6 @@
 #include "includes.h"
 #include "rpcclient.h"
 
-
-/* useful function to allow entering a name instead of a SID and
- * looking it up automatically */
-static NTSTATUS name_to_sid(struct cli_state *cli, 
-			    TALLOC_CTX *mem_ctx,
-			    DOM_SID *sid, const char *name)
-{
-	POLICY_HND pol;
-	uint32 *sid_types;
-	NTSTATUS result;
-	DOM_SID *sids;
-
-	/* maybe its a raw SID */
-	if (strncmp(name, "S-", 2) == 0 &&
-	    string_to_sid(sid, name)) {
-		return NT_STATUS_OK;
-	}
-
-	result = cli_lsa_open_policy(cli, mem_ctx, True, 
-				     SEC_RIGHTS_MAXIMUM_ALLOWED,
-				     &pol);
-	if (!NT_STATUS_IS_OK(result))
-		goto done;
-
-	result = cli_lsa_lookup_names(cli, mem_ctx, &pol, 1, &name, &sids, &sid_types);
-	if (!NT_STATUS_IS_OK(result))
-		goto done;
-
-	cli_lsa_close(cli, mem_ctx, &pol);
-
-	*sid = sids[0];
-
-done:
-	return result;
-}
-
-
 /* Look up domain related information on a remote host */
 
 static NTSTATUS cmd_lsa_query_info_policy(struct cli_state *cli, 
@@ -459,9 +422,7 @@ static NTSTATUS cmd_lsa_enum_privsaccounts(struct cli_state *cli,
 		return NT_STATUS_OK;
 	}
 
-	result = name_to_sid(cli, mem_ctx, &sid, argv[1]);
-	if (!NT_STATUS_IS_OK(result))
-		goto done;	
+	string_to_sid(&sid, argv[1]);
 
 	result = cli_lsa_open_policy2(cli, mem_ctx, True, 
 				     SEC_RIGHTS_MAXIMUM_ALLOWED,
@@ -513,9 +474,7 @@ static NTSTATUS cmd_lsa_enum_acct_rights(struct cli_state *cli,
 		return NT_STATUS_OK;
 	}
 
-	result = name_to_sid(cli, mem_ctx, &sid, argv[1]);
-	if (!NT_STATUS_IS_OK(result))
-		goto done;	
+	string_to_sid(&sid, argv[1]);
 
 	result = cli_lsa_open_policy2(cli, mem_ctx, True, 
 				     SEC_RIGHTS_MAXIMUM_ALLOWED,
@@ -529,7 +488,7 @@ static NTSTATUS cmd_lsa_enum_acct_rights(struct cli_state *cli,
 	if (!NT_STATUS_IS_OK(result))
 		goto done;
 
-	printf("found %d privileges for SID %s\n", count, sid_string_static(&sid));
+	printf("found %d privileges for SID %s\n", count, argv[1]);
 
 	for (i = 0; i < count; i++) {
 		printf("\t%s\n", rights[i]);