(match_local_auth): handle ai_canonname being set in any of the addresses
returnedby getaddrinfo. glibc apparently returns the reverse lookup of every address in ai_canonname. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7759 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska H<>gskolan
|
* Copyright (c) 1995 - 2000 Kungliga Tekniska H<>gskolan
|
||||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
@@ -564,6 +564,7 @@ match_local_auth (Xauth* auth, struct addrinfo *ai, int disp_nr)
|
|||||||
{
|
{
|
||||||
int auth_disp;
|
int auth_disp;
|
||||||
char *tmp_disp;
|
char *tmp_disp;
|
||||||
|
struct addrinfo *a;
|
||||||
|
|
||||||
tmp_disp = strndup (auth->number, auth->number_length);
|
tmp_disp = strndup (auth->number, auth->number_length);
|
||||||
if (tmp_disp == NULL)
|
if (tmp_disp == NULL)
|
||||||
@@ -572,13 +573,15 @@ match_local_auth (Xauth* auth, struct addrinfo *ai, int disp_nr)
|
|||||||
free (tmp_disp);
|
free (tmp_disp);
|
||||||
if (auth_disp != disp_nr)
|
if (auth_disp != disp_nr)
|
||||||
return 1;
|
return 1;
|
||||||
if ((auth->family == FamilyLocal
|
for (a = ai; a != NULL; a = a->ai_next) {
|
||||||
|| auth->family == FamilyWild)
|
if ((auth->family == FamilyLocal
|
||||||
&& ai->ai_canonname != NULL
|
|| auth->family == FamilyWild)
|
||||||
&& strncmp (auth->address,
|
&& a->ai_canonname != NULL
|
||||||
ai->ai_canonname,
|
&& strncmp (auth->address,
|
||||||
auth->address_length) == 0)
|
a->ai_canonname,
|
||||||
|
auth->address_length) == 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
}
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user