Use standard heimdal function for finding interfaces - libreplace provides support for the underlying functions now.

2 files changed, 1 insertions, 33 deletions

diff --git a/source4/heimdal_build/internal.mk b/source4/heimdal_build/internal.mk
index 85ce6d3ab0..92bef089e4 100644
--- a/source4/heimdal_build/internal.mk
+++ b/source4/heimdal_build/internal.mk
@@ -290,6 +290,7 @@ HEIMDAL_KRB5_OBJ_FILES = \
 	$(heimdalsrcdir)/lib/krb5/free_host_realm.o \
 	$(heimdalsrcdir)/lib/krb5/generate_seq_number.o \
 	$(heimdalsrcdir)/lib/krb5/generate_subkey.o \
+	$(heimdalsrcdir)/lib/krb5/get_addrs.o \
 	$(heimdalsrcdir)/lib/krb5/get_cred.o \
 	$(heimdalsrcdir)/lib/krb5/get_default_principal.o \
 	$(heimdalsrcdir)/lib/krb5/get_default_realm.o \
diff --git a/source4/heimdal_build/krb5-glue.c b/source4/heimdal_build/krb5-glue.c
index b41e3c0271..8a09a91f3e 100644
--- a/source4/heimdal_build/krb5-glue.c
+++ b/source4/heimdal_build/krb5-glue.c
@@ -25,39 +25,6 @@
 #include "lib/socket/netif.h"
 #include "param/param.h"
 
-/**
-  get the list of IP addresses for configured interfaces
-*/
-krb5_error_code KRB5_LIB_FUNCTION krb5_get_all_client_addrs(krb5_context context, krb5_addresses *res)
-{
-	int i;
-	struct interface *ifaces;
-
-	load_interfaces(NULL, lp_interfaces(global_loadparm), &ifaces);
-
-	res->len = iface_count(ifaces);
-	res->val = malloc_array_p(HostAddress, res->len);
-	if (res->val == NULL) {
-		talloc_free(ifaces);
-		return ENOMEM;
-	}
-	for (i=0;i<res->len;i++) {
-		const char *ip = iface_n_ip(ifaces, i);
-		res->val[i].addr_type = AF_INET;
-		res->val[i].address.length = 4;
-		res->val[i].address.data = malloc(4);
-		if (res->val[i].address.data == NULL) {
-			talloc_free(ifaces);
-			return ENOMEM;
-		}
-		((struct in_addr *)res->val[i].address.data)->s_addr = inet_addr(ip);
-	}
-
-	talloc_free(ifaces);
-
-	return 0;
-}
-
 #include "heimdal/lib/krb5/krb5_locl.h"
 
 const krb5_cc_ops krb5_scc_ops = {