sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

librpc: fix IDL for svcctl_ChangeServiceConfigW

Browse Source 
Found while trying to run winexe against Windows Server 2019.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14313

Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Günther Deschner 2020-03-04 15:23:43 +01:00 committed by Andreas Schneider
parent c3fa0b2df9
commit ebda529b59
5 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/winexe/winexe.c
View File

@ -625,8 +625,10 @@ static NTSTATUS winexe_svc_install(
NULL, /* load_order_group */
NULL, /* tag_id */
NULL, /* dependencies */
0, /* dwDependSize */
NULL, /* service_start_name */
NULL, /* password */
0, /* dwPwSize */
NULL, /* display_name */
&werr);

23
librpc/idl/svcctl.idl
View File

@ -13,6 +13,17 @@ import "misc.idl", "security.idl";
helpstring("Service Control")
] interface svcctl
{
const int MAX_SERVICE_NAME_LENGTH = 256;
const short SC_MAX_DEPEND_SIZE = 4 * 1024;
const short SC_MAX_NAME_LENGTH = MAX_SERVICE_NAME_LENGTH + 1;
const short SC_MAX_PATH_LENGTH = 32 * 1024;
const short SC_MAX_PWD_SIZE = 514;
const short SC_MAX_COMPUTER_NAME_LENGTH = 1024;
const short SC_MAX_ACCOUNT_NAME_LENGTH = 2 * 1024;
const short SC_MAX_COMMENT_LENGTH = 128;
const short SC_MAX_ARGUMENT_LENGTH = 1024;
const short SC_MAX_ARGUMENTS = 1024;
typedef struct {
uint32 is_locked;
[string,charset(UTF16)] uint16 *lock_owner;
@ -195,11 +206,13 @@ import "misc.idl", "security.idl";
[in] svcctl_ErrorControl error_control,
[in,unique] [string,charset(UTF16)] uint16 *binary_path,
[in,unique] [string,charset(UTF16)] uint16 *load_order_group,
[out,ref] uint32 *tag_id,
[in,unique] [string,charset(UTF16)] uint16 *dependencies,
[in,unique] [string,charset(UTF16)] uint16 *service_start_name,
[in,unique] [string,charset(UTF16)] uint16 *password,
[in,unique] [string,charset(UTF16)] uint16 *display_name
[in,out,unique] uint32 *tag_id,
[in,unique,size_is(dwDependSize)] [string,charset(UTF16)] uint16 *dependencies,
[in,range(0, SC_MAX_DEPEND_SIZE)] uint32 dwDependSize,
[in,unique,range(0, SC_MAX_ACCOUNT_NAME_LENGTH)] [string,charset(UTF16)] uint16 *service_start_name,
[in,unique,size_is(dwPwSize)] [string,charset(UTF16)] uint16 *password,
[in,range(0, SC_MAX_PWD_SIZE)] uint32 dwPwSize,
[in,unique,range(0, SC_MAX_NAME_LENGTH)] [string,charset(UTF16)] uint16 *display_name
);
/*****************/

5
selftest/knownfail
View File

@ -238,11 +238,6 @@
# not implemented
^samba3.rpc.svcctl.svcctl.ChangeServiceConfigW\(ad_dc\)
^samba3.rpc.svcctl.svcctl.ChangeServiceConfigW\(nt4_dc\)
# broken IDL
^samba4.local.ndr.svcctl_ChangeServiceConfigW_NDR_IN
^samba4.local.ndr.svcctl_ChangeServiceConfigW_NDR_OUT
^samba4.local.ndr.system.iconv.svcctl_ChangeServiceConfigW_NDR_IN
^samba4.local.ndr.system.iconv.svcctl_ChangeServiceConfigW_NDR_OUT
#
# This makes less sense when not running against an AD DC
#

3
source4/torture/ndr/svcctl.c
View File

@ -45,9 +45,12 @@ static bool svcctl_ChangeServiceConfigW_req_check(struct torture_context *tctx,
torture_assert_u32_equal(tctx, r->in.error_control, SVCCTL_SVC_ERROR_NORMAL, "error_control");
torture_assert_str_equal(tctx, r->in.binary_path, NULL, "binary_path");
torture_assert_str_equal(tctx, r->in.load_order_group, NULL, "load_order_group");
torture_assert(tctx, r->in.tag_id == NULL, "tag_id");
torture_assert_str_equal(tctx, r->in.dependencies, NULL, "dependencies");
torture_assert_u32_equal(tctx, r->in.dwDependSize, 0, "dwDependSize");
torture_assert_str_equal(tctx, r->in.service_start_name, NULL, "service_start_name");
torture_assert_str_equal(tctx, r->in.password, NULL, "password");
torture_assert_u32_equal(tctx, r->in.dwPwSize, 0, "dwPwSize");
torture_assert_str_equal(tctx, r->in.display_name, NULL, "display_name");
return true;

3
source4/torture/rpc/svcctl.c
View File

@ -675,9 +675,12 @@ static bool test_ChangeServiceConfigW(struct torture_context *tctx,
r.in.binary_path = NULL;
r.in.load_order_group = NULL;
r.in.dependencies = NULL;
r.in.dwDependSize = 0;
r.in.service_start_name = NULL;
r.in.password = NULL;
r.in.dwPwSize = 0;
r.in.display_name = NULL;
r.in.tag_id = NULL;
r.out.tag_id = NULL;
status = dcerpc_svcctl_ChangeServiceConfigW_r(b, tctx, &r);