r2910: I noticed that the samr torture test was doing its own DOS->UNIX

string conversion. For RPC, all string conversions are supposed to be
done by the NDR layer, using string flags set in the IDL. The reason
this wasn't working is that I had been too lazy to do the STR_ASCII
string types properly at the NDR layer when initially writing
ndr_basic.c.

This commit fixes the ndr_basic code properly to do all ASCII
varients, by re-using the non-ascii code and a "byte_mul" local
variable. I have also removed the manual string conversion in the SAMR
torture test code.
(This used to be commit aad0e7e9d890bb56447f1f933b8f2bb78a3ee269)

1 files changed, 1 insertions, 10 deletions

diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 0c78d9e51c..7e7d2498da 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -2441,18 +2441,9 @@ static BOOL test_GroupList(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 			break;
 
 		for (i=0; i<q2.out.info.info5.count; i++) {
-			char *name;
-			size_t namelen;
 			int j;
+			const char *name = q2.out.info.info5.entries[i].account_name.name;
 			BOOL found = False;
-
-			/* Querydisplayinfo returns ascii -- convert */
-
-			namelen = convert_string_talloc(mem_ctx, CH_DISPLAY, CH_UNIX,
-							q2.out.info.info5.entries[i].account_name.name,
-							q2.out.info.info5.entries[i].account_name.name_len,
-							(void **)&name);
-
 			for (j=0; j<num_names; j++) {
 				if (names[j] == NULL)
 					continue;