r8310: replace the heimdal networking interface scanning code with glue code that uses the Samba

interfaces list. This makes heimdal obey the 'interfaces=' smb.conf option, and should also
fix the portability problems with the heimdal code
(This used to be commit ba621d1c554e135f449a144019b84719a086e04f)

2 files changed, 59 insertions, 4 deletions

diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index aca4589ffe..c0fe33bf9e 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -114,7 +114,6 @@ ADD_OBJ_FILES = \
 	heimdal/lib/krb5/free_host_realm.o \
 	heimdal/lib/krb5/generate_seq_number.o \
 	heimdal/lib/krb5/generate_subkey.o \
-	heimdal/lib/krb5/get_addrs.o \
 	heimdal/lib/krb5/get_cred.o \
 	heimdal/lib/krb5/get_default_principal.o \
 	heimdal/lib/krb5/get_default_realm.o \
@@ -285,13 +284,19 @@ ADD_OBJ_FILES = \
 	heimdal/lib/roken/strlwr.o \
 	heimdal/lib/roken/strsep_copy.o \
 	heimdal/lib/roken/strupr.o \
-	heimdal/lib/roken/strpool.o \
-	heimdal/lib/roken/getifaddrs.o
+	heimdal/lib/roken/strpool.o
 NOPROTO = YES
 # End SUBSYSTEM HEIMDAL_ROKEN
 #######################
 
 #######################
+# Start SUBSYSTEM HEIMDAL_GLUE
+[SUBSYSTEM::HEIMDAL_GLUE]
+ADD_OBJ_FILES = heimdal_build/glue.o
+# End SUBSYSTEM HEIMDAL_GLUE
+#######################
+
+#######################
 # Start SUBSYSTEM HEIMDAL_COM_ERR
 [SUBSYSTEM::HEIMDAL_COM_ERR]
 ADD_OBJ_FILES = \
@@ -377,7 +382,7 @@ NOPROTO = YES
 TARGET_CFLAGS = -Iheimdal_build -Iheimdal/kdc -Iheimdal/lib/des -Iheimdal/lib/roken -Iheimdal/include 
 REQUIRED_SUBSYSTEMS = \
 		HEIMDAL_GSSAPI HEIMDAL_KRB5 \
-		HEIMDAL_ASN1 HEIMDAL_DES HEIMDAL_ROKEN HEIMDAL_COM_ERR
+		HEIMDAL_ASN1 HEIMDAL_DES HEIMDAL_ROKEN HEIMDAL_COM_ERR HEIMDAL_GLUE
 # End SUBSYSTEM HEIMDAL
 #######################
 
diff --git a/source4/heimdal_build/glue.c b/source4/heimdal_build/glue.c
new file mode 100644
index 0000000000..dbfa82ddcf
--- /dev/null
+++ b/source4/heimdal_build/glue.c
@@ -0,0 +1,50 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   provide glue functions between heimdal and samba
+
+   Copyright (C) Andrew Tridgell 2005
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "system/network.h"
+#include "system/kerberos.h"
+
+/*
+  get the list of IP addresses for configured interfaces
+*/
+krb5_error_code krb5_get_all_client_addrs(krb5_context context, krb5_addresses *res)
+{
+	int i;
+	res->len = iface_count();
+	res->val = malloc_array_p(HostAddress, res->len);
+	if (res->val == NULL) {
+		return KRB5_CC_NOMEM;
+	}
+	for (i=0;i<res->len;i++) {
+		const char *ip = iface_n_ip(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) {
+			return KRB5_CC_NOMEM;
+		}
+		((struct in_addr *)res->val[i].address.data)->s_addr = sys_inet_addr(ip);
+	}
+
+	return 0;
+}