Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test

(This used to be commit 8e96f2edb003d997e71e9e237463882696279d0f)

4 files changed, 9 insertions, 7 deletions

diff --git a/source4/torture/nbt/nbt.c b/source4/torture/nbt/nbt.c
index 422261884f..7d35fc856a 100644
--- a/source4/torture/nbt/nbt.c
+++ b/source4/torture/nbt/nbt.c
@@ -25,6 +25,11 @@
 #include "libcli/resolve/resolve.h"
 #include "param/param.h"
 
+struct nbt_name_socket *torture_init_nbt_socket(struct torture_context *tctx)
+{
+	return nbt_name_socket_init(tctx, tctx->ev, lp_iconv_convenience(tctx->lp_ctx));
+}
+
 bool torture_nbt_get_name(struct torture_context *tctx, 
 			  struct nbt_name *name, 
 			  const char **address)
diff --git a/source4/torture/nbt/query.c b/source4/torture/nbt/query.c
index 3f3a15cca5..80027a1b68 100644
--- a/source4/torture/nbt/query.c
+++ b/source4/torture/nbt/query.c
@@ -47,8 +47,7 @@ static void increment_handler(struct nbt_name_request *req)
 */
 static bool bench_namequery(struct torture_context *tctx)
 {
-	struct nbt_name_socket *nbtsock = nbt_name_socket_init(tctx, tctx->ev,
-							       lp_iconv_convenience(tctx->lp_ctx));
+	struct nbt_name_socket *nbtsock = torture_init_nbt_socket(tctx);
 	int num_sent=0;
 	struct result_struct *result;
 	struct nbt_name_query io;
diff --git a/source4/torture/nbt/register.c b/source4/torture/nbt/register.c
index a8681f828f..8ddea4096e 100644
--- a/source4/torture/nbt/register.c
+++ b/source4/torture/nbt/register.c
@@ -44,8 +44,7 @@ static bool nbt_register_own(struct torture_context *tctx)
 {
 	struct nbt_name_register io;
 	NTSTATUS status;
-	struct nbt_name_socket *nbtsock = nbt_name_socket_init(tctx, tctx->ev,
-							       lp_iconv_convenience(tctx->lp_ctx));
+	struct nbt_name_socket *nbtsock = torture_init_nbt_socket(tctx);
 	struct socket_address *socket_address;
 	struct nbt_name name;
 	const char *address;
@@ -114,8 +113,7 @@ static bool nbt_refresh_own(struct torture_context *tctx)
 {
 	struct nbt_name_refresh io;
 	NTSTATUS status;
-	struct nbt_name_socket *nbtsock = nbt_name_socket_init(tctx, tctx->ev,
-							       lp_iconv_convenience(tctx->lp_ctx));
+	struct nbt_name_socket *nbtsock = torture_init_nbt_socket(tctx);
 	const char *myaddress;
 	struct socket_address *socket_address;
 	struct nbt_name name;
diff --git a/source4/torture/nbt/wins.c b/source4/torture/nbt/wins.c
index ae20de6e2f..ad9a97f133 100644
--- a/source4/torture/nbt/wins.c
+++ b/source4/torture/nbt/wins.c
@@ -53,7 +53,7 @@ static bool nbt_test_wins_name(struct torture_context *tctx, const char *address
 	struct nbt_name_refresh_wins refresh;
 	struct nbt_name_release release;
 	NTSTATUS status;
-	struct nbt_name_socket *nbtsock = nbt_name_socket_init(tctx, tctx->ev, lp_iconv_convenience(tctx->lp_ctx));
+	struct nbt_name_socket *nbtsock = torture_init_nbt_socket(tctx);
 	const char *myaddress;
 	struct socket_address *socket_address;
 	struct interface *ifaces;