Attachment #337606 for bug #454116




		return 0;
	}
		
	daemon_assert(hp->h_length <= sizeof(sock_addr));
	memcpy(&sock_addr, hp->h_addr, hp->h_length);
    }
#endif


    daemon_assert(s != NULL);

#ifdef INET6
    error = getnameinfo((struct sockaddr *)s, 
                         sizeof(struct sockaddr_storage),
                         addr, 

    } else {
        ret_val = addr;
    }
#else
    ret_val = inet_ntoa(s->sin_addr);
#endif

    return ret_val;
}

Lines 1957-1967 static int ip_equal(const struct sockaddr a, const struct sockaddr b) Link Here

(-)a/src/ftp_session.c (+5 lines)
1957		1957
1958	static int ip_equal(const struct sockaddr a, const struct sockaddr b)	1958	static int ip_equal(const struct sockaddr a, const struct sockaddr b)
1959	{	1959	{
		1960	struct sockaddr aa, bb;
		1961
1960	daemon_assert(a != NULL);	1962	daemon_assert(a != NULL);
1961	daemon_assert(b != NULL);	1963	daemon_assert(b != NULL);
1962	daemon_assert(a->sa_family == AF_INET);	1964	daemon_assert(a->sa_family == AF_INET);
1963	daemon_assert(b->sa_family == AF_INET);	1965	daemon_assert(b->sa_family == AF_INET);
1964		1966
		1967	aa = (struct sockaddr *)a;
		1968	bb = (struct sockaddr *)b;
		1969
1965	if (((struct sockaddr_in *)aa)->sin_addr.s_addr !=	1970	if (((struct sockaddr_in *)aa)->sin_addr.s_addr !=
1966	((struct sockaddr_in *)bb)->sin_addr.s_addr) return 0;	1971	((struct sockaddr_in *)bb)->sin_addr.s_addr) return 0;
1967		1972

Return to bug 454116

Lines 148-154 int ftp_listener_init(ftp_listener_t *f, Link Here

(-)a/src/ftp_listener.c (-5 / +1 lines)
148	return 0;	148	return 0;
149	}	149	}
150		150
151	assert(hp->h_length <= sizeof(sock_addr));	151	daemon_assert(hp->h_length <= sizeof(sock_addr));
152	memcpy(&sock_addr, hp->h_addr, hp->h_length);	152	memcpy(&sock_addr, hp->h_addr, hp->h_length);
153	}	153	}
154	#endif	154	#endif
Lines 489-495 static char addr2string(const struct sockaddr s) Link Here
489		489
490	daemon_assert(s != NULL);	490	daemon_assert(s != NULL);
491		491
492	#ifdef INET6
493	error = getnameinfo((struct sockaddr *)s,	492	error = getnameinfo((struct sockaddr *)s,
494	sizeof(struct sockaddr_storage),	493	sizeof(struct sockaddr_storage),
495	addr,	494	addr,
Lines 503-511 static char addr2string(const struct sockaddr s) Link Here
503	} else {	502	} else {
504	ret_val = addr;	503	ret_val = addr;
505	}	504	}
506	#else
507	ret_val = inet_ntoa(s->sin_addr);
508	#endif
509		505
510	return ret_val;	506	return ret_val;
511	}	507	}