From 2a329c496379d1b94fa9d83b4fc1fc1921636512 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Deschner?= Date: Mon, 27 Oct 2008 16:14:28 +0100 Subject: [PATCH] s4-netlogon: merge netr_DsRGetSiteName from s3 idl. Guenther --- source4/librpc/idl/netlogon.idl | 2 +- source4/torture/rpc/netlogon.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/source4/librpc/idl/netlogon.idl b/source4/librpc/idl/netlogon.idl index 2ddf78de316..23be2e56670 100644 --- a/source4/librpc/idl/netlogon.idl +++ b/source4/librpc/idl/netlogon.idl @@ -1130,7 +1130,7 @@ interface netlogon /* Function 0x1c */ WERROR netr_DsRGetSiteName( [in,unique] [string,charset(UTF16)] uint16 *computer_name, - [out,unique] [string,charset(UTF16)] uint16 *site + [out,ref] [string,charset(UTF16)] uint16 **site ); /****************/ diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c index 7f0f60cd329..378f9a21d55 100644 --- a/source4/torture/rpc/netlogon.c +++ b/source4/torture/rpc/netlogon.c @@ -1230,17 +1230,19 @@ static bool test_netr_DsRGetSiteName(struct dcerpc_pipe *p, struct torture_conte { NTSTATUS status; struct netr_DsRGetSiteName r; + const char *site = NULL; if (torture_setting_bool(tctx, "samba4", false)) torture_skip(tctx, "skipping DsRGetSiteName test against Samba4"); r.in.computer_name = computer_name; + r.out.site = &site; torture_comment(tctx, "Testing netr_DsRGetSiteName\n"); status = dcerpc_netr_DsRGetSiteName(p, tctx, &r); torture_assert_ntstatus_ok(tctx, status, "DsRGetSiteName"); torture_assert_werr_ok(tctx, r.out.result, "DsRGetSiteName"); - torture_assert_str_equal(tctx, expected_site, r.out.site, "netr_DsRGetSiteName"); + torture_assert_str_equal(tctx, expected_site, site, "netr_DsRGetSiteName"); r.in.computer_name = talloc_asprintf(tctx, "\\\\%s", computer_name); torture_comment(tctx, -- 2.34.1