s4:lib/socket: simplify iface_list_wildcard() and its callers

Bug: https://bugzilla.samba.org/show_bug.cgi?id=10464
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Change-Id: Ib317d71dea01fc8ef6b6a26455f15a8a175d59f6
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Fri Mar  7 02:18:17 CET 2014 on sn-devel-104

diff --git a/source4/cldap_server/cldap_server.c b/source4/cldap_server/cldap_server.c
index 3d20201b80e133b368fb099234bdf1d83fadc30c..d1efa398a7241dbd70aaf040a34b9a93c997635d 100644 (file)
--- a/source4/cldap_server/cldap_server.c
+++ b/source4/cldap_server/cldap_server.c
@@ -153,7 +153,7 @@ static NTSTATUS cldapd_startup_interfaces(struct cldapd_server *cldapd, struct l
        /* if we are allowing incoming packets from any address, then
           we need to bind to the wildcard address */
        if (!lpcfg_bind_interfaces_only(lp_ctx)) {
-               const char **wcard = iface_list_wildcard(cldapd, lp_ctx);
+               char **wcard = iface_list_wildcard(cldapd);
                NT_STATUS_HAVE_NO_MEMORY(wcard);
                for (i=0; wcard[i]; i++) {
                        status = cldapd_add_socket(cldapd, lp_ctx, wcard[i]);

diff --git a/source4/dns_server/dns_server.c b/source4/dns_server/dns_server.c
index 7ad4acae7a15579bef231b353169dbc617a6e010..976774d020fbc27be59ff9b308f55bed97aa48dd 100644 (file)
--- a/source4/dns_server/dns_server.c
+++ b/source4/dns_server/dns_server.c
@@ -657,7 +657,7 @@ static NTSTATUS dns_add_socket(struct dns_server *dns,
 /*
   setup our listening sockets on the configured network interfaces
 */
-static NTSTATUS dns_startup_interfaces(struct dns_server *dns, struct loadparm_context *lp_ctx,
+static NTSTATUS dns_startup_interfaces(struct dns_server *dns,
                                       struct interface *ifaces)
 {
        const struct model_ops *model_ops;
@@ -687,8 +687,8 @@ static NTSTATUS dns_startup_interfaces(struct dns_server *dns, struct loadparm_c
                        NT_STATUS_NOT_OK_RETURN(status);
                }
        } else {
-               const char **wcard;
-               wcard = iface_list_wildcard(tmp_ctx, lp_ctx);
+               char **wcard;
+               wcard = iface_list_wildcard(tmp_ctx);
                if (wcard == NULL) {
                        DEBUG(0, ("No wildcard address available\n"));
                        return NT_STATUS_INTERNAL_ERROR;
@@ -891,7 +891,7 @@ static void dns_task_init(struct task_server *task)
                DLIST_ADD_END(dns->zones, z, NULL);
        }
 
-       status = dns_startup_interfaces(dns, task->lp_ctx, ifaces);
+       status = dns_startup_interfaces(dns, ifaces);
        if (!NT_STATUS_IS_OK(status)) {
                task_server_terminate(task, "dns failed to setup interfaces", true);
                return;

diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index 498ee4d6b404824210e565f02e741a911ed313a4..346b9014c16eee3e936b61b60e9c2221e756ba2e 100644 (file)
--- a/source4/kdc/kdc.c
+++ b/source4/kdc/kdc.c
@@ -733,7 +733,7 @@ static NTSTATUS kdc_startup_interfaces(struct kdc_server *kdc, struct loadparm_c
        /* if we are allowing incoming packets from any address, then
           we need to bind to the wildcard address */
        if (!lpcfg_bind_interfaces_only(lp_ctx)) {
-               const char **wcard = iface_list_wildcard(kdc, lp_ctx);
+               char **wcard = iface_list_wildcard(kdc);
                NT_STATUS_HAVE_NO_MEMORY(wcard);
                for (i=0; wcard[i]; i++) {
                        if (kdc_port) {

diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index 0c0becae13641783a315def26a5b531d62f15000..99595ebd12ae2122fd7c25bda5a891898bc6a989 100644 (file)
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -962,9 +962,9 @@ static void ldapsrv_task_init(struct task_server *task)
                        if (!NT_STATUS_IS_OK(status)) goto failed;
                }
        } else {
-               const char **wcard;
+               char **wcard;
                int i;
-               wcard = iface_list_wildcard(task, task->lp_ctx);
+               wcard = iface_list_wildcard(task);
                if (wcard == NULL) {
                        DEBUG(0,("No wildcard addresses available\n"));
                        goto failed;

diff --git a/source4/lib/socket/interface.c b/source4/lib/socket/interface.c
index cdfadc9953c7ea4ca272456931f25ee7f0e2c285..504a7277e32206b700453cf32ee39b7defc4340d 100644 (file)
--- a/source4/lib/socket/interface.c
+++ b/source4/lib/socket/interface.c
@@ -503,7 +503,7 @@ bool iface_list_same_net(const char *ip1, const char *ip2, const char *netmask)
    return the list of wildcard interfaces
    this will include the IPv4 0.0.0.0, and may include IPv6 ::
 */
-const char **iface_list_wildcard(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
+char **iface_list_wildcard(TALLOC_CTX *mem_ctx)
 {
        char **ret;
 #ifdef HAVE_IPV6
@@ -511,5 +511,5 @@ const char **iface_list_wildcard(TALLOC_CTX *mem_ctx, struct loadparm_context *l
 #else
        ret = str_list_make(mem_ctx, "0.0.0.0", NULL);
 #endif
-       return discard_const_p(const char *, ret);
+       return ret;
 }

diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index fb652c5064928d938f40de7aef3a9617ddb890bb..a4afde0f19c69f1d3d726e791583b90a8e7a2438 100644 (file)
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -1824,9 +1824,9 @@ static NTSTATUS dcesrv_add_ep_tcp(struct dcesrv_context *dce_ctx,
                        NT_STATUS_NOT_OK_RETURN(status);
                }
        } else {
-               const char **wcard;
+               char **wcard;
                int i;
-               wcard = iface_list_wildcard(dce_ctx, lp_ctx);
+               wcard = iface_list_wildcard(dce_ctx);
                NT_STATUS_HAVE_NO_MEMORY(wcard);
                for (i=0; wcard[i]; i++) {
                        status = add_socket_rpc_tcp_iface(dce_ctx, e, event_ctx, model_ops, wcard[i]);

diff --git a/source4/smb_server/service_smb.c b/source4/smb_server/service_smb.c
index 958792e8a7997ce97cdaa474eda1a475812cd906..0e4897c735878e14811a99fc7e77026f6cd2e949 100644 (file)
--- a/source4/smb_server/service_smb.c
+++ b/source4/smb_server/service_smb.c
@@ -63,9 +63,9 @@ static void smbsrv_task_init(struct task_server *task)
                        if (!NT_STATUS_IS_OK(status)) goto failed;
                }
        } else {
-               const char **wcard;
+               char **wcard;
                int i;
-               wcard = iface_list_wildcard(task, task->lp_ctx);
+               wcard = iface_list_wildcard(task);
                if (wcard == NULL) {
                        DEBUG(0,("No wildcard addresses available\n"));
                        goto failed;

diff --git a/source4/web_server/web_server.c b/source4/web_server/web_server.c
index 239612a6bdabd0186bc834ef64ae4450decf3f01..0339b5566188ac1512e69da6a2ebe47f77f99021 100644 (file)
--- a/source4/web_server/web_server.c
+++ b/source4/web_server/web_server.c
@@ -336,9 +336,9 @@ static void websrv_task_init(struct task_server *task)
 
                talloc_free(ifaces);
        } else {
-               const char **wcard;
+               char **wcard;
                int i;
-               wcard = iface_list_wildcard(task, task->lp_ctx);
+               wcard = iface_list_wildcard(task);
                if (wcard == NULL) {
                        DEBUG(0,("No wildcard addresses available\n"));
                        goto failed;