diff options
author | Shawn Routhier <sar@isc.org> | 2011-02-18 19:16:04 +0000 |
---|---|---|
committer | Shawn Routhier <sar@isc.org> | 2011-02-18 19:16:04 +0000 |
commit | be7c55ab02d982c3104584b4b49cfd0b0378d4eb (patch) | |
tree | 679630af7fc77e798de591f2ffa0d5708e07edd3 | |
parent | 2bce58a74344bd782c4cfcd0ae0c1b79f115b7f4 (diff) | |
download | isc-dhcp-be7c55ab02d982c3104584b4b49cfd0b0378d4eb.tar.gz |
Modify the dlpi code to accept getmsg() returning a positive value.
[ISC-Bugs #22824]
-rw-r--r-- | RELNOTES | 3 | ||||
-rw-r--r-- | common/dlpi.c | 13 |
2 files changed, 5 insertions, 11 deletions
@@ -60,6 +60,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.0 - 'get-host-names true;' now also works even if 'use-host-decl-names true;' diff --git a/common/dlpi.c b/common/dlpi.c index 002480ff..4700cf51 100644 --- a/common/dlpi.c +++ b/common/dlpi.c @@ -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; } |