Merge remote-tracking branch 'upstream/master' into idl-fixed-type

21 files changed, 164 insertions, 63 deletions

diff --git a/ACE/ace/INET_Addr.cpp b/ACE/ace/INET_Addr.cpp
index 365367507b9..9e8dfb22f3a 100644
--- a/ACE/ace/INET_Addr.cpp
+++ b/ACE/ace/INET_Addr.cpp
@@ -415,6 +415,13 @@ ACE_INET_Addr::set (u_short port_number,
       int error = 0;
       ACE_OS::memset (&hints, 0, sizeof (hints));
       hints.ai_family = AF_INET6;
+      // Note - specify the socktype here to avoid getting multiple entries
+      // returned with the same address for different socket types or
+      // protocols. If this causes a problem for some reason (an address that's
+      // available for TCP but not UDP, or vice-versa) this will need to change
+      // back to unrestricted hints and weed out the duplicate addresses by
+      // searching this->inet_addrs_ which would slow things down.
+      hints.ai_socktype = SOCK_STREAM;
       if ((error = ::getaddrinfo (host_name, 0, &hints, &res)) == 0)
         {
           this->set_type (res->ai_family);
diff --git a/ACE/ace/config-aix-5.x.h b/ACE/ace/config-aix-5.x.h
index 06ba877971a..cfa2786f7e3 100644
--- a/ACE/ace/config-aix-5.x.h
+++ b/ACE/ace/config-aix-5.x.h
@@ -192,6 +192,8 @@
 
 #define ACE_HAS_REENTRANT_FUNCTIONS
 
+#define ACE_HAS_SIOCGIFCONF
+
 // Compiler/platform defines the sig_atomic_t typedef
 #define ACE_HAS_SIG_ATOMIC_T
 #define ACE_HAS_SIGINFO_T
diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html
index ef38733e838..21963d88609 100644
--- a/ACE/docs/bczar/bczar.html
+++ b/ACE/docs/bczar/bczar.html
@@ -118,7 +118,7 @@
           </ul>
           If you want to perform a full build with qt support, than run:
           <ul>
-            <li><code>yum install rubygem-rmagick bison libxerces-c-devel psmisc yum-utils gdb unzip glibc-devel libasan bison redhat-lsb perl-Pod-Usage rubygems clang make patch libcgroup-devel ant setuptool system-config-network-tui system-config-firewall-tui lcov gnuplot java-1.7.0-openjdk git-svn perl svn screen pysvn automake doxygen bzip2 tar gzip openssh graphviz zip libtool gcc-c++ boost-devel valgrind openssl-devel gcc qt4 fltk-devel bzip2-devel rsync openssl lzo-devel zziplib-devel acpid acpi nfs-utils java xerces-c xerces-c-devel mc qt qt-devel icecream ruby ruby-devel lksctp-tools-devel git telnet GitPython NetworkManager wget mailx</code></li>
+            <li><code>yum install ntp rubygem-rmagick bison libxerces-c-devel psmisc yum-utils gdb unzip glibc-devel libasan bison redhat-lsb perl-Pod-Usage rubygems clang make patch libcgroup-devel ant setuptool system-config-network-tui system-config-firewall-tui lcov gnuplot java-1.7.0-openjdk git-svn perl svn screen pysvn automake doxygen bzip2 tar gzip openssh graphviz zip libtool gcc-c++ boost-devel valgrind openssl-devel gcc qt4 fltk-devel bzip2-devel rsync openssl lzo-devel zziplib-devel acpid acpi nfs-utils java xerces-c xerces-c-devel mc qt qt-devel icecream ruby ruby-devel lksctp-tools-devel git telnet GitPython NetworkManager wget mailx</code></li>
           </ul>
           For some optional i686 packages run
           <ul>
diff --git a/ACE/tests/INET_Addr_Test.cpp b/ACE/tests/INET_Addr_Test.cpp
index 4446c1a6864..2c272514a64 100644
--- a/ACE/tests/INET_Addr_Test.cpp
+++ b/ACE/tests/INET_Addr_Test.cpp
@@ -95,8 +95,11 @@ static bool test_multiple (void)
   ACE_INET_Addr ntp;
   if (ntp.set (123, ACE_TEXT ("pool.ntp.org")) == -1)
     {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("pool.ntp.org")));
-      return false;
+      // This is just a warning to prevent fails on lookups on hosts with no
+      // DNS service. The real value of this test is to accurately get
+      // multiples from the result.
+      ACE_ERROR ((LM_WARNING, ACE_TEXT ("%p\n"), ACE_TEXT ("pool.ntp.org")));
+      return true;
     }
   size_t count = 0;
   ACE_TCHAR addr_string[256];
@@ -190,21 +193,43 @@ int run_main (int, ACE_TCHAR *[])
   ACE_INET_Addr addr_port;
   for (int i = 0; addr_ports[i] != 0; ++i)
     {
-      addr_port.set (addr_ports[i]);
-      status |= check_type_consistency (addr_port);
-      if (addr_port.get_port_number () != 80)
+      if (addr_port.set (addr_ports[i]) == 0)
         {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("Got port %d from %s\n"),
-                      (int)(addr_port.get_port_number ()),
-                      addr_ports[i]));
-          status = 1;
+          status |= check_type_consistency (addr_port);
+          if (addr_port.get_port_number () != 80)
+            {
+              ACE_ERROR ((LM_ERROR,
+                          ACE_TEXT ("Got port %d from %s\n"),
+                          (int)(addr_port.get_port_number ()),
+                          addr_ports[i]));
+              status = 1;
+            }
+          ACE_INET_Addr check (addr_ports[i]);
+          if (addr_port != check)
+            {
+              ACE_ERROR ((LM_ERROR, ACE_TEXT ("Reset on iter %d failed\n"), i));
+              status = 1;
+            }
         }
-      ACE_INET_Addr check (addr_ports[i]);
-      if (addr_port != check)
+      else
         {
-          ACE_ERROR ((LM_ERROR, ACE_TEXT ("Reset on iter %d failed\n"), i));
-          status = 1;
+          // Sometimes this fails because the run-time host lacks the capability to
+          // resolve a name. But it shouldn't fail on the first one, 127.0.0.1.
+          if (i == 0)
+            {
+              ACE_ERROR ((LM_ERROR,
+                          ACE_TEXT ("%C: %p\n"),
+                          addr_ports[i],
+                          ACE_TEXT ("lookup")));
+              status = 1;
+            }
+          else
+            {
+              ACE_ERROR ((LM_WARNING,
+                          ACE_TEXT ("%C: %p\n"),
+                          addr_ports[i],
+                          ACE_TEXT ("lookup")));
+            }
         }
     }
 
@@ -227,7 +252,7 @@ int run_main (int, ACE_TCHAR *[])
 
       ACE_OS::memcpy (&addr32, &addrv4, sizeof (addr32));
 
-      addr.set (80, ipv4_addresses[i]);
+      status |= !(addr.set (80, ipv4_addresses[i]) == 0);
       status |= check_type_consistency (addr);
 
       /*
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl
index 932d4e3a143..932d4e3a143 100755..100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Shapes_asm/ports/Shapes_ShapeType_msg.idl
diff --git a/TAO/MPC/config/taobaseidldefaults.mpb b/TAO/MPC/config/taobaseidldefaults.mpb
index 2bc3e911d88..073b8a32334 100644
--- a/TAO/MPC/config/taobaseidldefaults.mpb
+++ b/TAO/MPC/config/taobaseidldefaults.mpb
@@ -16,7 +16,10 @@ project: build_files {
     libpath              = $(ACE_ROOT)/lib
     inputext             = .idl
     keyword idlflags     = commandflags
-    header_outputext = .h, .hpp, .hxx, .hh
+
+    optional(header_outputext) {
+      commandflags(!-Sch || !-Ssh || -GC) = .h, .hpp, .hxx, .hh
+    }
 
     optional(source_pre_extension) {
       commandflags(!-Scc) = C
@@ -45,9 +48,6 @@ project: build_files {
     }
 
     // Header related options
-    optional(header_outputext) {
-      commandflags(-SS && !-oS && !-Ssh) += S
-    }
     optional(header_pre_extension) {
       commandflags(!-oS && !-Ssh) += S
     }
diff --git a/TAO/NEWS b/TAO/NEWS
index 1d14c2ccf9b..e8a9419ef78 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -100,8 +100,7 @@ USER VISIBLE CHANGES BETWEEN TAO-2.2.3 and TAO-2.2.4
 
 . Improved recursive typecode handling
 
-. Ended maintenance and support for Solaris 10 with Sun
-  Studio
+. Ended maintenance for Solaris 10 with Sun Studio
 
 USER VISIBLE CHANGES BETWEEN TAO-2.2.2 and TAO-2.2.3
 ====================================================
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
index f613f9af443..a221cba57af 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
@@ -104,8 +104,7 @@ TAO::SSLIOP::Acceptor::create_profile (const TAO::ObjectKey &object_key,
 
   // Check if multiple endpoints should be put in one profile or
   // if they should be spread across multiple profiles.
-  if (priority == TAO_INVALID_PRIORITY  &&
-      this->orb_core_->orb_params ()->shared_profile () == 0)
+  if (priority == TAO_INVALID_PRIORITY)
     return this->create_new_profile (object_key,
                                      mprofile,
                                      priority);
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client_check.conf b/TAO/orbsvcs/tests/Security/Secure_Invocation/client_check.conf
new file mode 100644
index 00000000000..99a85f3ce6f
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client_check.conf
@@ -0,0 +1,3 @@
+
+dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate NONE -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem -SSLCAfile PEM:cacert.pem -SSLCheckHost"
+static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_pw.conf b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_pw.conf
new file mode 100644
index 00000000000..819221fb815
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_pw.conf
@@ -0,0 +1,3 @@
+
+dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:../cert/pwTestPass_key.pem -SSLCertificate PEM:../cert/san.pem -SSLPassword 'file:../cert/passwd' -SSLCAfile PEM:cacert.pem"
+static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_user_pw.conf b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_user_pw.conf
new file mode 100644
index 00000000000..d09a2049097
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_user_pw.conf
@@ -0,0 +1,3 @@
+
+dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:../cert/pwTestPass_key.pem -SSLCertificate PEM:../cert/san.pem -SSLPassword 'prompt:enter private key password' -SSLCAfile PEM:cacert.pem"
+static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/cert/README b/TAO/orbsvcs/tests/Security/cert/README
index 157abe9a146..3fcecfb43b5 100644
--- a/TAO/orbsvcs/tests/Security/cert/README
+++ b/TAO/orbsvcs/tests/Security/cert/README
@@ -1,3 +1,9 @@
 
 
 This is a CA used for signing keys in the security tests.  The password for the CA key is DOCGroup
+
+The following steps were used to generate the cert used to test the checkhost and password features:
+
+openssl req -new -key pwTestPass_key.pem -days 9999 -out san.csr -subj "/C=US/ST=Missouri/L=St. Louis/O=Object Computing, Inc./CN=*.ociweb.com" -passin file:passwd
+
+openssl x509 -in san.csr -req -extfile x509v3conf.txt -extensions alts -out san.pem -signkey pwTestPass_key.pem -passin file:passwd
diff --git a/TAO/orbsvcs/tests/Security/cert/passwd b/TAO/orbsvcs/tests/Security/cert/passwd
new file mode 100644
index 00000000000..4b16a980dfc
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/cert/passwd
@@ -0,0 +1 @@
+TestPass
diff --git a/TAO/orbsvcs/tests/Security/cert/pwTestPass_key.pem b/TAO/orbsvcs/tests/Security/cert/pwTestPass_key.pem
new file mode 100644
index 00000000000..c68fbe4597e
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/cert/pwTestPass_key.pem
@@ -0,0 +1,30 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,398E0F2E214A10CD
+
+JUDc1TUDi0t1UzBPtMa6j4DZ0UO4Q4795Mbi3UCD589p3xIpNLTk/hxzR7/pzW9j
+oHw9BbM3l+Xop2wMIux6SzCFN7OZ/q49B4vK6nb475Qb1E767TqurHDo25saf/7u
+GvZf3lND1/PBggc59Y6mZLxOcoIrq2W4OzMGvialvM+X+hzzXAL3qHNLxKT3nOUb
+6346S/GkXk6+iALTh9XXq8A7X+5Dokl4Gvtsu9AIoKIVD6UBuCKVvVv249PBypDg
+1+mJ3UPdI5NEmxeK4OiIh7JjmzudxZE6HaVT0JK2psAI/3dcLbwOtY1T8830utuW
+abtFbN5fmbEs/Z2nK+NU1O3kXhddIBY9SRneVzuU1+wM13DNvXmaDiyqyeu71AFP
+QugYVTt5MxnsjbDQGVyVHK/dBmJvltSrGbVj/yq3IbyD1CftCBVNwnTMZd/G7Q07
+4KRScnVqpv0xj4JitRBpwYZCpZLGyIa5IiS4uk3PkAMJWksHisojEeRQRMq7xDMt
+kXxSVo7Wo+QlR2usV08fExwr6zlWUVES9EWXSvWxfnYEJs9rWPKd0Y4NV7eYeA1N
+RtabuGCC2dNH70iM4YHx8lM91N2lyegJiMYS0cuS9GsCB+XxW8RUbJO+dur75l4A
+454kr4X+QZzERpkYWeOvgQZ/5g5qSN9jq3/eLGx7wSWeuGTAvHhn8RXWN3iX9sZA
+JLBVefizG6JG6OyJPHnIMCu1nNyoX4wPIG4BjlABs69UyA0gD8FEookHJN0AdSOv
+1FwOt+9DRCb4wi4U0MATlI0TKrnTOgyiYkVa84idMrnnzj6+ULciJEvg1MLsHTEK
+J8owv4F0U5HJ4UtYocZ61wHsRIp3SJA0NBMXTi0TCahGfAD9t7JsepOUm3KeyQqE
+w4malItwhP5mNp4FsiuyyWw8wZGVEB6AZq+TKPpd0Ciq3Cu2DRV1MWKWIJFEdVOS
+xIBy6zBwk8/zOpfbNg/VWCo8qYeJDfU12TUrmNj9pUsybSHhdumLTbV4xw49478/
+nYfi/qlklJCuXSMI/Zn1z0gJrXu5lYKV6S4+laQDTjKVlLkv5w/utFxS+DcRfuvj
+pSBjbfNLO1B3VG/hJY4+AbR9QBOCCfFQ78qVRVR7rzZNL8DWB/O+F9/H/CNI5Wmk
+MfqkCoTsY/e9iZqbDLc9JIgxF/SSCx0fFl0o0IRZjPb8FC81NSqUtjo+ILKt/Flf
++Zzyw9SSNNXBBZ3WOlzryld66OjAnWVQGYA9+zGoqhn6OjELA09IxVqgzlsoZ9h1
+MxiBx8scUMa10iUIx31mLJvYaBmt+FJO6UwlzR9e49KXxacgzR2hhdKrlitnuDiy
++NF6fDNdgWQ3YE6oU7rkZCGrRQrcy+6qFAzs6VTWV4GeBrULjs2yQAPEZnU0cQSp
+schB7lY8BQZI7YJcYznv1/EP2gN/DcHGNpEtPi1Bxbib4H9AWA30rhW/Ti4UsStx
+dQsl7E5HFRajqkEXuSnVyjAcT2aGCYftnoWCylyPGx1xPgzHcquV1H8zetv+P7/U
+V0jSBvXQFjFeKVZedFTo9um3nABFH0SC61aDZP2SYS2c7SWRuaPrig==
+-----END RSA PRIVATE KEY-----
diff --git a/TAO/orbsvcs/tests/Security/cert/san.csr b/TAO/orbsvcs/tests/Security/cert/san.csr
new file mode 100644
index 00000000000..11e1109b8b0
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/cert/san.csr
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIICsTCCAZkCAQAwbDELMAkGA1UEBhMCVVMxETAPBgNVBAgMCE1pc3NvdXJpMRIw
+EAYDVQQHDAlTdC4gTG91aXMxHzAdBgNVBAoMFk9iamVjdCBDb21wdXRpbmcsIElu
+Yy4xFTATBgNVBAMMDCoub2Npd2ViLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBALniALi3j90xqTBnS20rElx9Fv5KF/cCLSDWprG8yBwQxmJgGUuE
+WeKpuZuGZDpK0KRaC6F+Fa8DhO4TRujaD79RWDGWarKM/BKW/E3i0XVRmKix+wWo
+gkc9/sTsqAnn3PSrJuLmtO5JBZPjRDZAnsb9MjEnVD3eOg11BEZgxEbRYZhIOkGY
+jZNTUjriSSBaUyTrWa7WdDAC4ID9hSWIcKI7hva21xgrUiw9wvGEGkoHhHYKjoUI
+9KiLntDFVD9YCHv7CG5tQgKTu7w8NknEL68nXdwHedFkgPSx5U2gog9tfB0j9tTA
+5cd4NEYYowGWZjMYX4thDnJM9zL9CuLhtv0CAwEAAaAAMA0GCSqGSIb3DQEBCwUA
+A4IBAQCtNzJqAm3KnZxz6UhpvHfc6Wi5ebQv+g/rQBMhH+8dn/ZdKxP3s1ZEc2Sc
+GPnvlA3oAPl/FXfnxAZ5vgALpw2uKcZA1phsCPJ4UlVREBZs29RQai3wpQE7ikpj
+PwYvi7b1zCiEw7xQh1ox44GPaTApyEJJgJosW79ZGQKMHBbjncDg7es0xentjyqC
+WZ+XuY5VAwtZDTouy+lprucCDbZG4M4QtkbW9oD57EQdREngf+Vj1yh/d6LMR/ix
+3TzhnxzPQEf5gAmrbn/7qZBmWn+rhy1KpNq+05Z3q2huF9A3ZGMDVdKLfgOql1JD
+YnehP5JW8LSqSIEEVUDGue7UNnnI
+-----END CERTIFICATE REQUEST-----
diff --git a/TAO/orbsvcs/tests/Security/cert/san.pem b/TAO/orbsvcs/tests/Security/cert/san.pem
new file mode 100644
index 00000000000..744dba3c022
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/cert/san.pem
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDlTCCAn2gAwIBAgIJAKtM54qtIfU5MA0GCSqGSIb3DQEBCwUAMGwxCzAJBgNV
+BAYTAlVTMREwDwYDVQQIDAhNaXNzb3VyaTESMBAGA1UEBwwJU3QuIExvdWlzMR8w
+HQYDVQQKDBZPYmplY3QgQ29tcHV0aW5nLCBJbmMuMRUwEwYDVQQDDAwqLm9jaXdl
+Yi5jb20wHhcNMTUwMzIwMjAzMzUyWhcNMTUwNDE5MjAzMzUyWjBsMQswCQYDVQQG
+EwJVUzERMA8GA1UECAwITWlzc291cmkxEjAQBgNVBAcMCVN0LiBMb3VpczEfMB0G
+A1UECgwWT2JqZWN0IENvbXB1dGluZywgSW5jLjEVMBMGA1UEAwwMKi5vY2l3ZWIu
+Y29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAueIAuLeP3TGpMGdL
+bSsSXH0W/koX9wItINamsbzIHBDGYmAZS4RZ4qm5m4ZkOkrQpFoLoX4VrwOE7hNG
+6NoPv1FYMZZqsoz8Epb8TeLRdVGYqLH7BaiCRz3+xOyoCefc9Ksm4ua07kkFk+NE
+NkCexv0yMSdUPd46DXUERmDERtFhmEg6QZiNk1NSOuJJIFpTJOtZrtZ0MALggP2F
+JYhwojuG9rbXGCtSLD3C8YQaSgeEdgqOhQj0qIue0MVUP1gIe/sIbm1CApO7vDw2
+ScQvrydd3Ad50WSA9LHlTaCiD218HSP21MDlx3g0RhijAZZmMxhfi2EOckz3Mv0K
+4uG2/QIDAQABozowODA2BgNVHREELzAtggwqLm9jaXdlYi5jb22CECoudmFuZGVy
+YmlsdC5lZHWCCyoucmVtZWR5Lm5sMA0GCSqGSIb3DQEBCwUAA4IBAQBE/Ar1yXc/
+a1v1RMFN5GZuLWKufhT0yDfiSjlVBnKeQd09vkeXS9wyvsV88Nu48yLgIZbDdaB5
+zUGgEIK7UmGUJV145xCi6WqJGsPXxIY/GCaiu3Ty1SsX6QjUGoflfodk6cyIR3u+
+BfTRxg/Ec26lEeTuDCWrqnD8OD1kIDuFxYg6+RL4eNWZlzS5quRip/d102jRdw4v
+YX0hzHbvUKTqz7AGgKkYosVVMWT48eD6ZbU6Y+cN2b/Rpd9O+dggAMFmoAMA6ZLN
+Wp7QgJJKfiGWbhVX6bfUOD+YvTEs3i1eUgjbmlKSLplf/W7tNRZer6AW04K9XACA
+FIvIMI9IuEzp
+-----END CERTIFICATE-----
diff --git a/TAO/orbsvcs/tests/Security/cert/x509v3conf.txt b/TAO/orbsvcs/tests/Security/cert/x509v3conf.txt
new file mode 100644
index 00000000000..c02799b77cd
--- /dev/null
+++ b/TAO/orbsvcs/tests/Security/cert/x509v3conf.txt
@@ -0,0 +1,2 @@
+[alts]
+subjectAltName=DNS:*.ociweb.com,DNS:*.vanderbilt.edu,DNS:*.remedy.nl
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
index f6acc37e454..1641d7512a1 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
@@ -18,20 +18,17 @@ TAO_BiDirPolicy_Validator::validate_impl (TAO_Policy_Set &policies)
   CORBA::Policy_var policy =
     policies.get_cached_policy (TAO_CACHED_POLICY_BIDIRECTIONAL_GIOP);
 
-  if (CORBA::is_nil (policy.in ()))
-    return;
-
   BiDirPolicy::BidirectionalPolicy_var srp =
     BiDirPolicy::BidirectionalPolicy::_narrow (policy.in ());
 
-  if (CORBA::is_nil (srp.in ()))
-    return;
-
-  BiDirPolicy::BidirectionalPolicyValue val = srp->value ();
+  if (!CORBA::is_nil (srp.in ()))
+    {
+      BiDirPolicy::BidirectionalPolicyValue val = srp->value ();
 
-  // Set the flag in the ORB_Core
-  if (val == BiDirPolicy::BOTH)
-    orb_core_.bidir_giop_policy (true);
+      // Set the flag in the ORB_Core
+      if (val == BiDirPolicy::BOTH)
+        orb_core_.bidir_giop_policy (true);
+    }
 }
 
 void
diff --git a/TAO/tao/CORBALOC_Parser.h b/TAO/tao/CORBALOC_Parser.h
index c674e134d4a..24c075f204e 100644
--- a/TAO/tao/CORBALOC_Parser.h
+++ b/TAO/tao/CORBALOC_Parser.h
@@ -56,8 +56,7 @@ public:
 
   /// Parse the ior-string that is passed.
   virtual CORBA::Object_ptr parse_string (const char *ior,
-                                          CORBA::ORB_ptr orb
-                                          );
+                                          CORBA::ORB_ptr orb);
 
 private:
 
@@ -67,18 +66,15 @@ private:
    * reference which is sent to the application.
    */
   CORBA::Object_ptr make_stub_from_mprofile (CORBA::ORB_ptr orb,
-                                             TAO_MProfile &mprofile
-                                             );
+                                             TAO_MProfile &mprofile);
 
   /// Gets the pointer to the key_string when the protocol used is RIR
   CORBA::Object_ptr parse_string_rir_helper (const char *corbaloc_name,
-                                             CORBA::ORB_ptr orb
-                                             );
+                                             CORBA::ORB_ptr orb);
 
   void make_canonical (const char *ior,
                        size_t ior_len,
-                       ACE_CString &canonical_endpoint
-                       );
+                       ACE_CString &canonical_endpoint);
 
   struct parsed_endpoint {
     parsed_endpoint ();
diff --git a/TAO/tao/ZIOP/ZIOP_Policy_Validator.cpp b/TAO/tao/ZIOP/ZIOP_Policy_Validator.cpp
index 91a1dcb91c1..d2dffe0ecfe 100644
--- a/TAO/tao/ZIOP/ZIOP_Policy_Validator.cpp
+++ b/TAO/tao/ZIOP/ZIOP_Policy_Validator.cpp
@@ -15,19 +15,8 @@ TAO_ZIOPPolicy_Validator::TAO_ZIOPPolicy_Validator (TAO_ORB_Core &orb_core)
 
 
 void
-TAO_ZIOPPolicy_Validator::validate_impl (TAO_Policy_Set &policies)
+TAO_ZIOPPolicy_Validator::validate_impl (TAO_Policy_Set & /*policies*/)
 {
-  CORBA::Policy_var policy =
-    policies.get_cached_policy (TAO_CACHED_COMPRESSION_ENABLING_POLICY);
-
-  if (policy.in () == 0)
-    return;
-
-  ZIOP::CompressionEnablingPolicy_var srp =
-    ZIOP::CompressionEnablingPolicy::_narrow (policy.in ());
-
-  if (srp.in () == 0)
-    return;
 }
 
 void
diff --git a/TAO/utils/catior/Catior_i.cpp b/TAO/utils/catior/Catior_i.cpp
index d0015f8a59b..917d965291b 100644
--- a/TAO/utils/catior/Catior_i.cpp
+++ b/TAO/utils/catior/Catior_i.cpp
@@ -1181,55 +1181,55 @@ Catior_i::cat_tagged_components (TAO_InputCDR& stream)
       buffer_ += buf;
 
       if (tag == IOP::TAG_ORB_TYPE) {
-        ACE_OS::snprintf (buf, bufsize, "%d (TAG_ORB_TYPE)\n", tag);
+        ACE_OS::snprintf (buf, bufsize, " (TAG_ORB_TYPE)\n");
         buffer_ += buf;
         trace_depth_ += 2;
         cat_tag_orb_type(stream);
         trace_depth_ -= 2;
       } else if (tag == IOP::TAG_CODE_SETS) {
-        ACE_OS::snprintf (buf, bufsize, "%d (TAG_CODE_SETS)\n", tag);
+        ACE_OS::snprintf (buf, bufsize, " (TAG_CODE_SETS)\n");
         buffer_ += buf;
         trace_depth_ += 2;
         cat_codeset_info(stream);
         trace_depth_ -= 2;
       } else if (tag == IOP::TAG_ALTERNATE_IIOP_ADDRESS) {
-        ACE_OS::snprintf (buf, bufsize, "%d (TAG_ALTERNATE_IIOP_ADDRESS)\n", tag);
+        ACE_OS::snprintf (buf, bufsize, " (TAG_ALTERNATE_IIOP_ADDRESS)\n");
         buffer_ += buf;
         trace_depth_ += 2;
         cat_tag_alternate_endpoints (stream);
         trace_depth_ -= 2;
       } else if (tag == TAO_TAG_ENDPOINTS) {
-        ACE_OS::snprintf (buf, bufsize, "%d (TAO_TAG_ENDPOINTS)\n", tag);
+        ACE_OS::snprintf (buf, bufsize, " (TAO_TAG_ENDPOINTS)\n");
         buffer_ += buf;
         trace_depth_ += 2;
         cat_tao_tag_endpoints(stream);
         trace_depth_ -= 2;
       } else if (tag == IOP::TAG_POLICIES) {
-        ACE_OS::snprintf (buf, bufsize, "%d (TAG_POLICIES)\n", tag);
+        ACE_OS::snprintf (buf, bufsize, " (TAG_POLICIES)\n");
         buffer_ += buf;
         trace_depth_ += 2;
         cat_tag_policies(stream);
         trace_depth_ -= 2;
       } else if (tag == 20U /* SSLIOP::TAG_SSL_SEC_TRANS */) {
-        ACE_OS::snprintf (buf, bufsize, "%d (TAG_SSL_SEC_TRANS)\n", tag);
+        ACE_OS::snprintf (buf, bufsize, " (TAG_SSL_SEC_TRANS)\n");
         buffer_ += buf;
         trace_depth_ += 2;
         cat_tag_ssl_sec_trans(stream);
         trace_depth_ -= 2;
       }  else if (tag == 38U /* TAG_RMI_CUSTOM_MAX_STREAM_FORMAT */) {
-        ACE_OS::snprintf (buf, bufsize, "%d (TAG_RMI_CUSTOM_MAX_STREAM_FORMAT)\n", tag);
+        ACE_OS::snprintf (buf, bufsize, "(TAG_RMI_CUSTOM_MAX_STREAM_FORMAT)\n");
         buffer_ += buf;
         trace_depth_ += 2;
         cat_octet_seq ("Component Value", stream);
         trace_depth_ -= 2;
       } else if (tag == 1229081866U /* IBM_PARTNER_VERSION */) {
-        ACE_OS::snprintf (buf, bufsize, "%d (IBM_PARTNER_VERSION)\n", tag);
+        ACE_OS::snprintf (buf, bufsize, " (IBM_PARTNER_VERSION)\n");
         buffer_ += buf;
         trace_depth_ += 2;
         cat_ibm_partner_version (stream);
         trace_depth_ -= 2;
       } else {
-        ACE_OS::snprintf (buf, bufsize, "%d\n", tag);
+        ACE_OS::snprintf (buf, bufsize, " (Unrecognized tag)\n");
         buffer_ += buf;
         trace_depth_ += 2;
         cat_octet_seq ("Component Value", stream);