| 1 |
haubi 11/06/29 11:44:04 |
| 2 |
|
| 3 |
Added: find-bug343827.patch |
| 4 |
Log: |
| 5 |
mico-2.3.13-r5: try to find bug#343827 via extra patch upon USE=findbug |
| 6 |
|
| 7 |
(Portage version: 2.1.9.42/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-misc/mico/files/find-bug343827.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mico/files/find-bug343827.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/mico/files/find-bug343827.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: find-bug343827.patch |
| 16 |
=================================================================== |
| 17 |
--- orb/address.cc.orig 2011-06-28 17:22:58.275355766 +0200 |
| 18 |
+++ orb/address.cc 2011-06-28 17:46:12.268357549 +0200 |
| 19 |
@@ -269,21 +269,30 @@ |
| 20 |
{ |
| 21 |
if (_ipaddr.size() > 0) |
| 22 |
return TRUE; |
| 23 |
- if (_host.length() == 0) |
| 24 |
+ |
| 25 |
+ if (_host.length() == 0) { |
| 26 |
+::std::cerr << "for gentoo bug#343827: resolve_ip() detected _host.length() == 0, failed." << ::std::endl; |
| 27 |
return FALSE; |
| 28 |
+ } |
| 29 |
|
| 30 |
InetAddress &me = (InetAddress &)*this; |
| 31 |
|
| 32 |
+::std::cerr << "for gentoo bug#343827: resolve_ip() for hostname '" << _host << "' using ::inet_addr()..."; |
| 33 |
+ |
| 34 |
CORBA::ULong addr = ::inet_addr ((char *)_host.c_str()); |
| 35 |
if (addr != (CORBA::ULong)-1L || _host == string("255.255.255.255")) { |
| 36 |
me._ipaddr.insert (me._ipaddr.begin(), |
| 37 |
(CORBA::Octet *)&addr, |
| 38 |
(CORBA::Octet *)&addr + sizeof (CORBA::ULong)); |
| 39 |
+::std::cerr << " succeeded." << ::std::endl; |
| 40 |
return TRUE; |
| 41 |
} |
| 42 |
+::std::cerr << " failed, using ::gethostbyname() "; |
| 43 |
#ifndef HAVE_THREADS |
| 44 |
+::std::cerr << "without threads..."; |
| 45 |
struct hostent *hent = ::gethostbyname ((char *)_host.c_str()); |
| 46 |
#else // HAVE_THREADS |
| 47 |
+::std::cerr << "with threads..."; |
| 48 |
struct hostent* hent = NULL; |
| 49 |
{ |
| 50 |
MICOMT::AutoLock lock(S_netdb_lock_); |
| 51 |
@@ -293,6 +302,7 @@ |
| 52 |
me._ipaddr.insert (me._ipaddr.begin(), |
| 53 |
(CORBA::Octet *)hent->h_addr, |
| 54 |
(CORBA::Octet *)hent->h_addr + hent->h_length); |
| 55 |
+::std::cerr << " succeeded." << ::std::endl; |
| 56 |
return TRUE; |
| 57 |
} |
| 58 |
#ifdef HAVE_THREADS |
| 59 |
@@ -305,6 +315,8 @@ |
| 60 |
<< "Warning: cannot resolve hostname '" << _host |
| 61 |
<< "' into an IP address." << endl; |
| 62 |
} |
| 63 |
+ |
| 64 |
+::std::cerr << " failed." << ::std::endl; |
| 65 |
return FALSE; |
| 66 |
} |
Archives