fix non-local IPv4

epel9
Matthias Clasen 19 years ago
parent a6622e1527
commit 66ab15e12f

@ -0,0 +1,52 @@
--- ORBit2-2.14.3/linc2/src/linc-connection.c.non-local-ipv4 2006-09-10 14:43:46.000000000 -0400
+++ ORBit2-2.14.3/linc2/src/linc-connection.c 2006-09-10 14:44:00.000000000 -0400
@@ -495,27 +495,6 @@
CNX_UNLOCK (cnx);
}
-static unsigned long
-get_inet_addr (const char *str)
-{
- struct hostent *hp;
- struct in_addr *addr_ptr;
- unsigned long addr;
-
- if (isdigit (*str)) {
- addr = inet_addr (str);
- } else {
- if ((hp = gethostbyname (str)) != NULL) {
-
- addr_ptr = (struct in_addr *) hp->h_addr;
-
- addr = inet_addr (inet_ntoa (*addr_ptr));
- }
- }
-
- return addr;
-}
-
static gboolean
link_connection_do_initiate (LinkConnection *cnx,
const char *proto_name,
@@ -535,21 +514,6 @@
if (!proto)
return FALSE;
- if (host && (strcmp (proto_name, "IPv4") == 0)) {
-
- const char *local_host;
- local_host = link_get_local_hostname ();
-
- if (strcmp (host, local_host)) {
- unsigned long inet_addr_host, inet_addr_local_host;
- inet_addr_host = get_inet_addr (host);
- inet_addr_local_host = get_inet_addr (local_host);
-
- if (inet_addr_host != inet_addr_local_host)
- return FALSE;
- }
- }
-
saddr = link_protocol_get_sockaddr (
proto, host, service, &saddr_len);

@ -4,7 +4,7 @@
Summary: A high-performance CORBA Object Request Broker
Name: ORBit2
Version: 2.14.3
Release: 2%{?dist}
Release: 3%{?dist}
Source: %{name}-%{version}.tar.bz2
Group: System Environment/Daemons
License: LGPL/GPL
@ -19,6 +19,8 @@ BuildRequires: automake
BuildRequires: gtk-doc
Patch0: ORBit2-2.14.3-multilib.patch
# fixed in upstream cvs
Patch1: ORBit2-2.14.3-non-local-ipv4.patch
%description
ORBit is a high-performance CORBA (Common Object Request Broker
@ -55,6 +57,7 @@ write such programs, you'll also need to install the ORBIT package.
%prep
%setup -q
%patch0 -p1 -b .multilib
%patch1 -p1 -b .non-local-ipv4
%build
## the shipped libtool is broken wrt. multilib
@ -127,6 +130,9 @@ rm -rf %{buildroot}
%{_datadir}/gtk-doc
%changelog
* Sun Sep 10 2006 Matthias Clasen <mclasen@redhat.com> - 2.14.3-3
- Make non-local IPv4 work again
* Tue Sep 5 2006 Matthias Clasen <mclasen@redhat.com> - 2.14.3-2.fc6
- Fix remaining multilib issues (#205228)

Loading…
Cancel
Save