summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-10-11 09:27:19 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:59:47 -0500
commitd186e63b01e0f14c1e7a7709c44e534efbb1fc36 (patch)
tree4ac5f2670f17eac71210e5c2d276cb2ec9cab398 /source4/torture
parentfea05710342927f321292072c5af4138e477fe76 (diff)
downloadsamba-d186e63b01e0f14c1e7a7709c44e534efbb1fc36.tar.gz
samba-d186e63b01e0f14c1e7a7709c44e534efbb1fc36.tar.bz2
samba-d186e63b01e0f14c1e7a7709c44e534efbb1fc36.zip
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)
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/rpc/samr.c11
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;