From: Ken Raeburn <raeburn@mit.edu>
Date: Tue, 9 Oct 2007 00:36:13 +0000 (+0000)
Subject: Log port number with IPV6_V6ONLY socket option status.
X-Git-Tag: krb5-1.7-alpha1~814
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=45d956f881838042bd62299f35e6595ebc464a81;p=krb5.git

Log port number with IPV6_V6ONLY socket option status.
Recognize and ignore Appletalk address type.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20108 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/kdc/network.c b/src/kdc/network.c
index 20a0bd50c..86fa6c0ce 100644
--- a/src/kdc/network.c
+++ b/src/kdc/network.c
@@ -403,9 +403,11 @@ setup_a_tcp_listener(struct socksetup *data, struct sockaddr *addr)
     if (addr->sa_family == AF_INET6) {
 #ifdef IPV6_V6ONLY
 	if (setv6only(sock, 1))
-	    com_err(data->prog, errno, "setsockopt(IPV6_V6ONLY,1) failed");
+	    com_err(data->prog, errno, "setsockopt(%d,IPV6_V6ONLY,1) failed",
+		    sock);
 	else
-	    com_err(data->prog, 0, "setsockopt(IPV6_V6ONLY,1) worked");
+	    com_err(data->prog, 0, "setsockopt(%d,IPV6_V6ONLY,1) worked",
+		    sock);
 #else
 	krb5_klog_syslog(LOG_INFO, "no IPV6_V6ONLY socket option support");
 #endif /* IPV6_V6ONLY */
@@ -596,9 +598,11 @@ setup_udp_port_1(struct socksetup *data, struct sockaddr *addr,
 	if (addr->sa_family == AF_INET6) {
 #ifdef IPV6_V6ONLY
 	    if (setv6only(sock, 1))
-		com_err(data->prog, errno, "setsockopt(IPV6_V6ONLY,1) failed");
+		com_err(data->prog, errno,
+			"setsockopt(%d,IPV6_V6ONLY,1) failed", sock);
 	    else
-		com_err(data->prog, 0, "setsockopt(IPV6_V6ONLY,1) worked");
+		com_err(data->prog, 0, "setsockopt(%d,IPV6_V6ONLY,1) worked",
+			sock);
 #else
 	    krb5_klog_syslog(LOG_INFO, "no IPV6_V6ONLY socket option support");
 #endif /* IPV6_V6ONLY */
@@ -683,6 +687,10 @@ setup_udp_port(void *P_data, struct sockaddr *addr)
 #ifdef AF_DLI /* Direct Link Interface - DEC Ultrix/OSF1 link layer? */
     case AF_DLI:
 	return 0;
+#endif
+#ifdef AF_APPLETALK
+    case AF_APPLETALK:
+	return 0;
 #endif
     default:
 	krb5_klog_syslog (LOG_INFO,