diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-22 10:21:22 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-22 10:21:22 +0200 |
commit | 38a4f9df170fba0a05755e06dd4362d471b3db80 (patch) | |
tree | a1f3623e06ce4fd1e010afd5e72062dbee0d9b83 /source4/torture/nbt/nbt.c | |
parent | 54efc107e58ed1eed7109ea08fdf808e3a15327b (diff) | |
parent | 7dddab3f6cdb36a537ca3ed9c9f3461993d1c11c (diff) | |
download | samba-38a4f9df170fba0a05755e06dd4362d471b3db80.tar.gz samba-38a4f9df170fba0a05755e06dd4362d471b3db80.tar.bz2 samba-38a4f9df170fba0a05755e06dd4362d471b3db80.zip |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 1e38de45640430be002053b8bd52b615184134ba)
Diffstat (limited to 'source4/torture/nbt/nbt.c')
-rw-r--r-- | source4/torture/nbt/nbt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/torture/nbt/nbt.c b/source4/torture/nbt/nbt.c index 6cb9507398..d27a26eb30 100644 --- a/source4/torture/nbt/nbt.c +++ b/source4/torture/nbt/nbt.c @@ -34,7 +34,7 @@ bool torture_nbt_get_name(struct torture_context *tctx, /* do an initial name resolution to find its IP */ torture_assert_ntstatus_ok(tctx, - resolve_name(lp_resolve_context(tctx->lp_ctx), name, tctx, address, NULL), + resolve_name(lp_resolve_context(tctx->lp_ctx), name, tctx, address, tctx->ev), talloc_asprintf(tctx, "Failed to resolve %s", name->name)); |