summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2007-11-13 14:39:14 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2007-11-13 14:39:14 (GMT)
commita4ad9e9083662f62f8f3df8f9901a114be5cbf24 (patch)
treed1972ae9fb8411771a5ca0f5d5a6f44025f6ab44
parent14dffaee29a638e2bb45cb3a9d747315b1fd9f74 (diff)
downloadtcl-a4ad9e9083662f62f8f3df8f9901a114be5cbf24.zip
tcl-a4ad9e9083662f62f8f3df8f9901a114be5cbf24.tar.gz
tcl-a4ad9e9083662f62f8f3df8f9901a114be5cbf24.tar.bz2
The six-argument form of getaddressbyname_r() uses the fifth argument to
indicate whether the lookup succeeded or not on at least one platform. [Bug 1618235]
-rw-r--r--ChangeLog6
-rw-r--r--unix/tclUnixCompat.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 117f812..354f9f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-13 Donal K. Fellows <donal.k.fellows@man.ac.uk>
+
+ * unix/tclUnixCompat.c (TclpGetHostByName): The six-argument form of
+ getaddressbyname_r() uses the fifth argument to indicate whether the
+ lookup succeeded or not on at least one platform. [Bug 1618235]
+
2007-10-30 Donal K. Fellows <donal.k.fellows@man.ac.uk>
* generic/regc_lex.c (lexescape): Ensure that backreference numbers
diff --git a/unix/tclUnixCompat.c b/unix/tclUnixCompat.c
index 7e419cf..88c87c3 100644
--- a/unix/tclUnixCompat.c
+++ b/unix/tclUnixCompat.c
@@ -6,7 +6,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclUnixCompat.c,v 1.1.2.10 2006/09/12 22:05:03 andreas_kupries Exp $
+ * RCS: @(#) $Id: tclUnixCompat.c,v 1.1.2.11 2007/11/13 14:39:15 dkf Exp $
*
*/
@@ -588,7 +588,7 @@ TclpGetHostByName(const char *name)
int h_errno;
return (gethostbyname_r(name, &tsdPtr->hent, tsdPtr->hbuf,
sizeof(tsdPtr->hbuf), &hePtr, &h_errno) == 0) ?
- &tsdPtr->hent : NULL;
+ &hePtr : NULL;
#elif defined(HAVE_GETHOSTBYNAME_R_3)
struct hostent_data data;