diff options
| author | Günther Deschner <gd@samba.org> | 2008-10-29 20:44:04 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2008-10-31 02:44:32 +0100 |
| commit | 6e9d69e4c8037aa23ad4bb7fd18399a96d7a740c (patch) | |
| tree | 1159517456f4dfd832fa7e3fb73768ecd25a1618 | |
| parent | c982b369308aba34d772159435fee28ab708fbda (diff) | |
| download | samba-6e9d69e4c8037aa23ad4bb7fd18399a96d7a740c.tar.gz samba-6e9d69e4c8037aa23ad4bb7fd18399a96d7a740c.tar.bz2 samba-6e9d69e4c8037aa23ad4bb7fd18399a96d7a740c.zip | |
s4-srvsvc: merge srvsvc_NetCharDevGetInfo from s3 idl.
Guenther
| -rw-r--r-- | source4/librpc/idl/srvsvc.idl | 2 | ||||
| -rw-r--r-- | source4/rpc_server/srvsvc/dcesrv_srvsvc.c | 2 | ||||
| -rw-r--r-- | source4/torture/rpc/srvsvc.c | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/source4/librpc/idl/srvsvc.idl b/source4/librpc/idl/srvsvc.idl index 918c8ba0ca..ae59365741 100644 --- a/source4/librpc/idl/srvsvc.idl +++ b/source4/librpc/idl/srvsvc.idl @@ -68,7 +68,7 @@ import "security.idl", "svcctl.idl"; [in,unique] [string,charset(UTF16)] uint16 *server_unc, [in] [string,charset(UTF16)] uint16 device_name[], [in] uint32 level, - [out,switch_is(level)] srvsvc_NetCharDevInfo info + [out,ref,switch_is(level)] srvsvc_NetCharDevInfo *info ); /******************/ diff --git a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c index d14d80b806..b5c0756a2b 100644 --- a/source4/rpc_server/srvsvc/dcesrv_srvsvc.c +++ b/source4/rpc_server/srvsvc/dcesrv_srvsvc.c @@ -82,7 +82,7 @@ static WERROR dcesrv_srvsvc_NetCharDevEnum(struct dcesrv_call_state *dce_call, T static WERROR dcesrv_srvsvc_NetCharDevGetInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct srvsvc_NetCharDevGetInfo *r) { - ZERO_STRUCT(r->out); + ZERO_STRUCTP(r->out.info); switch (r->in.level) { case 0: diff --git a/source4/torture/rpc/srvsvc.c b/source4/torture/rpc/srvsvc.c index 8ce2321369..0b53e3b066 100644 --- a/source4/torture/rpc/srvsvc.c +++ b/source4/torture/rpc/srvsvc.c @@ -32,14 +32,15 @@ static bool test_NetCharDevGetInfo(struct dcerpc_pipe *p, struct torture_context { NTSTATUS status; struct srvsvc_NetCharDevGetInfo r; + union srvsvc_NetCharDevInfo info; uint32_t levels[] = {0, 1}; int i; r.in.server_unc = talloc_asprintf(tctx,"\\\\%s",dcerpc_server_name(p)); r.in.device_name = devname; + r.out.info = &info; for (i=0;i<ARRAY_SIZE(levels);i++) { - ZERO_STRUCT(r.out); r.in.level = levels[i]; torture_comment(tctx, "testing NetCharDevGetInfo level %u on device '%s'\n", r.in.level, r.in.device_name); |