Commit 701d179a authored by Shawn Routhier's avatar Shawn Routhier
Browse files

Modify the dlpi code to accept getmsg() returning a positive value.

[ISC-Bugs #22824]
parent 94391203
......@@ -68,6 +68,9 @@ work on other platforms. Please report any problems and suggested fixes to
option. Thanks to a patch from Marius Tomaschewski.
[ISC-Bugs #22055]
- Modify the dlpi code to accept getmsg() returning a positive value.
[ISC-Bugs #22824]
Changes since 4.1-ESV-R1
! In dhclient check the data for some string options for
......
......@@ -3,7 +3,7 @@
Data Link Provider Interface (DLPI) network interface code. */
/*
* Copyright (c) 2009-2010 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 2009-2011 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 2004,2007 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 1996-2003 by Internet Software Consortium
*
......@@ -1162,16 +1162,7 @@ static int dlpiunitdataind (fd, daddr, daddrlen,
result = getmsg (fd, &ctl, &data, &flags);
/*
* The getmsg() manpage says:
*
* "On successful completion, a non-negative value is returned."
*
* This suggests that if MOREDATA or MORECTL are set, we error?
* This seems to be safe as it never seems to happen. Still,
* set a log message, so we know if it ever starts happening.
*/
if (result != 0) {
if (result < 0) {
log_debug("dlpiunitdataind: %m");
return -1;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment