From c8c3f0c608aa1b11717f1da6793ac9ca0d38a14f Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 9 Feb 2012 12:54:24 +1100 Subject: lib/util: Remove unused sys_gethostbyname() Found by callcatcher. Andrew Bartlett --- lib/util/samba_util.h | 6 ------ lib/util/system.c | 42 ------------------------------------------ 2 files changed, 48 deletions(-) (limited to 'lib/util') diff --git a/lib/util/samba_util.h b/lib/util/samba_util.h index 8e8e7c1abd..56dbc059d8 100644 --- a/lib/util/samba_util.h +++ b/lib/util/samba_util.h @@ -117,12 +117,6 @@ void CatchChildLeaveStatus(void); void *sys_memalign( size_t align, size_t size ); -/************************************************************************** -A wrapper for gethostbyname() that tries avoids looking up hostnames -in the root domain, which can cause dial-on-demand links to come up for no -apparent reason. -****************************************************************************/ -_PUBLIC_ struct hostent *sys_gethostbyname(const char *name); _PUBLIC_ struct in_addr sys_inet_makeaddr(int net, int host); /** diff --git a/lib/util/system.c b/lib/util/system.c index 1e80f1a88a..3783e3243c 100644 --- a/lib/util/system.c +++ b/lib/util/system.c @@ -75,48 +75,6 @@ void *sys_memalign( size_t align, size_t size ) #endif } -/************************************************************************** -A wrapper for gethostbyname() that tries avoids looking up hostnames -in the root domain, which can cause dial-on-demand links to come up for no -apparent reason. -****************************************************************************/ - -_PUBLIC_ struct hostent *sys_gethostbyname(const char *name) -{ -#ifdef REDUCE_ROOT_DNS_LOOKUPS - char query[256], hostname[256]; - char *domain; - - /* Does this name have any dots in it? If so, make no change */ - - if (strchr(name, '.')) - return(gethostbyname(name)); - - /* Get my hostname, which should have domain name - attached. If not, just do the gethostname on the - original string. - */ - - gethostname(hostname, sizeof(hostname) - 1); - hostname[sizeof(hostname) - 1] = 0; - if ((domain = strchr(hostname, '.')) == NULL) - return(gethostbyname(name)); - - /* Attach domain name to query and do modified query. - If names too large, just do gethostname on the - original string. - */ - - if((strlen(name) + strlen(domain)) >= sizeof(query)) - return(gethostbyname(name)); - - slprintf(query, sizeof(query)-1, "%s%s", name, domain); - return(gethostbyname(query)); -#else /* REDUCE_ROOT_DNS_LOOKUPS */ - return(gethostbyname(name)); -#endif /* REDUCE_ROOT_DNS_LOOKUPS */ -} - _PUBLIC_ struct in_addr sys_inet_makeaddr(int net, int host) { struct in_addr in; -- cgit