diff options
Diffstat (limited to 'src/patchsets/mico/9999/014_all_idl-noresolve.patch')
| -rw-r--r-- | src/patchsets/mico/9999/014_all_idl-noresolve.patch | 40 |
1 files changed, 29 insertions, 11 deletions
diff --git a/src/patchsets/mico/9999/014_all_idl-noresolve.patch b/src/patchsets/mico/9999/014_all_idl-noresolve.patch index 2cec54ed75..34685b942b 100644 --- a/src/patchsets/mico/9999/014_all_idl-noresolve.patch +++ b/src/patchsets/mico/9999/014_all_idl-noresolve.patch @@ -1,6 +1,18 @@ ---- mico/idl/main.cc -+++ mico/idl/main.cc 2011-11-25 23:52:43.149752575 +0100 -@@ -82,6 +82,13 @@ +From 7ade2254048dccfde13846c3e0a13b7f5acbef36 Mon Sep 17 00:00:00 2001 +From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com> +Date: Tue, 21 May 2019 18:41:09 +0200 +Subject: [PATCH 13/19] no need for working DNS in idl compiler + +--- + idl/main.cc | 7 +++++++ + orb/address.cc | 7 +++++-- + 2 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/idl/main.cc b/idl/main.cc +index a2ad803..61dcdaa 100644 +--- a/idl/main.cc ++++ b/idl/main.cc +@@ -75,6 +75,13 @@ int main( int argc, char *argv[] ) DB db; // ORB initialization @@ -14,18 +26,24 @@ CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); #ifdef _WIN32 ---- mico/orb/address.cc -+++ mico/orb/address.cc -@@ -635,8 +635,12 @@ +diff --git a/orb/address.cc b/orb/address.cc +index 05ddf8b..e762e46 100644 +--- a/orb/address.cc ++++ b/orb/address.cc +@@ -635,8 +635,11 @@ MICO::InetAddress::hostname () { if (hname.length() == 0) { char buf[200]; +- int r = gethostname (buf, 200); +- assert (r == 0); + if (_resolve) { - int r = gethostname (buf, 200); - assert (r == 0); -+ } else { -+ strcpy(buf, "localhost"); -+ } ++ int r = gethostname (buf, 200); ++ assert (r == 0); ++ } else ++ strcpy(buf, "localhost"); /* * some OSes do not return an FQDN. So we get the ip address for the * hostname and resolve that address into the FQDN... +-- +2.19.2 + |