diff options
| author | Günther Deschner <gd@samba.org> | 2010-04-26 22:06:47 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-04-26 22:52:45 +0200 |
| commit | 1ede2a0577fa85100f95526386bc5298b565da8c (patch) | |
| tree | 1fdcba37219b1949d5b5cf281d9b2fd3f9455217 /source4/ntvfs | |
| parent | 1055b3c229f9ab8b4d43a73346090bb72b88d607 (diff) | |
| download | samba-1ede2a0577fa85100f95526386bc5298b565da8c.tar.gz samba-1ede2a0577fa85100f95526386bc5298b565da8c.tar.bz2 samba-1ede2a0577fa85100f95526386bc5298b565da8c.zip | |
s4: rename RAP share_enum_info to share_info.
Guenther
Diffstat (limited to 'source4/ntvfs')
| -rw-r--r-- | source4/ntvfs/ipc/ipc_rap.c | 12 | ||||
| -rw-r--r-- | source4/ntvfs/ipc/rap_server.c | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/source4/ntvfs/ipc/ipc_rap.c b/source4/ntvfs/ipc/ipc_rap.c index 04ea70030e..277e346c4b 100644 --- a/source4/ntvfs/ipc/ipc_rap.c +++ b/source4/ntvfs/ipc/ipc_rap.c @@ -291,17 +291,17 @@ static NTSTATUS _rap_netshareenum(struct rap_call *call) switch(r.in.level) { case 0: NDR_GOTO(ndr_push_bytes(call->ndr_push_data, - (const uint8_t *)r.out.info[i].info0.name, - sizeof(r.out.info[i].info0.name))); + (const uint8_t *)r.out.info[i].info0.share_name, + sizeof(r.out.info[i].info0.share_name))); break; case 1: NDR_GOTO(ndr_push_bytes(call->ndr_push_data, - (const uint8_t *)r.out.info[i].info1.name, - sizeof(r.out.info[i].info1.name))); + (const uint8_t *)r.out.info[i].info1.share_name, + sizeof(r.out.info[i].info1.share_name))); NDR_GOTO(ndr_push_uint8(call->ndr_push_data, - NDR_SCALARS, r.out.info[i].info1.pad)); + NDR_SCALARS, r.out.info[i].info1.reserved1)); NDR_GOTO(ndr_push_uint16(call->ndr_push_data, - NDR_SCALARS, r.out.info[i].info1.type)); + NDR_SCALARS, r.out.info[i].info1.share_type)); RAP_GOTO(rap_push_string(call->ndr_push_data, call->heap, diff --git a/source4/ntvfs/ipc/rap_server.c b/source4/ntvfs/ipc/rap_server.c index 2bc07c3e7b..fc80b66419 100644 --- a/source4/ntvfs/ipc/rap_server.c +++ b/source4/ntvfs/ipc/rap_server.c @@ -58,18 +58,18 @@ NTSTATUS rap_netshareenum(TALLOC_CTX *mem_ctx, r->out.available = count; r->out.info = talloc_array(mem_ctx, - union rap_shareenum_info, r->out.available); + union rap_share_info, r->out.available); for (i = 0, j = 0; i < r->out.available; i++) { if (!NT_STATUS_IS_OK(share_get_config(mem_ctx, sctx, snames[i], &scfg))) { DEBUG(3, ("WARNING: Service [%s] disappeared after enumeration!\n", snames[i])); continue; } - strncpy(r->out.info[j].info1.name, + strncpy(r->out.info[j].info1.share_name, snames[i], - sizeof(r->out.info[0].info1.name)); - r->out.info[i].info1.pad = 0; - r->out.info[i].info1.type = dcesrv_common_get_share_type(mem_ctx, NULL, scfg); + sizeof(r->out.info[0].info1.share_name)); + r->out.info[i].info1.reserved1 = 0; + r->out.info[i].info1.share_type = dcesrv_common_get_share_type(mem_ctx, NULL, scfg); r->out.info[i].info1.comment = talloc_strdup(mem_ctx, share_string_option(scfg, SHARE_COMMENT, "")); talloc_free(scfg); j++; |