summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2008-08-19 17:30:30 -0700
committerJeremy Allison <jra@samba.org>2008-08-19 17:30:30 -0700
commitf23a6b7c93a419d70889f06b7b3ab18725399793 (patch)
tree32e368f9960e5d6b07a9127a8134fc1651b94a4a /source3/lib
parent477e6bb40d83dc53829cd8bdbb15ca9759872ca5 (diff)
downloadsamba-f23a6b7c93a419d70889f06b7b3ab18725399793.tar.gz
samba-f23a6b7c93a419d70889f06b7b3ab18725399793.tar.bz2
samba-f23a6b7c93a419d70889f06b7b3ab18725399793.zip
Fix bug 5697 nmbd spins in reload_interfaces when only loopback has an IPv4 address
reported by Ted Percival <ted@midg3t.net>. Jeremy. (This used to be commit ab06efccf31fbc899536d2681a2076e6dfd65b9e)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/interface.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/source3/lib/interface.c b/source3/lib/interface.c
index eb0af9ef34..2e7c2706a0 100644
--- a/source3/lib/interface.c
+++ b/source3/lib/interface.c
@@ -131,15 +131,18 @@ int iface_count(void)
}
/****************************************************************************
- How many interfaces do we have (v4 only) ?
+ How many non-loopback IPv4 interfaces do we have ?
**************************************************************************/
-int iface_count_v4(void)
+int iface_count_v4_nl(void)
{
int ret = 0;
struct interface *i;
for (i=local_interfaces;i;i=i->next) {
+ if (is_loopback_addr(&i->ip)) {
+ continue;
+ }
if (i->ip.ss_family == AF_INET) {
ret++;
}