sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-20 22:50:26 +03:00
Code

s4:torture/rpc: do testjoin only via ncalrpc or ncacn_np

Browse Source 
ncacn_ip_tcp doesn't have the required session key.
It used to be the wellknown "SystemLibraryDTC" constant,
but that's not available in modern systems anymore.

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

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
(cherry picked from commit 0400f301e3bcf495748cff009755426a040596fa)
This commit is contained in:
Stefan Metzmacher 2015-12-17 08:55:03 +01:00
parent 2d6afd96ed
commit e09c17a8a7
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
source4/torture/rpc/testjoin.c
View File

@ -503,10 +503,36 @@ _PUBLIC_ struct test_join *torture_join_domain(struct torture_context *tctx,
struct test_join *tj;
struct samr_SetUserInfo s;
union samr_UserInfo u;
const char *binding_str = NULL;
struct dcerpc_binding *binding = NULL;
enum dcerpc_transport_t transport;
tj = talloc_zero(tctx, struct test_join);
if (!tj) return NULL;
binding_str = torture_setting_string(tctx, "binding", NULL);
if (binding_str == NULL) {
const char *host = torture_setting_string(tctx, "host", NULL);
binding_str = talloc_asprintf(tj, "ncacn_np:%s", host);
}
status = dcerpc_parse_binding(tj, binding_str, &binding);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("dcerpc_parse_binding(%s) failed - %s\n",
binding_str, nt_errstr(status)));
talloc_free(tj);
return NULL;
}
transport = dcerpc_binding_get_transport(binding);
switch (transport) {
case NCALRPC:
case NCACN_UNIX_STREAM:
break;
default:
dcerpc_binding_set_transport(binding, NCACN_NP);
dcerpc_binding_set_flags(binding, 0, DCERPC_AUTH_OPTIONS);
break;
}
libnet_r = talloc_zero(tj, struct libnet_JoinDomain);
if (!libnet_r) {
talloc_free(tj);
@ -522,9 +548,10 @@ _PUBLIC_ struct test_join *torture_join_domain(struct torture_context *tctx,
tj->libnet_r = libnet_r;
libnet_ctx->cred = cmdline_credentials;
libnet_r->in.binding = torture_setting_string(tctx, "binding", NULL);
if (!libnet_r->in.binding) {
libnet_r->in.binding = talloc_asprintf(libnet_r, "ncacn_np:%s", torture_setting_string(tctx, "host", NULL));
libnet_r->in.binding = dcerpc_binding_string(libnet_r, binding);
if (libnet_r->in.binding == NULL) {
talloc_free(tj);
return NULL;
}
libnet_r->in.level = LIBNET_JOINDOMAIN_SPECIFIED;
libnet_r->in.netbios_name = machine_name;