sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

Fix %I macro expansion for IPv4 mapped IPv6 addresses.

Browse Source 
On some systems (linux e.g.), when listening on ipv6 and ipv4,
addresses of ipv4 clients are printed as mapped ipv4 addresses
by getnameinfo (e.g. ::ffff:127.0.0.1). This re-establishes
the original behaviour of %I to expand to the plain ipv4 address
for an ipv4 client.

Michael
(This used to be commit 0abc8863f8)
This commit is contained in:
Michael Adam 2008-03-13 23:02:58 +01:00
parent fd62e5688b
commit 21ea0edec8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source3/lib/substitute.c
View File

@ -597,10 +597,16 @@ char *alloc_sub_basic(const char *smb_name, const char *domain_name,
}
a_string = realloc_string_sub(a_string, "%D", r);
break;
case 'I' :
case 'I' : {
int offset = 0;
client_addr(get_client_fd(), addr, sizeof(addr));
if (strnequal(addr,"::ffff:",7)) {
offset = 7;
}
a_string = realloc_string_sub(a_string, "%I",
client_addr(get_client_fd(),addr, sizeof(addr)));
addr + offset);
break;
}
case 'i':
a_string = realloc_string_sub( a_string, "%i",
client_socket_addr(get_client_fd(), addr, sizeof(addr)) );