sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

s3: libsmb: Cleanup - Use samba_sockaddr as intended in resolve_name() to make ugly casts go away.

Browse Source 
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: David Mulder <dmulder@samba.org>
This commit is contained in:
Jeremy Allison 2020-08-24 11:49:25 -07:00
parent a559eebc14
commit 2056b0d9c3
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source3/libsmb/namequery.c
View File

@ -3394,9 +3394,19 @@ bool resolve_name(const char *name,
if (prefer_ipv4) {
for (i=0; i<count; i++) {
if (!is_zero_addr(&ss_list[i].ss) &&
!is_broadcast_addr((struct sockaddr *)(void *)&ss_list[i].ss) &&
(ss_list[i].ss.ss_family == AF_INET)) {
struct samba_sockaddr sa = {0};
bool ok;
ok = sockaddr_storage_to_samba_sockaddr(&sa,
&ss_list[i].ss);
if (!ok) {
SAFE_FREE(ss_list);
TALLOC_FREE(frame);
return false;
}
if (!is_zero_addr(&sa.u.ss) &&
!is_broadcast_addr(&sa.u.sa) &&
(sa.u.ss.ss_family == AF_INET)) {
*return_ss = ss_list[i].ss;
SAFE_FREE(ss_list);
TALLOC_FREE(frame);
@ -3407,8 +3417,18 @@ bool resolve_name(const char *name,
/* only return valid addresses for TCP connections */
for (i=0; i<count; i++) {
if (!is_zero_addr(&ss_list[i].ss) &&
!is_broadcast_addr((struct sockaddr *)(void *)&ss_list[i].ss)) {
struct samba_sockaddr sa = {0};
bool ok;
ok = sockaddr_storage_to_samba_sockaddr(&sa,
&ss_list[i].ss);
if (!ok) {
SAFE_FREE(ss_list);
TALLOC_FREE(frame);
return false;
}
if (!is_zero_addr(&sa.u.ss) &&
!is_broadcast_addr(&sa.u.sa)) {
*return_ss = ss_list[i].ss;
SAFE_FREE(ss_list);
TALLOC_FREE(frame);