Index: src/addr.c
===================================================================
--- src/addr.c	(revision 653)
+++ src/addr.c	(working copy)
@@ -381,11 +381,17 @@
 	} else
 #endif
 	{
+	p = (u_char *)&so->sin.sin_addr.s_addr;
 #ifdef HAVE_SOCKADDR_SA_LEN
-		if ((len = sa->sa_len - IP_ADDR_LEN) > IP_ADDR_LEN)
+	len = sa->sa_len - ((void *) p - (void *) sa);
+	/* Handles the special case of sa->sa_len == 0. */
+	if (len < 0)
+		len = 0;
+	else if (len > IP_ADDR_LEN)
+		len = IP_ADDR_LEN;
+#else
+	len = IP_ADDR_LEN;
 #endif
-		len = IP_ADDR_LEN;
-		p = (u_char *)&so->sin.sin_addr.s_addr;
 	}
 	for (n = i = 0; i < len; i++, n += 8) {
 		if (p[i] != 0xff)
Index: src/blob.c
===================================================================
--- src/blob.c	(revision 653)
+++ src/blob.c	(working copy)
@@ -158,7 +158,7 @@
 	for (p = (char *)fmt; *p != '\0'; p++) {
 		if (*p == '%') {
 			p++;
-			if (isdigit((int)*p)) {
+			if (isdigit((int) (unsigned char) *p)) {
 				len = strtol(p, &p, 10);
 			} else if (*p == '*') {
 				len = va_arg(*ap, int);
Index: src/addr-util.c
===================================================================
--- src/addr-util.c	(revision 653)
+++ src/addr-util.c	(working copy)
@@ -174,6 +174,7 @@
 	char *p = dst;
 	int i;
 	
+	cur.len = best.len = 0;
 	if (len < 46)
 		return (NULL);
 	
Index: src/arp-ioctl.c
===================================================================
--- src/arp-ioctl.c	(revision 653)
+++ src/arp-ioctl.c	(working copy)
@@ -383,7 +383,7 @@
 	}
 	return (ret);
 }
-#elif defined(HAVE_NET_RADIX_H)
+#elif defined(HAVE_NET_RADIX_H) && !defined(_AIX)
 /* XXX - Tru64, others? */
 #include <netinet/if_ether.h>
 #include <nlist.h>
Index: src/intf.c
===================================================================
--- src/intf.c	(revision 653)
+++ src/intf.c	(working copy)
@@ -119,12 +119,16 @@
 intf_open(void)
 {
 	intf_t *intf;
+        int one = 1;
 	
 	if ((intf = calloc(1, sizeof(*intf))) != NULL) {
 		intf->fd = intf->fd6 = -1;
 		
 		if ((intf->fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
 			return (intf_close(intf));
+
+                setsockopt(intf->fd, SOL_SOCKET, SO_BROADCAST,
+                    (const char *) &one, sizeof(one));
 #ifdef SIOCGIFNETMASK_IN6
 		if ((intf->fd6 = socket(AF_INET6, SOCK_DGRAM, 0)) < 0) {
 #  ifdef EPROTONOSUPPORT
@@ -276,7 +280,9 @@
 	/* Set interface MTU. */
 	if (entry->intf_mtu != 0) {
 		ifr.ifr_mtu = entry->intf_mtu;
+#ifdef SIOCSIFMTU
 		if (ioctl(intf->fd, SIOCSIFMTU, &ifr) < 0)
+#endif
 			return (-1);
 	}
 	/* Set interface address. */
@@ -388,7 +394,9 @@
 	_intf_set_type(entry);
 	
 	/* Get interface MTU. */
+#ifdef SIOCGIFMTU
 	if (ioctl(intf->fd, SIOCGIFMTU, &ifr) < 0)
+#endif
 		return (-1);
 	entry->intf_mtu = ifr.ifr_mtu;
 
@@ -472,6 +480,7 @@
 _intf_get_aliases(intf_t *intf, struct intf_entry *entry)
 {
 	struct ifreq *ifr, *lifr;
+        struct ifreq tmpifr;
 	struct addr *ap, *lap;
 	char *p;
 	
@@ -492,9 +501,12 @@
 		if ((p = strchr(ifr->ifr_name, ':')) != NULL)
 			*p = '\0';
 		
-		if (strcmp(ifr->ifr_name, entry->intf_name) != 0)
-			continue;
-		
+		if (strcmp(ifr->ifr_name, entry->intf_name) != 0) {
+                    if (p) *p = ':';
+                        continue;
+                }
+	
+                if (p) *p = ':'; /* Fix the name back up */	
 		if (addr_ston(&ifr->ifr_addr, ap) < 0)
 			continue;
 		
@@ -506,6 +518,10 @@
 			if (ap->addr_ip == entry->intf_addr.addr_ip ||
 			    ap->addr_ip == entry->intf_dst_addr.addr_ip)
 				continue;
+                        strlcpy(tmpifr.ifr_name, ifr->ifr_name,
+                            sizeof(tmpifr.ifr_name));
+                        if (ioctl(intf->fd, SIOCGIFNETMASK, &tmpifr) == 0)
+                            addr_stob(&tmpifr.ifr_addr, &ap->addr_bits);
 		}
 #ifdef SIOCGIFNETMASK_IN6
 		else if (ap->addr_type == ADDR_TYPE_IP6 && intf->fd6 != -1) {
@@ -562,7 +578,7 @@
 	intf->ifc.ifc_buf = (caddr_t)intf->ifcbuf;
 	intf->ifc.ifc_len = sizeof(intf->ifcbuf);
 	
-	if (ioctl(intf->fd, SIOCGIFCONF, &intf->ifc) < 0)
+	if (ioctl(intf->fd, SIOCGIFCONF, &intf->ifc) < 0) 
 		return (-1);
 #endif
 	return (_intf_get_aliases(intf, entry));
@@ -571,10 +587,22 @@
 static int
 _match_intf_src(const struct intf_entry *entry, void *arg)
 {
+        int matched = 0;
+        int cnt;
 	struct intf_entry *save = (struct intf_entry *)arg;
 	
 	if (entry->intf_addr.addr_type == ADDR_TYPE_IP &&
-	    entry->intf_addr.addr_ip == save->intf_addr.addr_ip) {
+	    entry->intf_addr.addr_ip == save->intf_addr.addr_ip) 
+            matched = 1;
+
+        for (cnt = 0; !matched && cnt < (int) entry->intf_alias_num; cnt++) {
+            if (entry->intf_alias_addrs[cnt].addr_type != ADDR_TYPE_IP)
+                continue;
+        if (entry->intf_alias_addrs[cnt].addr_ip == save->intf_addr.addr_ip)
+            matched = 1;
+        }
+
+        if (matched) {
 		/* XXX - truncated result if entry is too small. */
 		if (save->intf_len < entry->intf_len)
 			memcpy(save, entry, save->intf_len);
@@ -582,6 +610,7 @@
 			memcpy(save, entry, entry->intf_len);
 		return (1);
 	}
+
 	return (0);
 }
 
@@ -644,8 +673,10 @@
 	intf->ifc.ifc_buf = (caddr_t)intf->ifcbuf;
 	intf->ifc.ifc_len = sizeof(intf->ifcbuf);
 	
-	if (ioctl(intf->fd, SIOCGIFCONF, &intf->ifc) < 0)
+	if (ioctl(intf->fd, SIOCGIFCONF, &intf->ifc) < 0) {
+		fclose(fp);
 		return (-1);
+	}
 
 	ret = 0;
 	while (fgets(buf, sizeof(buf), fp) != NULL) {
@@ -702,14 +733,18 @@
 		if ((p = strchr(ifr->ifr_name, ':')) != NULL)
 			*p = '\0';
 		
-		if (pifr != NULL && strcmp(ifr->ifr_name, pifr->ifr_name) == 0)
+		if (pifr != NULL && strcmp(ifr->ifr_name, pifr->ifr_name) == 0) {
+                    if (p) *p = ':';
 			continue;
+                }
 
 		memset(ebuf, 0, sizeof(ebuf));
 		strlcpy(entry->intf_name, ifr->ifr_name,
 		    sizeof(entry->intf_name));
 		entry->intf_len = sizeof(ebuf);
-		
+	
+                /* Repair the alias name back up. */
+                if (p) *p = ':';	
 		if (_intf_get_noalias(intf, entry) < 0)
 			return (-1);
 		if (_intf_get_aliases(intf, entry) < 0)