Commit c602e7f4 authored by Bodo Möller's avatar Bodo Möller
Browse files

disable caching in BIO_gethostbyname

parent 1fc6d41b
Loading
Loading
Loading
Loading
+6 −0
Original line number Original line Diff line number Diff line
@@ -12,6 +12,12 @@
         *) applies to 0.9.6a/0.9.6b/0.9.6c and 0.9.7
         *) applies to 0.9.6a/0.9.6b/0.9.6c and 0.9.7
         +) applies to 0.9.7 only
         +) applies to 0.9.7 only


  *) Disable caching in BIO_gethostbyname(), directly use gethostbyname()
     instead.  BIO_gethostbyname() does not know what timeouts are
     appropriate, so entries would stay in cache even when they hade
     become invalid.
     [Bodo Moeller; problem pointed out by Rich Salz <rsalz@zolera.com>

  +) New command line and configuration option 'utf8' for the req command.
  +) New command line and configuration option 'utf8' for the req command.
     This allows field values to be specified as UTF8 strings.
     This allows field values to be specified as UTF8 strings.
     [Steve Henson]
     [Steve Henson]
+22 −14
Original line number Original line Diff line number Diff line
@@ -345,13 +345,18 @@ static void ghbn_free(struct hostent *a)


struct hostent *BIO_gethostbyname(const char *name)
struct hostent *BIO_gethostbyname(const char *name)
	{
	{
#if 1
	/* Caching gethostbyname() results forever is wrong,
	 * so we have to let the true gethostbyname() worry about this */
	return gethostbyname(name);
#else
	struct hostent *ret;
	struct hostent *ret;
	int i,lowi=0,j;
	int i,lowi=0,j;
	unsigned long low= (unsigned long)-1;
	unsigned long low= (unsigned long)-1;


/*	return(gethostbyname(name)); */


#if 0 /* It doesn't make sense to use locking here: The function interface
#  if 0
	/* It doesn't make sense to use locking here: The function interface
	 * is not thread-safe, because threads can never be sure when
	 * is not thread-safe, because threads can never be sure when
	 * some other thread destroys the data they were given a pointer to.
	 * some other thread destroys the data they were given a pointer to.
	 */
	 */
@@ -393,7 +398,8 @@ struct hostent *BIO_gethostbyname(const char *name)
			goto end;
			goto end;
		if (j > 128) /* too big to cache */
		if (j > 128) /* too big to cache */
			{
			{
#if 0 /* If we were trying to make this function thread-safe (which
#  if 0
			/* If we were trying to make this function thread-safe (which
			 * is bound to fail), we'd have to give up in this case
			 * is bound to fail), we'd have to give up in this case
			 * (or allocate more memory). */
			 * (or allocate more memory). */
			ret = NULL;
			ret = NULL;
@@ -425,8 +431,10 @@ end:
	CRYPTO_w_unlock(CRYPTO_LOCK_GETHOSTBYNAME);
	CRYPTO_w_unlock(CRYPTO_LOCK_GETHOSTBYNAME);
#  endif
#  endif
	return(ret);
	return(ret);
#endif
	}
	}



int BIO_sock_init(void)
int BIO_sock_init(void)
	{
	{
#ifdef OPENSSL_SYS_WINDOWS
#ifdef OPENSSL_SYS_WINDOWS