From d4307679b95088d05f0abad440de5e961ee965df Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Sat, 27 Oct 2007 20:29:36 -0700 Subject: Change all occurrences of zero_addr(&ss,AF_INET) to zero_addr(&ss). All current uses were always of the AF_INET form, so simplify the call. If in the future we need to zero an addr to AF_INET6 this can be done separately. Jeremy. (This used to be commit 2e92418a138bf2738b77b7e0fcb2fa37ad84fc0c) --- source3/torture/locktest.c | 4 ++-- source3/torture/masktest.c | 4 ++-- source3/torture/torture.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'source3/torture') diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c index f69f8bf48f..baf676f646 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_addr(&ss, AF_INET); + zero_addr(&ss); 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_addr(&ss, AF_INET); + zero_addr(&ss); /* have to open a new connection */ if (!(c=cli_initialise())) { diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c index 354607bb4e..62b24dc1d9 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_addr(&ss, AF_INET); + zero_addr(&ss); make_nmb_name(&calling, "masktest", 0x0); make_nmb_name(&called , server, 0x20); again: - zero_addr(&ss, AF_INET); + zero_addr(&ss); /* have to open a new connection */ if (!(c=cli_initialise())) { diff --git a/source3/torture/torture.c b/source3/torture/torture.c index 8eb29d837d..697d87adc7 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_addr(&ss, AF_INET); + zero_addr(&ss); if (!(c = cli_initialise())) { printf("Failed initialize cli_struct to connect with %s\n", host); -- cgit