From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Thu, 16 Aug 2012 13:54:51 +0000 (+0000)
Subject: Merge of fixes from branch_3_2
X-Git-Tag: merge_32_head_take_4_after~1
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=9ee30adf864f401909219846014377fdf74ce3d3;p=jra1mw.git

Merge of fixes from branch_3_2
---

diff --git a/org.glite.lb.server/src/bkserverd.c b/org.glite.lb.server/src/bkserverd.c
index 16e801b..70b8034 100644
--- a/org.glite.lb.server/src/bkserverd.c
+++ b/org.glite.lb.server/src/bkserverd.c
@@ -1835,6 +1835,7 @@ void callback_ares_getnameinfo(void *arg, int status, char *node, char *service)
 			arp->err = NO_DATA;
 		}
 		break;
+	    case ARES_ENODATA:
 	    case ARES_EBADNAME:
 	    case ARES_ENOTFOUND:
 		arp->err = HOST_NOT_FOUND;
diff --git a/org.glite.lbjp-common.gss/src/glite_gss.c b/org.glite.lbjp-common.gss/src/glite_gss.c
index 57792a6..eae4691 100644
--- a/org.glite.lbjp-common.gss/src/glite_gss.c
+++ b/org.glite.lbjp-common.gss/src/glite_gss.c
@@ -156,6 +156,7 @@ static void callback_ares_gethostbyname(void *arg, int status, struct hostent *h
 			arp->ent->h_length = h->h_length;
 			arp->err = NETDB_SUCCESS;
 		break;
+	    case ARES_ENODATA:
 	    case ARES_EBADNAME:
 	    case ARES_ENOTFOUND:
 		arp->err = HOST_NOT_FOUND;