svn rev #23441: trunk/src/ kadmin/server/ kdc/
raeburn@MIT.EDU
raeburn at MIT.EDU
Wed Dec 2 21:35:21 EST 2009
http://src.mit.edu/fisheye/changelog/krb5/?cs=23441
Commit By: raeburn
Log Message:
Reformat new comments.
Changed Files:
U trunk/src/kadmin/server/network.c
U trunk/src/kdc/network.c
Modified: trunk/src/kadmin/server/network.c
===================================================================
--- trunk/src/kadmin/server/network.c 2009-12-03 02:17:28 UTC (rev 23440)
+++ trunk/src/kadmin/server/network.c 2009-12-03 02:35:21 UTC (rev 23441)
@@ -1146,13 +1146,15 @@
}
}
-/* This holds whatever additional information might be needed to
- properly send back to the client from the correct local address.
+/*
+ * This holds whatever additional information might be needed to
+ * properly send back to the client from the correct local address.
+ *
+ * In this case, we only need one datum so far: On Mac OS X, the
+ * kernel doesn't seem to like sending from link-local addresses
+ * unless we specify the correct interface.
+ */
- In this case, we only need one datum so far: On Mac OS X, the
- kernel doesn't seem to like sending from link-local addresses
- unless we specify the correct interface. */
-
union aux_addressing_info {
int ipv6_ifindex;
};
@@ -1308,12 +1310,14 @@
struct in6_pktinfo *p = (struct in6_pktinfo *)CMSG_DATA(cmsgptr);
const struct sockaddr_in6 *from6 = (const struct sockaddr_in6 *)from;
p->ipi6_addr = from6->sin6_addr;
- /* Because of the possibility of asymmetric routing, we
- normally don't want to specify an interface. However,
- Mac OS X doesn't like sending from a link-local address
- (which can come up in testing at least, if you wind up
- with a "foo.local" name) unless we do specify the
- interface. */
+ /*
+ * Because of the possibility of asymmetric routing, we
+ * normally don't want to specify an interface. However,
+ * Mac OS X doesn't like sending from a link-local address
+ * (which can come up in testing at least, if you wind up
+ * with a "foo.local" name) unless we do specify the
+ * interface.
+ */
if (IN6_IS_ADDR_LINKLOCAL(&from6->sin6_addr))
p->ipi6_ifindex = auxaddr->ipv6_ifindex;
/* otherwise, already zero */
@@ -1460,8 +1464,10 @@
(struct sockaddr *)&daddr, daddr_len,
&auxaddr);
if (cc == -1) {
- /* Note that the local address (daddr*) has no port number
- info associated with it. */
+ /*
+ * Note that the local address (daddr*) has no port number
+ * info associated with it.
+ */
char saddrbuf[NI_MAXHOST], sportbuf[NI_MAXSERV];
char daddrbuf[NI_MAXHOST];
int e = errno;
Modified: trunk/src/kdc/network.c
===================================================================
--- trunk/src/kdc/network.c 2009-12-03 02:17:28 UTC (rev 23440)
+++ trunk/src/kdc/network.c 2009-12-03 02:35:21 UTC (rev 23441)
@@ -1003,13 +1003,15 @@
}
}
-/* This holds whatever additional information might be needed to
- properly send back to the client from the correct local address.
+/*
+ * This holds whatever additional information might be needed to
+ * properly send back to the client from the correct local address.
+ *
+ * In this case, we only need one datum so far: On Mac OS X, the
+ * kernel doesn't seem to like sending from link-local addresses
+ * unless we specify the correct interface.
+ */
- In this case, we only need one datum so far: On Mac OS X, the
- kernel doesn't seem to like sending from link-local addresses
- unless we specify the correct interface. */
-
union aux_addressing_info {
int ipv6_ifindex;
};
@@ -1164,12 +1166,14 @@
struct in6_pktinfo *p = (struct in6_pktinfo *)CMSG_DATA(cmsgptr);
const struct sockaddr_in6 *from6 = (const struct sockaddr_in6 *)from;
p->ipi6_addr = from6->sin6_addr;
- /* Because of the possibility of asymmetric routing, we
- normally don't want to specify an interface. However,
- Mac OS X doesn't like sending from a link-local address
- (which can come up in testing at least, if you wind up
- with a "foo.local" name) unless we do specify the
- interface. */
+ /*
+ * Because of the possibility of asymmetric routing, we
+ * normally don't want to specify an interface. However,
+ * Mac OS X doesn't like sending from a link-local address
+ * (which can come up in testing at least, if you wind up
+ * with a "foo.local" name) unless we do specify the
+ * interface.
+ */
if (IN6_IS_ADDR_LINKLOCAL(&from6->sin6_addr))
p->ipi6_ifindex = auxaddr->ipv6_ifindex;
/* otherwise, already zero */
@@ -1288,8 +1292,10 @@
(struct sockaddr *)&daddr, daddr_len,
&auxaddr);
if (cc == -1) {
- /* Note that the local address (daddr*) has no port number
- info associated with it. */
+ /*
+ * Note that the local address (daddr*) has no port number
+ * info associated with it.
+ */
char saddrbuf[NI_MAXHOST], sportbuf[NI_MAXSERV];
char daddrbuf[NI_MAXHOST];
int e = errno;
More information about the cvs-krb5
mailing list