diff options
| -rw-r--r-- | source4/librpc/idl/unixinfo.idl | 13 | ||||
| -rw-r--r-- | source4/torture/rpc/unixinfo.c | 26 |
2 files changed, 30 insertions, 9 deletions
diff --git a/source4/librpc/idl/unixinfo.idl b/source4/librpc/idl/unixinfo.idl index a1a9283e79..955e38d86b 100644 --- a/source4/librpc/idl/unixinfo.idl +++ b/source4/librpc/idl/unixinfo.idl @@ -1,3 +1,4 @@ +#include "idl_types.h" /* Unixinfo interface definition */ @@ -22,7 +23,7 @@ /* Function: 0x01 */ NTSTATUS unixinfo_UidToSid ( [in] hyper uid, - [out,ref] dom_sid *sid + [out,unique] dom_sid *sid ); /******************/ @@ -36,13 +37,13 @@ /* Function: 0x03 */ NTSTATUS unixinfo_GidToSid ( [in] hyper gid, - [out,ref] dom_sid *sid + [out,unique] dom_sid *sid ); - typedef struct { - NTSTATUS status; - [string,charset(UTF8)] uint8 *homedir; - [string,charset(UTF8)] uint8 *shell; + typedef struct { + NTSTATUS status; + utf8string homedir; + utf8string shell; } unixinfo_GetPWUidInfo; /******************/ diff --git a/source4/torture/rpc/unixinfo.c b/source4/torture/rpc/unixinfo.c index 070a7952f6..ea34c55ada 100644 --- a/source4/torture/rpc/unixinfo.c +++ b/source4/torture/rpc/unixinfo.c @@ -32,13 +32,12 @@ static BOOL test_uidtosid(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx) { NTSTATUS status; struct unixinfo_UidToSid r; - struct dom_sid sid; r.in.uid = 1000; - r.out.sid = &sid; status = dcerpc_unixinfo_UidToSid(p, mem_ctx, &r); - if (!NT_STATUS_IS_OK(status)) { + if (NT_STATUS_EQUAL(NT_STATUS_NO_SUCH_USER, status)) { + } else if (!NT_STATUS_IS_OK(status)) { printf("UidToSid failed == %s\n", nt_errstr(status)); return False; } @@ -68,6 +67,26 @@ static BOOL test_getpwuid(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx) return NT_STATUS_IS_OK(result); } +/* + test the GidToSid interface +*/ +static BOOL test_gidtosid(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx) +{ + NTSTATUS status; + struct unixinfo_GidToSid r; + + r.in.gid = 1000; + + status = dcerpc_unixinfo_GidToSid(p, mem_ctx, &r); + if (NT_STATUS_EQUAL(NT_STATUS_NO_SUCH_GROUP, status)) { + } else if (!NT_STATUS_IS_OK(status)) { + printf("GidToSid failed == %s\n", nt_errstr(status)); + return False; + } + + return True; +} + BOOL torture_rpc_unixinfo(struct torture_context *torture) { NTSTATUS status; @@ -84,6 +103,7 @@ BOOL torture_rpc_unixinfo(struct torture_context *torture) ret &= test_uidtosid(p, mem_ctx); ret &= test_getpwuid(p, mem_ctx); + ret &= test_gidtosid(p, mem_ctx); printf("\n"); |