diff options
| author | Günther Deschner <gd@samba.org> | 2008-10-29 14:19:14 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2008-10-31 02:44:30 +0100 |
| commit | 31b067a6dd8bd702801779755f24cc20ce0541f7 (patch) | |
| tree | 159022d842c1dea65fe7e930af16bf019e62e8ef /source4 | |
| parent | f151246e53859b03c6de1d352aa872ebef3e4103 (diff) | |
| download | samba-31b067a6dd8bd702801779755f24cc20ce0541f7.tar.gz samba-31b067a6dd8bd702801779755f24cc20ce0541f7.tar.bz2 samba-31b067a6dd8bd702801779755f24cc20ce0541f7.zip | |
s4-srvsvc: merge srvsvc_NetShareCheck from s3 idl.
Guenther
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/librpc/idl/srvsvc.idl | 2 | ||||
| -rw-r--r-- | source4/rpc_server/srvsvc/dcesrv_srvsvc.c | 10 | ||||
| -rw-r--r-- | source4/torture/rpc/srvsvc.c | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/source4/librpc/idl/srvsvc.idl b/source4/librpc/idl/srvsvc.idl index a3faaad1fd..f925fe9258 100644 --- a/source4/librpc/idl/srvsvc.idl +++ b/source4/librpc/idl/srvsvc.idl @@ -620,7 +620,7 @@ import "security.idl", "svcctl.idl"; WERROR srvsvc_NetShareCheck( [in,unique] [string,charset(UTF16)] uint16 *server_unc, [in] [string,charset(UTF16)] uint16 device_name[], - [out] srvsvc_ShareType type + [out,ref] srvsvc_ShareType *type ); /**************************/ diff --git a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c index 8a5f6708c3..edb48cee29 100644 --- a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c +++ b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c @@ -1395,13 +1395,13 @@ static WERROR dcesrv_srvsvc_NetShareCheck(struct dcesrv_call_state *dce_call, TA const char **names; int count, i; - ZERO_STRUCT(r->out); + *r->out.type = 0; /* TODO: - access check */ if (strcmp("", r->in.device_name) == 0) { - r->out.type = STYPE_IPC; + *r->out.type = STYPE_IPC; return WERR_OK; } @@ -1440,17 +1440,17 @@ static WERROR dcesrv_srvsvc_NetShareCheck(struct dcesrv_call_state *dce_call, TA if (!type) continue; if (strcmp(type, "DISK") == 0) { - r->out.type = STYPE_DISKTREE; + *r->out.type = STYPE_DISKTREE; return WERR_OK; } if (strcmp(type, "IPC") == 0) { - r->out.type = STYPE_IPC; + *r->out.type = STYPE_IPC; return WERR_OK; } if (strcmp(type, "PRINTER") == 0) { - r->out.type = STYPE_PRINTQ; + *r->out.type = STYPE_PRINTQ; return WERR_OK; } } diff --git a/source4/torture/rpc/srvsvc.c b/source4/torture/rpc/srvsvc.c index 4ddab75883..55352278e7 100644 --- a/source4/torture/rpc/srvsvc.c +++ b/source4/torture/rpc/srvsvc.c @@ -362,9 +362,11 @@ static bool test_NetShareCheck(struct dcerpc_pipe *p, struct torture_context *tc { NTSTATUS status; struct srvsvc_NetShareCheck r; + enum srvsvc_ShareType type; r.in.server_unc = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p)); r.in.device_name = device_name; + r.out.type = &type; torture_comment(tctx, "testing NetShareCheck on device '%s'\n", r.in.device_name); |