sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

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

Browse Source 
(This used to be commit 8e96f2edb0)
This commit is contained in:
Andrew Tridgell 2008-06-06 22:11:00 -07:00
commit 5d5c8a09f0
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source4/torture/nbt/nbt.c
View File

@ -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)

3
source4/torture/nbt/query.c
View File

@ -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;

6
source4/torture/nbt/register.c
View File

@ -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;

2
source4/torture/nbt/wins.c
View File

@ -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;