diff options
author | Tim Potter <tpot@samba.org> | 2001-06-18 05:42:18 +0000 |
---|---|---|
committer | Tim Potter <tpot@samba.org> | 2001-06-18 05:42:18 +0000 |
commit | 7b01c627c62ef6be519110fcd6cb88c86c5cd0ab (patch) | |
tree | b3f7bfd775a08f67a5fb301f64d7b8a64039e108 /source3/lib/util.c | |
parent | 672f554e76d763347985b2af3e03a426446edc2f (diff) | |
download | samba-7b01c627c62ef6be519110fcd6cb88c86c5cd0ab.tar.gz samba-7b01c627c62ef6be519110fcd6cb88c86c5cd0ab.tar.bz2 samba-7b01c627c62ef6be519110fcd6cb88c86c5cd0ab.zip |
Removed silly Get_Hostbyname() wrapper as DNS names are case-insensitive
and the use of this function only increased timeouts when Samba queries
a broken DNS server.
(This used to be commit 720fea53603b2f99153709e6717ca930ab60ca9f)
Diffstat (limited to 'source3/lib/util.c')
-rw-r--r-- | source3/lib/util.c | 69 |
1 files changed, 4 insertions, 65 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c index b3eef430f1..0c0d3f70a7 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -803,13 +803,13 @@ uint32 interpret_addr(char *str) res = inet_addr(str); } else { /* otherwise assume it's a network name of some sort and use - Get_Hostbyname */ - if ((hp = Get_Hostbyname(str)) == 0) { - DEBUG(3,("Get_Hostbyname: Unknown host. %s\n",str)); + sys_gethostbyname */ + if ((hp = sys_gethostbyname(str)) == 0) { + DEBUG(3,("sys_gethostbyname: Unknown host. %s\n",str)); return 0; } if(hp->h_addr == NULL) { - DEBUG(3,("Get_Hostbyname: host address is invalid for host %s\n",str)); + DEBUG(3,("sys_gethostbyname: host address is invalid for host %s\n",str)); return 0; } putip((char *)&res,(char *)hp->h_addr); @@ -996,67 +996,6 @@ BOOL same_net(struct in_addr ip1,struct in_addr ip2,struct in_addr mask) /**************************************************************************** -a wrapper for gethostbyname() that tries with all lower and all upper case -if the initial name fails -****************************************************************************/ -struct hostent *Get_Hostbyname(const char *name) -{ - char *name2 = strdup(name); - struct hostent *ret; - - if (!name2) - { - DEBUG(0,("Memory allocation error in Get_Hostbyname! panic\n")); - exit(0); - } - - - /* - * This next test is redundent and causes some systems (with - * broken isalnum() calls) problems. - * JRA. - */ - -#if 0 - if (!isalnum(*name2)) - { - free(name2); - return(NULL); - } -#endif /* 0 */ - - ret = sys_gethostbyname(name2); - if (ret != NULL) - { - free(name2); - return(ret); - } - - /* try with all lowercase */ - strlower(name2); - ret = sys_gethostbyname(name2); - if (ret != NULL) - { - free(name2); - return(ret); - } - - /* try with all uppercase */ - strupper(name2); - ret = sys_gethostbyname(name2); - if (ret != NULL) - { - free(name2); - return(ret); - } - - /* nothing works :-( */ - free(name2); - return(NULL); -} - - -/**************************************************************************** check if a process exists. Does this work on all unixes? ****************************************************************************/ |