mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 03:10:05 +00:00
* sysdeps/posix/getaddrinfo.c: Remove commented-out code.
This commit is contained in:
parent
b7674b1107
commit
b17c265f8f
@ -1,3 +1,7 @@
|
||||
2007-04-18 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* sysdeps/posix/getaddrinfo.c: Remove commented-out code.
|
||||
|
||||
2007-04-17 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
[BZ #4368]
|
||||
|
@ -142,118 +142,6 @@ static const struct addrinfo default_hints =
|
||||
};
|
||||
|
||||
|
||||
#if 0
|
||||
/* Using Unix sockets this way is a security risk. */
|
||||
static int
|
||||
gaih_local (const char *name, const struct gaih_service *service,
|
||||
const struct addrinfo *req, struct addrinfo **pai)
|
||||
{
|
||||
struct utsname utsname;
|
||||
|
||||
if ((name != NULL) && (req->ai_flags & AI_NUMERICHOST))
|
||||
return GAIH_OKIFUNSPEC | -EAI_NONAME;
|
||||
|
||||
if ((name != NULL) || (req->ai_flags & AI_CANONNAME))
|
||||
if (uname (&utsname) < 0)
|
||||
return -EAI_SYSTEM;
|
||||
|
||||
if (name != NULL)
|
||||
{
|
||||
if (strcmp(name, "localhost") &&
|
||||
strcmp(name, "local") &&
|
||||
strcmp(name, "unix") &&
|
||||
strcmp(name, utsname.nodename))
|
||||
return GAIH_OKIFUNSPEC | -EAI_NONAME;
|
||||
}
|
||||
|
||||
if (req->ai_protocol || req->ai_socktype)
|
||||
{
|
||||
const struct gaih_typeproto *tp = gaih_inet_typeproto + 1;
|
||||
|
||||
while (tp->name[0]
|
||||
&& ((tp->protoflag & GAI_PROTO_NOSERVICE) != 0
|
||||
|| (req->ai_socktype != 0 && req->ai_socktype != tp->socktype)
|
||||
|| (req->ai_protocol != 0
|
||||
&& !(tp->protoflag & GAI_PROTO_PROTOANY)
|
||||
&& req->ai_protocol != tp->protocol)))
|
||||
++tp;
|
||||
|
||||
if (! tp->name[0])
|
||||
{
|
||||
if (req->ai_socktype)
|
||||
return GAIH_OKIFUNSPEC | -EAI_SOCKTYPE;
|
||||
else
|
||||
return GAIH_OKIFUNSPEC | -EAI_SERVICE;
|
||||
}
|
||||
}
|
||||
|
||||
*pai = malloc (sizeof (struct addrinfo) + sizeof (struct sockaddr_un)
|
||||
+ ((req->ai_flags & AI_CANONNAME)
|
||||
? (strlen(utsname.nodename) + 1): 0));
|
||||
if (*pai == NULL)
|
||||
return -EAI_MEMORY;
|
||||
|
||||
(*pai)->ai_next = NULL;
|
||||
(*pai)->ai_flags = req->ai_flags;
|
||||
(*pai)->ai_family = AF_LOCAL;
|
||||
(*pai)->ai_socktype = req->ai_socktype ? req->ai_socktype : SOCK_STREAM;
|
||||
(*pai)->ai_protocol = req->ai_protocol;
|
||||
(*pai)->ai_addrlen = sizeof (struct sockaddr_un);
|
||||
(*pai)->ai_addr = (void *) (*pai) + sizeof (struct addrinfo);
|
||||
|
||||
#ifdef _HAVE_SA_LEN
|
||||
((struct sockaddr_un *) (*pai)->ai_addr)->sun_len =
|
||||
sizeof (struct sockaddr_un);
|
||||
#endif /* _HAVE_SA_LEN */
|
||||
|
||||
((struct sockaddr_un *)(*pai)->ai_addr)->sun_family = AF_LOCAL;
|
||||
memset(((struct sockaddr_un *)(*pai)->ai_addr)->sun_path, 0, UNIX_PATH_MAX);
|
||||
|
||||
if (service)
|
||||
{
|
||||
struct sockaddr_un *sunp = (struct sockaddr_un *) (*pai)->ai_addr;
|
||||
|
||||
if (strchr (service->name, '/') != NULL)
|
||||
{
|
||||
if (strlen (service->name) >= sizeof (sunp->sun_path))
|
||||
return GAIH_OKIFUNSPEC | -EAI_SERVICE;
|
||||
|
||||
strcpy (sunp->sun_path, service->name);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (strlen (P_tmpdir "/") + 1 + strlen (service->name) >=
|
||||
sizeof (sunp->sun_path))
|
||||
return GAIH_OKIFUNSPEC | -EAI_SERVICE;
|
||||
|
||||
__stpcpy (__stpcpy (sunp->sun_path, P_tmpdir "/"), service->name);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
/* This is a dangerous use of the interface since there is a time
|
||||
window between the test for the file and the actual creation
|
||||
(done by the caller) in which a file with the same name could
|
||||
be created. */
|
||||
char *buf = ((struct sockaddr_un *) (*pai)->ai_addr)->sun_path;
|
||||
|
||||
if (__builtin_expect (__path_search (buf, L_tmpnam, NULL, NULL, 0),
|
||||
0) != 0
|
||||
|| __builtin_expect (__gen_tempname (buf, __GT_NOCREATE), 0) != 0)
|
||||
return -EAI_SYSTEM;
|
||||
}
|
||||
|
||||
if (req->ai_flags & AI_CANONNAME)
|
||||
(*pai)->ai_canonname = strcpy ((char *) *pai + sizeof (struct addrinfo)
|
||||
+ sizeof (struct sockaddr_un),
|
||||
utsname.nodename);
|
||||
else
|
||||
(*pai)->ai_canonname = NULL;
|
||||
return 0;
|
||||
}
|
||||
#endif /* 0 */
|
||||
|
||||
|
||||
static int
|
||||
gaih_inet_serv (const char *servicename, const struct gaih_typeproto *tp,
|
||||
const struct addrinfo *req, struct gaih_servtuple *st)
|
||||
@ -1105,17 +993,6 @@ gaih_inet (const char *name, const struct gaih_service *service,
|
||||
return 0;
|
||||
}
|
||||
|
||||
#if 0
|
||||
static const struct gaih gaih[] =
|
||||
{
|
||||
{ PF_INET6, gaih_inet },
|
||||
{ PF_INET, gaih_inet },
|
||||
#if 0
|
||||
{ PF_LOCAL, gaih_local },
|
||||
#endif
|
||||
{ PF_UNSPEC, NULL }
|
||||
};
|
||||
#endif
|
||||
|
||||
struct sort_result
|
||||
{
|
||||
@ -1951,58 +1828,6 @@ getaddrinfo (const char *name, const char *service,
|
||||
end = NULL;
|
||||
|
||||
unsigned int naddrs = 0;
|
||||
#if 0
|
||||
/* If we would support more protocols than just IPv4 and IPv6 we
|
||||
would iterate over a table with appropriate callback functions.
|
||||
Since we currently only handle IPv4 and IPv6 this is not
|
||||
necessary. */
|
||||
const struct gaih *g = gaih;
|
||||
const struct gaih *pg = NULL;
|
||||
int j = 0;
|
||||
while (g->gaih)
|
||||
{
|
||||
if (hints->ai_family == g->family || hints->ai_family == AF_UNSPEC)
|
||||
{
|
||||
j++;
|
||||
if (pg == NULL || pg->gaih != g->gaih)
|
||||
{
|
||||
pg = g;
|
||||
i = g->gaih (name, pservice, hints, end, &naddrs);
|
||||
if (i != 0)
|
||||
{
|
||||
/* EAI_NODATA is a more specific result as it says that
|
||||
we found a result but it is not usable. */
|
||||
if (last_i != (GAIH_OKIFUNSPEC | -EAI_NODATA))
|
||||
last_i = i;
|
||||
|
||||
if (hints->ai_family == AF_UNSPEC && (i & GAIH_OKIFUNSPEC))
|
||||
{
|
||||
++g;
|
||||
continue;
|
||||
}
|
||||
|
||||
freeaddrinfo (p);
|
||||
free (in6ai);
|
||||
|
||||
return -(i & GAIH_EAI);
|
||||
}
|
||||
if (end)
|
||||
while (*end)
|
||||
{
|
||||
end = &((*end)->ai_next);
|
||||
++nresults;
|
||||
}
|
||||
}
|
||||
}
|
||||
++g;
|
||||
}
|
||||
|
||||
if (j == 0)
|
||||
{
|
||||
free (in6ai);
|
||||
return EAI_FAMILY;
|
||||
}
|
||||
#else
|
||||
if (hints->ai_family == AF_UNSPEC || hints->ai_family == AF_INET
|
||||
|| hints->ai_family == AF_INET6)
|
||||
{
|
||||
@ -2026,7 +1851,6 @@ getaddrinfo (const char *name, const char *service,
|
||||
free (in6ai);
|
||||
return EAI_FAMILY;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (naddrs > 1)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user