summaryrefslogtreecommitdiff
path: root/source3/torture
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-10-10 18:25:16 -0700
committerJeremy Allison <jra@samba.org>2007-10-10 18:25:16 -0700
commit8e54530b52fd256137740107e9fdf000f00a7a30 (patch)
treef9ca56cc0b2eff78c3550c924c79ee4ca0666fd2 /source3/torture
parent0ec55a246238b6cfb3727942c20cd55a16ab4d4a (diff)
downloadsamba-8e54530b52fd256137740107e9fdf000f00a7a30.tar.gz
samba-8e54530b52fd256137740107e9fdf000f00a7a30.tar.bz2
samba-8e54530b52fd256137740107e9fdf000f00a7a30.zip
Add start of IPv6 implementation. Currently most of this is avoiding
IPv6 in winbindd, but moves most of the socket functions that were wrongly in lib/util.c into lib/util_sock.c and provides generic IPv4/6 independent versions of most things. Still lots of work to do, but now I can see how I'll fix the access check code. Nasty part that remains is the name resolution code which is used to returning arrays of in_addr structs. Jeremy. (This used to be commit 3f6bd0e1ec5cc6670f3d08f76fc2cd94c9cd1a08)
Diffstat (limited to 'source3/torture')
-rw-r--r--source3/torture/locktest.c4
-rw-r--r--source3/torture/masktest.c4
-rw-r--r--source3/torture/torture.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c
index 9e4b895316..394a237a03 100644
--- a/source3/torture/locktest.c
+++ b/source3/torture/locktest.c
@@ -174,7 +174,7 @@ static struct cli_state *connect_one(char *share, int snum)
server_n = server;
- zero_ip(&ip);
+ zero_ip_v4(&ip);
slprintf(myname,sizeof(myname), "lock-%lu-%u", (unsigned long)getpid(), count++);
@@ -182,7 +182,7 @@ static struct cli_state *connect_one(char *share, int snum)
make_nmb_name(&called , server, 0x20);
again:
- zero_ip(&ip);
+ zero_ip_v4(&ip);
/* have to open a new connection */
if (!(c=cli_initialise())) {
diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
index 4913f60025..bab488f7bb 100644
--- a/source3/torture/masktest.c
+++ b/source3/torture/masktest.c
@@ -179,13 +179,13 @@ static struct cli_state *connect_one(char *share)
server_n = server;
- zero_ip(&ip);
+ zero_ip_v4(&ip);
make_nmb_name(&calling, "masktest", 0x0);
make_nmb_name(&called , server, 0x20);
again:
- zero_ip(&ip);
+ zero_ip_v4(&ip);
/* have to open a new connection */
if (!(c=cli_initialise())) {
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 991dadf9e3..a0167e8aab 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -106,7 +106,7 @@ static struct cli_state *open_nbt_connection(void)
make_nmb_name(&calling, myname, 0x0);
make_nmb_name(&called , host, 0x20);
- zero_ip(&ip);
+ zero_ip_v4(&ip);
if (!(c = cli_initialise())) {
printf("Failed initialize cli_struct to connect with %s\n", host);