Merge netipsec/key.c:1.17 into KAME pfkey implementation:

date: 2004/09/26 02:01:27;  author: sam;  state: Exp;  lines: +0 -5
  Correct handling of SADB_UPDATE and SADB_ADD requests.  key_align may
  split the mbuf due to use of m_pulldown.  Discarding the result because
  of this does not make sense as no subsequent code depends on the entire
  msg being linearized (only the individual pieces).  It's likely
  something else is wrong here but for now this appears to get things back
  to a working state.

  Submitted by:   Roselyn Lee

This change was also made in the KAME CVS repository as key.c:1.337 by
itojun.
This commit is contained in:
Robert Watson 2004-09-30 00:49:55 +00:00
parent 34ed91b45b
commit dbfb9a4ee6

View file

@ -6952,11 +6952,6 @@ key_parse(m, so)
if (error)
return error;
if (m->m_next) { /*XXX*/
m_freem(m);
return ENOBUFS;
}
msg = mh.msg;
/* check SA type */