summaryrefslogtreecommitdiff
path: root/source4/torture/rap
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-04-26 22:06:47 +0200
committerGünther Deschner <gd@samba.org>2010-04-26 22:52:45 +0200
commit1ede2a0577fa85100f95526386bc5298b565da8c (patch)
tree1fdcba37219b1949d5b5cf281d9b2fd3f9455217 /source4/torture/rap
parent1055b3c229f9ab8b4d43a73346090bb72b88d607 (diff)
downloadsamba-1ede2a0577fa85100f95526386bc5298b565da8c.tar.gz
samba-1ede2a0577fa85100f95526386bc5298b565da8c.tar.bz2
samba-1ede2a0577fa85100f95526386bc5298b565da8c.zip
s4: rename RAP share_enum_info to share_info.
Guenther
Diffstat (limited to 'source4/torture/rap')
-rw-r--r--source4/torture/rap/rap.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index 579dbbb003..bc06003deb 100644
--- a/source4/torture/rap/rap.c
+++ b/source4/torture/rap/rap.c
@@ -280,7 +280,7 @@ static NTSTATUS smbcli_rap_netshareenum(struct smbcli_tree *tree,
NDR_GOTO(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.count));
NDR_GOTO(ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, &r->out.available));
- r->out.info = talloc_array(mem_ctx, union rap_shareenum_info, r->out.count);
+ r->out.info = talloc_array(mem_ctx, union rap_share_info, r->out.count);
if (r->out.info == NULL) {
result = NT_STATUS_NO_MEMORY;
@@ -291,15 +291,15 @@ static NTSTATUS smbcli_rap_netshareenum(struct smbcli_tree *tree,
switch(r->in.level) {
case 0:
NDR_GOTO(ndr_pull_bytes(call->ndr_pull_data,
- (uint8_t *)r->out.info[i].info0.name, 13));
+ (uint8_t *)r->out.info[i].info0.share_name, 13));
break;
case 1:
NDR_GOTO(ndr_pull_bytes(call->ndr_pull_data,
- (uint8_t *)r->out.info[i].info1.name, 13));
+ (uint8_t *)r->out.info[i].info1.share_name, 13));
NDR_GOTO(ndr_pull_bytes(call->ndr_pull_data,
- (uint8_t *)&r->out.info[i].info1.pad, 1));
+ (uint8_t *)&r->out.info[i].info1.reserved1, 1));
NDR_GOTO(ndr_pull_uint16(call->ndr_pull_data,
- NDR_SCALARS, &r->out.info[i].info1.type));
+ NDR_SCALARS, &r->out.info[i].info1.share_type));
RAP_GOTO(rap_pull_string(mem_ctx, call->ndr_pull_data,
r->out.convert,
&r->out.info[i].info1.comment));
@@ -327,8 +327,8 @@ static bool test_netshareenum(struct torture_context *tctx,
smbcli_rap_netshareenum(cli->tree, lp_iconv_convenience(tctx->lp_ctx), tctx, &r), "");
for (i=0; i<r.out.count; i++) {
- printf("%s %d %s\n", r.out.info[i].info1.name,
- r.out.info[i].info1.type,
+ printf("%s %d %s\n", r.out.info[i].info1.share_name,
+ r.out.info[i].info1.share_type,
r.out.info[i].info1.comment);
}