Enable pyrad-based tests

- update a test wrapper to properly handle things that the new libkrad does,
  and add python-pyrad as a build requirement so that we can run its tests
This commit is contained in:
Nalin Dahyabhai 2013-12-19 11:16:19 -05:00
parent 9f2cb9776b
commit 45d93c6d1c
2 changed files with 25 additions and 14 deletions

View File

@ -144,6 +144,9 @@ BuildRequires: net-tools, rpcbind
BuildRequires: hostname BuildRequires: hostname
BuildRequires: iproute BuildRequires: iproute
%endif %endif
%if 0%{?fedora} >= 9
BuildRequires: python-pyrad
%endif
%if %{WITH_LDAP} %if %{WITH_LDAP}
BuildRequires: openldap-devel BuildRequires: openldap-devel
@ -964,6 +967,10 @@ exit 0
%{_sbindir}/uuserver %{_sbindir}/uuserver
%changelog %changelog
* Thu Dec 19 2013 Nalin Dahyabhai <nalin@redhat.com>
- update a test wrapper to properly handle things that the new libkrad does,
and add python-pyrad as a build requirement so that we can run its tests
* Wed Dec 18 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.12-4 * Wed Dec 18 2013 Nalin Dahyabhai <nalin@redhat.com> - 1.12-4
- revise previous patch to initialize one more element - revise previous patch to initialize one more element

View File

@ -87,21 +87,25 @@ sendto(int sockfd, const void *buf, size_t len, int flags,
return next_sendto(sockfd, buf, len, flags, dest_addr, addrlen); return next_sendto(sockfd, buf, len, flags, dest_addr, addrlen);
} }
switch (dest_addr->sa_family) { if (dest_addr != NULL) {
case AF_INET: switch (dest_addr->sa_family) {
port = ntohs(((struct sockaddr_in *)dest_addr)->sin_port); case AF_INET:
if (port_is_okay(port) != 0) { port = ((struct sockaddr_in *)dest_addr)->sin_port;
return -1; port = ntohs(port);
if (port_is_okay(port) != 0) {
return -1;
}
break;
case AF_INET6:
port = ((struct sockaddr_in6 *)dest_addr)->sin6_port;
port = ntohs(port);
if (port_is_okay(port) != 0) {
return -1;
}
break;
default:
break;
} }
break;
case AF_INET6:
port = ntohs(((struct sockaddr_in6 *)dest_addr)->sin6_port);
if (port_is_okay(port) != 0) {
return -1;
}
break;
default:
break;
} }
return next_sendto(sockfd, buf, len, flags, dest_addr, addrlen); return next_sendto(sockfd, buf, len, flags, dest_addr, addrlen);
} }