mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-22 18:07:25 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
[ISC-Bugs #22824]
This commit is contained in:
Shawn Routhier 2011-02-18 19:12:50 +00:00
parent 8f95db4168
commit 17a8f0e2b4
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
RELNOTES
View File

@ -207,6 +207,9 @@ work on other platforms. Please report any problems and suggested fixes to
[ISC-Bugs #22888] - Enable the ldap code when buidling common
The above fixes are from Jiri Popelka at Red Hat.
- Modify the dlpi code to accept getmsg() returning a positive value.
[ISC-Bugs #22824]
Changes since 4.2.0b2
- Add declaration for variable in debug code in alloc.c. [ISC-Bugs #21472]

13
common/dlpi.c
View File

@ -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
*
@ -1165,16 +1165,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;
}