Import IPv6 support from squid3-ipv6 branch to 3-HEAD.

[thirdparty/squid.git] / helpers / negotiate_auth / squid_kerb_auth / squid_kerb_auth.c

diff --git a/helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c b/helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c
index fa4b4836cea83d73a64dd5797d4cbed054c822db..e4e2181e8404ebd805cf2f76b5dc0fa128391846 100755 (executable)
--- a/helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c
+++ b/helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c
@@ -78,6 +78,7 @@ static const char *LogTime()
     return buf;
 }
 
+// AYJ: this looks like a duplicate of the lib/gethostname function */
 char *gethost_name(void) {
   char      hostname[MAXHOSTNAMELEN];
   struct addrinfo *hres=NULL, *hres_list;
@@ -89,9 +90,10 @@ char *gethost_name(void) {
       fprintf(stderr, "%s| %s: error while resolving hostname '%s'\n", LogTime(), PROGRAM, hostname);
       return NULL;
     }
-  rc = getaddrinfo(hostname,NULL,NULL,&hres);
+  rc = xgetaddrinfo(hostname,NULL,NULL,&hres);
   if (rc != 0) {
-    fprintf(stderr, "%s| %s: error while resolving hostname with getaddrinfo: %s\n", LogTime(), PROGRAM, gai_strerror(rc));
+    fprintf(stderr, "%s| %s: error while resolving hostname with getaddrinfo: %s\n", LogTime(), PROGRAM, xgai_strerror(rc));
+    xfreeaddrinfo(hres);
     return NULL;
   }
   hres_list=hres;
@@ -100,14 +102,14 @@ char *gethost_name(void) {
     count++;
     hres_list=hres_list->ai_next;
   }
-  rc = getnameinfo (hres->ai_addr, hres->ai_addrlen,hostname, sizeof (hostname), NULL, 0, 0);
+  rc = xgetnameinfo(hres->ai_addr, hres->ai_addrlen,hostname, sizeof (hostname), NULL, 0, 0);
   if (rc != 0) {
-    fprintf(stderr, "%s| %s: error while resolving ip address with getnameinfo: %s\n", LogTime(), PROGRAM, gai_strerror(rc));
-    freeaddrinfo(hres);
+    fprintf(stderr, "%s| %s: error while resolving ip address with getnameinfo: %s\n", LogTime(), PROGRAM, xgai_strerror(rc));
+    xfreeaddrinfo(hres);
     return NULL ;
   }
 
-  freeaddrinfo(hres);
+  xfreeaddrinfo(hres);
   hostname[MAXHOSTNAMELEN]='\0';
   return(strdup(hostname));
 }