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

[ISC-Bugs #22824]

diff --git a/RELNOTES b/RELNOTES
index 5bdf94a50aaecbfb938b51d2efab644c11a87ebd..f76f7752788c2f05fd768fd18482e51d98626493 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -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 002480ff647e2124ca7760114a63ac4ab020212c..4700cf51539f23b977620219fb7663d880b0a91f 100644 (file)
--- 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;
        }