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.

diff --git a/source/client/client.c b/source/client/client.c
index 7561ecb6a3e4aec3c6c8d28ec156b57bcd33eea0..f18505a41837822a272cd368711514e2317148ca 100644 (file)
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -3853,7 +3853,7 @@ static int do_message_op(void)
        snprintf(name_type_hex, sizeof(name_type_hex), "#%X", name_type);
        fstrcat(server_name, name_type_hex);
 
-        zero_addr(&ss,AF_INET);
+        zero_addr(&ss);
        if (have_ip)
                ss = dest_ss;
 

diff --git a/source/client/smbmount.c b/source/client/smbmount.c
index 0c57c405cf840b2ab4c4bda9ea1b9fda09a600b0..9c671e3ef77aedf49e57f0b85b0426a39ba1ff57 100644 (file)
--- a/source/client/smbmount.c
+++ b/source/client/smbmount.c
@@ -146,7 +146,7 @@ static struct cli_state *do_connection(char *the_service)
        make_nmb_name(&called , server, 0x20);
 
  again:
-        zero_addr(&ip, AF_INET);
+        zero_addr(&ip);
        if (have_ip) ip = dest_ip;
 
        /* have to open a new connection */

diff --git a/source/lib/util_sock.c b/source/lib/util_sock.c
index 91da4074582b5a3d7b6e21c24ee75340d972c076..e66bd5f15a11fce09a69e8fb2b376df52b9d26dd 100644 (file)
--- a/source/lib/util_sock.c
+++ b/source/lib/util_sock.c
@@ -238,7 +238,7 @@ bool interpret_string_addr(struct sockaddr_storage *pss,
        }
 #endif
 
-       zero_addr(pss, AF_INET);
+       zero_addr(pss);
 
        if (!interpret_string_addr_internal(&res, str, flags|AI_ADDRCONFIG)) {
                return false;
@@ -343,14 +343,14 @@ void zero_ip_v4(struct in_addr *ip)
 }
 
 /*******************************************************************
- Set an address to INADDR_ANY, or IN6ADDR_ANY.
+ Set an address to INADDR_ANY.
 ******************************************************************/
 
-void zero_addr(struct sockaddr_storage *pss, int family)
+void zero_addr(struct sockaddr_storage *pss)
 {
        memset(pss, '\0', sizeof(*pss));
        /* Ensure we're at least a valid sockaddr-storage. */
-       pss->ss_family = family;
+       pss->ss_family = AF_INET;
 }
 
 /*******************************************************************

diff --git a/source/libsmb/cliconnect.c b/source/libsmb/cliconnect.c
index 826315ad7a66cc8de080556c7abc4bb1fd4c3851..448bfd76638077e04b9ba0e25f87b4adadf8f36e 100644 (file)
--- a/source/libsmb/cliconnect.c
+++ b/source/libsmb/cliconnect.c
@@ -1519,7 +1519,7 @@ NTSTATUS cli_start_connection(struct cli_state **output_cli,
        if (dest_ss) {
                ss = *dest_ss;
        } else {
-               zero_addr(&ss, AF_INET);
+               zero_addr(&ss);
        }
 
 again:

diff --git a/source/libsmb/clidfs.c b/source/libsmb/clidfs.c
index e1ca924b0925ab8045ea52a523ddc87d83aa2b97..6393f654c08fc313516752a7172e182bbc3aa23b 100644 (file)
--- a/source/libsmb/clidfs.c
+++ b/source/libsmb/clidfs.c
@@ -83,13 +83,13 @@ static struct cli_state *do_connect( const char *server, const char *share,
 
        server_n = server;
        
-       zero_addr(&ss, AF_INET);
+       zero_addr(&ss);
 
        make_nmb_name(&calling, global_myname(), 0x0);
        make_nmb_name(&called , server, name_type);
 
  again:
-       zero_addr(&ss, AF_INET);
+       zero_addr(&ss);
        if (have_ip)
                ss = dest_ss;
 

diff --git a/source/libsmb/libsmbclient.c b/source/libsmb/libsmbclient.c
index d5bf1828c6819a6dcb2e9944f5b39ff2940c72ef..0b45cad3e1d5f779ae927a333484fb0eb76cd668 100644 (file)
--- a/source/libsmb/libsmbclient.c
+++ b/source/libsmb/libsmbclient.c
@@ -654,7 +654,7 @@ smbc_server(SMBCCTX *context,
         const char *username_used;
        NTSTATUS status;
 
-       zero_addr(&ss, AF_INET);
+       zero_addr(&ss);
        ZERO_STRUCT(c);
 
        if (server[0] == 0) {
@@ -742,7 +742,7 @@ smbc_server(SMBCCTX *context,
  again:
        slprintf(ipenv,sizeof(ipenv)-1,"HOST_%s", server_n);
 
-       zero_addr(&ss, AF_INET);
+       zero_addr(&ss);
 
        /* have to open a new connection */
        if ((c = cli_initialise()) == NULL) {
@@ -964,7 +964,7 @@ smbc_attr_server(SMBCCTX *context,
                         flags |= CLI_FULL_CONNECTION_USE_KERBEROS;
                 }
 
-                zero_addr(&ss, AF_INET);
+                zero_addr(&ss);
                 nt_status = cli_full_connection(&ipc_cli,
                                                 global_myname(), server,
                                                 &ss, 0, "IPC$", "?????",

diff --git a/source/libsmb/namequery.c b/source/libsmb/namequery.c
index 34fe09b8c2988e475d4af827daefb09b1656de83..f4c516921c13d5c4b0faf541a4a3b57c654b909b 100644 (file)
--- a/source/libsmb/namequery.c
+++ b/source/libsmb/namequery.c
@@ -331,7 +331,7 @@ bool name_status_find(const char *q_name,
 
        if (!interpret_string_addr(&ss, lp_socket_address(),
                                AI_NUMERICHOST|AI_PASSIVE)) {
-               zero_addr(&ss, AF_INET);
+               zero_addr(&ss);
        }
 
        sock = open_socket_in(SOCK_DGRAM, 0, 3, &ss, True);
@@ -528,7 +528,7 @@ static int remove_duplicate_addrs2(struct ip_service *iplist, int count )
                for ( j=i+1; j<count; j++ ) {
                        if (addr_equal(&iplist[i].ss, &iplist[j].ss) &&
                                        iplist[i].port == iplist[j].port) {
-                               zero_addr(&iplist[j].ss, AF_INET);
+                               zero_addr(&iplist[j].ss);
                        }
                }
        }
@@ -942,7 +942,7 @@ NTSTATUS name_resolve_bcast(const char *name,
 
        if (!interpret_string_addr(&ss, lp_socket_address(),
                                AI_NUMERICHOST|AI_PASSIVE)) {
-               zero_addr(&ss, AF_INET);
+               zero_addr(&ss);
        }
 
        sock = open_socket_in( SOCK_DGRAM, 0, 3, &ss, true );
@@ -1030,7 +1030,7 @@ NTSTATUS resolve_wins(const char *name,
        /* the address we will be sending from */
        if (!interpret_string_addr(&src_ss, lp_socket_address(),
                                AI_NUMERICHOST|AI_PASSIVE)) {
-               zero_addr(&src_ss, AF_INET);
+               zero_addr(&src_ss);
        }
 
        if (src_ss.ss_family != AF_INET) {

diff --git a/source/libsmb/namequery_dc.c b/source/libsmb/namequery_dc.c
index 0fa4b93990d1e932d277601d2b6c320763f233f2..06926a762bd93ab9407f9caf8c5a4b6558d75637 100644 (file)
--- a/source/libsmb/namequery_dc.c
+++ b/source/libsmb/namequery_dc.c
@@ -134,7 +134,7 @@ static bool ads_dc_name(const char *domain,
 #ifdef HAVE_ADS
        *dc_ss = ads->ldap.ss;
 #else
-       zero_addr(dc_ss,AF_INET);
+       zero_addr(dc_ss);
 #endif
        ads_destroy(&ads);
 
@@ -217,7 +217,7 @@ bool get_dc_name(const char *domain,
        bool ret;
        bool our_domain = False;
 
-       zero_addr(&dc_ss, AF_INET);
+       zero_addr(&dc_ss);
 
        ret = False;
 

diff --git a/source/rpcclient/rpcclient.c b/source/rpcclient/rpcclient.c
index 2c285704dedc32e0300c08b901f4179dcca93217..6d318ae7ec55bb3b2e87d87a009b04decf578a52 100644 (file)
--- a/source/rpcclient/rpcclient.c
+++ b/source/rpcclient/rpcclient.c
@@ -745,7 +745,7 @@ out_free:
 
        load_case_tables();
 
-       zero_addr(&server_ss, AF_INET);
+       zero_addr(&server_ss);
 
        setlinebuf(stdout);
 

diff --git a/source/torture/locktest.c b/source/torture/locktest.c
index f69f8bf48f300e7f917d50bf543c239b95e11052..baf676f6463448fab6bce922817b2feff3afaad7 100644 (file)
--- a/source/torture/locktest.c
+++ b/source/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/source/torture/masktest.c b/source/torture/masktest.c
index 354607bb4e5fa39db94614091beda5f9f3fa98ce..62b24dc1d9fca427a27b47f01b1eefe348ee273c 100644 (file)
--- a/source/torture/masktest.c
+++ b/source/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/source/torture/torture.c b/source/torture/torture.c
index 8eb29d837da9ba638476491180272e44f6a8f3b5..697d87adc7baa692589c16514086ca89859bd128 100644 (file)
--- a/source/torture/torture.c
+++ b/source/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);

diff --git a/source/utils/net.c b/source/utils/net.c
index fb82e7659112fdef0983769dd0eb15eadc374291..2390e5842c7c3a3668cb569bf99e032af3b4c73d 100644 (file)
--- a/source/utils/net.c
+++ b/source/utils/net.c
@@ -1012,7 +1012,7 @@ static struct functable net_func[] = {
 
        TALLOC_CTX *frame = talloc_stackframe();
 
-       zero_addr(&opt_dest_ip, AF_INET);
+       zero_addr(&opt_dest_ip);
 
        load_case_tables();
 

diff --git a/source/utils/smbcacls.c b/source/utils/smbcacls.c
index d5bf9b96e661f765357f141ca7b972f144eed2ac..9af2294f545c6852e8a37f9aec35d6765da9fb68 100644 (file)
--- a/source/utils/smbcacls.c
+++ b/source/utils/smbcacls.c
@@ -769,7 +769,7 @@ static struct cli_state *connect_one(const char *share)
        struct cli_state *c;
        struct sockaddr_storage ss;
        NTSTATUS nt_status;
-       zero_addr(&ss, AF_INET);
+       zero_addr(&ss);
 
        if (!cmdline_auth_info.got_pass) {
                char *pass = getpass("Password: ");

diff --git a/source/utils/smbcquotas.c b/source/utils/smbcquotas.c
index f185caa50f73b6c3bfa11266f63ba6b55d7be50f..ae793c28f94265aaa08bea6612727a3d701102eb 100644 (file)
--- a/source/utils/smbcquotas.c
+++ b/source/utils/smbcquotas.c
@@ -361,7 +361,7 @@ static struct cli_state *connect_one(const char *share)
        struct cli_state *c;
        struct sockaddr_storage ss;
        NTSTATUS nt_status;
-       zero_addr(&ss, AF_INET);
+       zero_addr(&ss);
 
        if (!cmdline_auth_info.got_pass) {
                char *pass = getpass("Password: ");