#include "auth/gensec/gensec.h"
#include "param/param.h"
#include "dsdb/samdb/samdb.h"
-#include "lib/ldb_wrap.h"
-#include "torture/rpc/rpc.h"
+#include "torture/rpc/torture_rpc.h"
#include "torture/drs/proto.h"
#include "lib/tsocket/tsocket.h"
+#include "libcli/resolve/resolve.h"
struct DsSyncBindInfo {
struct dcerpc_pipe *drs_pipe;
+ struct dcerpc_binding_handle *drs_handle;
struct drsuapi_DsBind req;
struct GUID bind_guid;
struct drsuapi_DsBindInfoCtr our_bind_info_ctr;
const char *ldap_url;
const char *site_name;
-
+ const char *dest_address;
const char *domain_dn;
/* what we need to do as 'Administrator' */
struct drsuapi_DsBindInfo28 *our_bind_info28;
struct drsuapi_DsBindInfoCtr *our_bind_info_ctr;
const char *binding = torture_setting_string(tctx, "binding", NULL);
+ struct nbt_name name;
+
ctx = talloc_zero(tctx, struct DsSyncTest);
if (!ctx) return NULL;
ctx->ldap_url = talloc_asprintf(ctx, "ldap://%s", ctx->drsuapi_binding->host);
+ make_nbt_name_server(&name, ctx->drsuapi_binding->host);
+
+ /* do an initial name resolution to find its IP */
+ status = resolve_name(lp_resolve_context(tctx->lp_ctx), &name, tctx,
+ &ctx->dest_address, tctx->ev);
+ if (!NT_STATUS_IS_OK(status)) {
+ printf("Failed to resolve %s - %s\n",
+ name.name, nt_errstr(status));
+ return NULL;
+ }
+
/* ctx->admin ...*/
ctx->admin.credentials = cmdline_credentials;
printf("Failed to connect to server as a BDC: %s\n", nt_errstr(status));
return false;
}
+ b->drs_handle = b->drs_pipe->binding_handle;
- status = dcerpc_drsuapi_DsBind(b->drs_pipe, ctx, &b->req);
+ status = dcerpc_drsuapi_DsBind_r(b->drs_handle, ctx, &b->req);
if (!NT_STATUS_IS_OK(status)) {
const char *errstr = nt_errstr(status);
- if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
- errstr = dcerpc_errstr(ctx, b->drs_pipe->last_fault_code);
- }
printf("dcerpc_drsuapi_DsBind failed - %s\n", errstr);
ret = false;
} else if (!W_ERROR_IS_OK(b->req.out.result)) {
struct drsuapi_DsCrackNames r;
union drsuapi_DsNameRequest req;
union drsuapi_DsNameCtr ctr;
- int32_t level_out = 0;
+ uint32_t level_out = 0;
struct drsuapi_DsNameString names[1];
bool ret = true;
struct cldap_socket *cldap;
int ret2;
ret2 = tsocket_address_inet_from_strings(tctx, "ip",
- ctx->drsuapi_binding->host,
+ ctx->dest_address,
lp_cldap_port(tctx->lp_ctx),
&dest_addr);
if (ret2 != 0) {
r.out.level_out = &level_out;
r.out.ctr = &ctr;
- status = dcerpc_drsuapi_DsCrackNames(ctx->admin.drsuapi.drs_pipe, ctx, &r);
+ status = dcerpc_drsuapi_DsCrackNames_r(ctx->admin.drsuapi.drs_handle, ctx, &r);
if (!NT_STATUS_IS_OK(status)) {
const char *errstr = nt_errstr(status);
- if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
- errstr = dcerpc_errstr(ctx, ctx->admin.drsuapi.drs_pipe->last_fault_code);
- }
printf("dcerpc_drsuapi_DsCrackNames failed - %s\n", errstr);
return false;
} else if (!W_ERROR_IS_OK(r.out.result)) {
search.in.acct_control = -1;
search.in.version = NETLOGON_NT_VERSION_5 | NETLOGON_NT_VERSION_5EX;
search.in.map_response = true;
- status = cldap_netlogon(cldap, lp_iconv_convenience(tctx->lp_ctx), ctx, &search);
+ status = cldap_netlogon(cldap, ctx, &search);
if (!NT_STATUS_IS_OK(status)) {
const char *errstr = nt_errstr(status);
ctx->site_name = talloc_asprintf(ctx, "%s", "Default-First-Site-Name");
struct ldb_extended_dn_control *extended_dn_ctrl;
const char *err_msg;
- if (!dsdb_get_schema(ldb)) {
+ if (!dsdb_get_schema(ldb, NULL)) {
struct dsdb_schema *ldap_schema;
struct ldb_result *a_res;
struct ldb_result *c_res;
struct ldb_dn *schema_dn = ldb_get_schema_basedn(ldb);
- ldap_schema = dsdb_new_schema(ctx, lp_iconv_convenience(tctx->lp_ctx));
+ ldap_schema = dsdb_new_schema(ctx);
if (!ldap_schema) {
return false;
}
}
- new_msg = ldb_msg_diff(ldb, drs_msg, ldap_msg);
- talloc_steal(search_req, new_msg);
+ ret = ldb_msg_diff_ex(ldb, drs_msg, ldap_msg,
+ (TALLOC_CTX*)search_req, &new_msg);
+ torture_assert(tctx, ret == LDB_SUCCESS, "ldb_msg_diff_ex() has failed");
if (new_msg->num_elements != 0) {
char *s;
struct ldb_ldif ldif;
s = ldb_ldif_write_string(ldb, new_msg, &ldif);
s = talloc_asprintf(tctx, "\n# Difference in between DRS and LDAP objects: \n%s\n", s);
- ldif.msg = ldb_msg_diff(ldb, ldap_msg, drs_msg);
+ ret = ldb_msg_diff_ex(ldb, ldap_msg, drs_msg,
+ (TALLOC_CTX*)search_req, &ldif.msg);
+ torture_assert(tctx, ret == LDB_SUCCESS, "ldb_msg_diff_ex() has failed");
s = talloc_asprintf_append(s,
"\n# Difference in between LDAP and DRS objects: \n%s\n",
ldb_ldif_write_string(ldb, new_msg, &ldif));
if (pull_fn) {
/* Can't use '_all' because of PIDL bugs with relative pointers */
ndr_err = ndr_pull_struct_blob(&plain_data, ptr,
- lp_iconv_convenience(tctx->lp_ctx), ptr,
- pull_fn);
+ ptr, pull_fn);
if (NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
ndr_print_debug(print_fn, name, ptr);
} else {
struct drsuapi_DsReplicaObjectIdentifier nc;
struct drsuapi_DsGetNCChangesCtr1 *ctr1 = NULL;
struct drsuapi_DsGetNCChangesCtr6 *ctr6 = NULL;
- int32_t out_level = 0;
+ uint32_t out_level = 0;
struct GUID null_guid;
struct dom_sid null_sid;
DATA_BLOB gensec_skey;
struct {
- int32_t level;
+ uint32_t level;
} array[] = {
/* {
5
}
for (i=0; i < ARRAY_SIZE(array); i++) {
- printf("testing DsGetNCChanges level %d\n",
+ printf("Testing DsGetNCChanges level %d\n",
array[i].level);
r.in.bind_handle = &ctx->new_dc.drsuapi.bind_handle;
printf("Dumping AD partition: %s\n", nc.dn);
for (y=0; ;y++) {
- int32_t _level = 0;
+ uint32_t _level = 0;
union drsuapi_DsGetNCChangesCtr ctr;
ZERO_STRUCT(r.out);
r.in.req->req8.highwatermark.highest_usn);
}
- status = dcerpc_drsuapi_DsGetNCChanges(ctx->new_dc.drsuapi.drs_pipe, ctx, &r);
+ status = dcerpc_drsuapi_DsGetNCChanges_r(ctx->new_dc.drsuapi.drs_handle, ctx, &r);
torture_drsuapi_assert_call(tctx, ctx->new_dc.drsuapi.drs_pipe, status,
&r, "dcerpc_drsuapi_DsGetNCChanges");
r.out.info = &info;
r.out.level_out = &level_out;
- req.req1.unknown1 = lp_parm_int(tctx->lp_ctx, NULL, "dssync", "nt4-1", 3);
- req.req1.unknown2 = lp_parm_int(tctx->lp_ctx, NULL, "dssync", "nt4-2", 0x00004000);
+ req.req1.flags = lp_parm_int(tctx->lp_ctx, NULL,
+ "dssync", "nt4changelog_flags",
+ DRSUAPI_NT4_CHANGELOG_GET_CHANGELOG |
+ DRSUAPI_NT4_CHANGELOG_GET_SERIAL_NUMBERS);
+ req.req1.preferred_maximum_length = lp_parm_int(tctx->lp_ctx, NULL,
+ "dssync", "nt4changelog_preferred_len",
+ 0x00004000);
while (1) {
- req.req1.length = cookie.length;
- req.req1.data = cookie.data;
+ req.req1.restart_length = cookie.length;
+ req.req1.restart_data = cookie.data;
r.in.req = &req;
- status = dcerpc_drsuapi_DsGetNT4ChangeLog(ctx->new_dc.drsuapi.drs_pipe, ctx, &r);
+ status = dcerpc_drsuapi_DsGetNT4ChangeLog_r(ctx->new_dc.drsuapi.drs_handle, ctx, &r);
if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_IMPLEMENTED)) {
torture_skip(tctx, "DsGetNT4ChangeLog not supported by target server");
} else if (!NT_STATUS_IS_OK(status)) {
const char *errstr = nt_errstr(status);
- if (NT_STATUS_EQUAL(status, NT_STATUS_NET_WRITE_FAULT)) {
- errstr = dcerpc_errstr(ctx, ctx->new_dc.drsuapi.drs_pipe->last_fault_code);
+ if (NT_STATUS_EQUAL(status, NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE)) {
+ torture_skip(tctx, "DsGetNT4ChangeLog not supported by target server");
}
torture_fail(tctx,
talloc_asprintf(tctx, "dcerpc_drsuapi_DsGetNT4ChangeLog failed - %s\n",
*r.out.level_out));
} else if (NT_STATUS_IS_OK(r.out.info->info1.status)) {
} else if (NT_STATUS_EQUAL(r.out.info->info1.status, STATUS_MORE_ENTRIES)) {
- cookie.length = r.out.info->info1.length1;
- cookie.data = r.out.info->info1.data1;
+ cookie.length = r.out.info->info1.restart_length;
+ cookie.data = r.out.info->info1.restart_data;
continue;
} else {
torture_fail(tctx,
/* Unbing admin handle */
r.in.bind_handle = &ctx->admin.drsuapi.bind_handle;
- dcerpc_drsuapi_DsUnbind(ctx->admin.drsuapi.drs_pipe, ctx, &r);
+ dcerpc_drsuapi_DsUnbind_r(ctx->admin.drsuapi.drs_handle, ctx, &r);
/* Unbing new_dc handle */
r.in.bind_handle = &ctx->new_dc.drsuapi.bind_handle;
- dcerpc_drsuapi_DsUnbind(ctx->new_dc.drsuapi.drs_pipe, ctx, &r);
+ dcerpc_drsuapi_DsUnbind_r(ctx->new_dc.drsuapi.drs_handle, ctx, &r);
talloc_free(ctx);
git.samba.org / kamenim / samba.git / blobdiff