svn commit: r235124 - stable/9/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Mon May  7 10:50:26 2012
New Revision: 235124
URL: http://svn.freebsd.org/changeset/base/235124

Log:
  MFC r234951:
  
  Fix another RFC 6458 issue. Spotted by Irene Ruengeler.

Modified:
  stable/9/sys/netinet/sctp_output.c
  stable/9/sys/netinet/sctp_uio.h
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netinet/sctp_output.c
==============================================================================
--- stable/9/sys/netinet/sctp_output.c	Mon May  7 10:46:26 2012	(r235123)
+++ stable/9/sys/netinet/sctp_output.c	Mon May  7 10:50:26 2012	(r235124)
@@ -3430,7 +3430,7 @@ sctp_find_cmsg(int c_type, void *data, s
 					}
 					m_copydata(control, at + CMSG_ALIGN(sizeof(struct cmsghdr)), sizeof(struct sctp_authinfo), (caddr_t)&authinfo);
 					sndrcvinfo->sinfo_keynumber_valid = 1;
-					sndrcvinfo->sinfo_keynumber = authinfo.auth_keyid;
+					sndrcvinfo->sinfo_keynumber = authinfo.auth_keynumber;
 					break;
 				default:
 					return (found);

Modified: stable/9/sys/netinet/sctp_uio.h
==============================================================================
--- stable/9/sys/netinet/sctp_uio.h	Mon May  7 10:46:26 2012	(r235123)
+++ stable/9/sys/netinet/sctp_uio.h	Mon May  7 10:50:26 2012	(r235124)
@@ -169,7 +169,7 @@ struct sctp_default_prinfo {
 };
 
 struct sctp_authinfo {
-	uint16_t auth_keyid;
+	uint16_t auth_keynumber;
 };
 
 struct sctp_rcvinfo {