Merge branch 'V5-6-patches' into V5-7-patches

* V5-6-patches:
  Use inet_pton onplace of inet_aton to help portability.
diff --git a/agent/mibgroup/disman/nslookup/lookupCtlTable.c b/agent/mibgroup/disman/nslookup/lookupCtlTable.c
index 3048999..0f71da6 100644
--- a/agent/mibgroup/disman/nslookup/lookupCtlTable.c
+++ b/agent/mibgroup/disman/nslookup/lookupCtlTable.c
@@ -530,7 +530,7 @@
         struct in_addr addr_in;
         struct hostent *lookup;
 
-        if (!inet_aton(address, &addr_in)) {
+        if (inet_pton(AF_INET, address, &addr_in) != 1) {
             DEBUGMSGTL(("lookupResultsTable", "Invalid argument: %s\n",
                         address));
             modify_lookupCtlRc(item, 99);