qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

* sysdeps/posix/getaddrinfo.c (getaddrinfo): Undo unintended
	changes in last patch.
This commit is contained in:
Ulrich Drepper 2004-02-16 21:00:54 +00:00
parent bf14fb7c60
commit 06877a37ad
2 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2004-02-16 Ulrich Drepper <drepper@redhat.com>
* sysdeps/posix/getaddrinfo.c (getaddrinfo): Undo unintended
changes in last patch.
* posix/regexec.c (transit_state): Fix typo in commented-out code
[BZ #6].

24
sysdeps/posix/getaddrinfo.c
View File

@ -62,14 +62,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define UNIX_PATH_MAX 108
#endif
extern int idna_to_ascii_lz (const char *input, char **output, int flags);
#define IDNA_SUCCESS 0
#ifdef HAVE_LIBIDN
# define SUPPORTED_IDN_FLAGS AI_IDN|AI_CANONIDN
#else
# define SUPPORTED_IDN_FLAGS 0
#endif
struct gaih_service
{
const char *name;
@ -547,18 +539,6 @@ gaih_inet (const char *name, const struct gaih_service *service,
at->scopeid = 0;
at->next = NULL;
#if 0
if (req->ai_flags & AI_IDN)
{
char *p;
rc = idna_to_ascii_lz (name, &p, 0);
if (rc != IDNA_SUCCESS)
return -EAI_IDN_ENCODE;
name = strdupa (p);
free (p);
}
#endif
if (inet_pton (AF_INET, name, at->addr) > 0)
{
if (req->ai_family == AF_UNSPEC || req->ai_family == AF_INET)
@ -1270,10 +1250,10 @@ getaddrinfo (const char *name, const char *service,
if (hints->ai_flags
& ~(AI_PASSIVE|AI_CANONNAME|AI_NUMERICHOST|AI_ADDRCONFIG|AI_V4MAPPED
|SUPPORTED_IDN_FLAGS|AI_ALL))
|AI_ALL))
return EAI_BADFLAGS;
if ((hints->ai_flags & (AI_CANONNAME|AI_CANONIDN)) && name == NULL)
if ((hints->ai_flags & AI_CANONNAME) && name == NULL)
return EAI_BADFLAGS;
if (hints->ai_flags & AI_ADDRCONFIG)