sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-29 16:23:52 +03:00
Code Activity

Move the horrible hack for link local addresses out of namequery.c

Browse Source 
and into util_sock.c. is_ipaddress() now copes with link:local:v6%ifname
addresses, as does interpret_string_addr().
Jeremy
This commit is contained in:
Jeremy Allison
2007-10-26 16:03:20 -07:00
parent 4b3635d6bc
commit a3f7db3d30
2 changed files with 51 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/libsmb/namequery.c
View File

@@ -1594,32 +1594,6 @@ bool resolve_name(const char *name,
char *sitename = NULL;
int count = 0;
#if defined(HAVE_IPV6)
unsigned int if_idx = 0;
const char *p = strchr_m(name, '%');
if (p && (if_idx = if_nametoindex(p+1)) != 0) {
char *newname = SMB_STRDUP(name);
if (!newname) {
return false;
}
newname[PTR_DIFF(p,name)] = '\0';
if (is_ipaddress(newname) &&
interpret_string_addr(return_ss,
newname, AI_NUMERICHOST)) {
struct sockaddr_in6 *psa6 =
(struct sockaddr_in6 *)&return_ss;
if (psa6->sin6_scope_id == 0 &&
IN6_IS_ADDR_LINKLOCAL(&psa6->sin6_addr)) {
psa6->sin6_scope_id = if_idx;
}
SAFE_FREE(newname);
return true;
}
SAFE_FREE(newname);
}
#endif
if (is_ipaddress(name)) {
return interpret_string_addr(return_ss, name, AI_NUMERICHOST);
}