mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-09 02:52:04 +08:00
Don't choke if gethostby{name,addr}_r's number of arguments differ
from what the current code can handle.
This commit is contained in:
parent
8895f5d071
commit
5b83a959d2
@ -42,6 +42,17 @@
|
|||||||
# define USE_CTIME_R
|
# define USE_CTIME_R
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(HAVE_GETHOSTBYNAME_R) && \
|
||||||
|
(GETHOSTBYNAME_R_NARGS > 6 || GETHOSTBYNAME_R_NARGS < 5)
|
||||||
|
/* Don't know how to handle this version, pretend it's not there */
|
||||||
|
# undef HAVE_GETHOSTBYNAME_R
|
||||||
|
#endif
|
||||||
|
#if defined(HAVE_GETHOSTBYADDR_R) && \
|
||||||
|
(GETHOSTBYADDR_R_NARGS > 8 || GETHOSTBYADDR_R_NARGS < 7)
|
||||||
|
/* Don't know how to handle this version, pretend it's not there */
|
||||||
|
# undef HAVE_GETHOSTBYADDR_R
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef LDAP_R_COMPILE
|
#ifdef LDAP_R_COMPILE
|
||||||
# ifndef USE_CTIME_R
|
# ifndef USE_CTIME_R
|
||||||
static ldap_pvt_thread_mutex_t ldap_int_ctime_mutex;
|
static ldap_pvt_thread_mutex_t ldap_int_ctime_mutex;
|
||||||
@ -92,10 +103,6 @@ int ldap_pvt_gethostbyname_a(
|
|||||||
{
|
{
|
||||||
#if defined( HAVE_GETHOSTBYNAME_R )
|
#if defined( HAVE_GETHOSTBYNAME_R )
|
||||||
|
|
||||||
# if (GETHOSTBYNAME_R_NARGS > 6) || (GETHOSTBYNAME_R_NARGS < 5)
|
|
||||||
Ouch! gethostbyname_r() must have either 5 or 6 args
|
|
||||||
#endif
|
|
||||||
|
|
||||||
# define NEED_SAFE_REALLOC 1
|
# define NEED_SAFE_REALLOC 1
|
||||||
int r=-1;
|
int r=-1;
|
||||||
int buflen=BUFSTART;
|
int buflen=BUFSTART;
|
||||||
@ -175,10 +182,6 @@ int ldap_pvt_gethostbyaddr_a(
|
|||||||
{
|
{
|
||||||
#if defined( HAVE_GETHOSTBYADDR_R )
|
#if defined( HAVE_GETHOSTBYADDR_R )
|
||||||
|
|
||||||
#if (GETHOSTBYADDR_R_NARGS > 8) || (GETHOSTBYADDR_R_NARGS < 7)
|
|
||||||
Ouch! gethostbyaddr_r() must have either 7 or 8 args
|
|
||||||
#endif
|
|
||||||
|
|
||||||
# undef NEED_SAFE_REALLOC
|
# undef NEED_SAFE_REALLOC
|
||||||
# define NEED_SAFE_REALLOC
|
# define NEED_SAFE_REALLOC
|
||||||
int r=-1;
|
int r=-1;
|
||||||
|
Loading…
Reference in New Issue
Block a user