ChangeLogTag:Sat Dec 3 17:56:04 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

4 files changed, 16 insertions, 15 deletions

diff --git a/ace/SSL/SSL_Asynch_BIO.cpp b/ace/SSL/SSL_Asynch_BIO.cpp
index 12e4730ddf3..9d4c75ad930 100644
--- a/ace/SSL/SSL_Asynch_BIO.cpp
+++ b/ace/SSL/SSL_Asynch_BIO.cpp
@@ -191,10 +191,10 @@ ACE_ASYNCH_BIO_WRITE_NAME (BIO * pBIO, const char * buf, int len)
   int errval = 0;
 
   int retval =
-        ACE_SSL_Asynch_Stream_Accessor::write (p_stream,
-                                               buf,
-                                               len,
-                                               errval);
+    ACE_SSL_Asynch_Stream_Accessor::write (p_stream,
+                                           buf,
+                                           len,
+                                           errval);
 
   if (retval >= 0)
     return retval;
diff --git a/ace/SSL/SSL_Asynch_Stream.h b/ace/SSL/SSL_Asynch_Stream.h
index 4dd0dec22d3..57007f5013d 100644
--- a/ace/SSL/SSL_Asynch_Stream.h
+++ b/ace/SSL/SSL_Asynch_Stream.h
@@ -176,6 +176,12 @@ protected:
   int ssl_bio_write (const char * buf, size_t len, int & errval);
   //@}
 
+private:
+
+  // Preventing copying through construction or assignment.
+  ACE_SSL_Asynch_Stream (ACE_SSL_Asynch_Stream const &);
+  ACE_SSL_Asynch_Stream & operator= (ACE_SSL_Asynch_Stream const &);
+
 protected:
 
   /// Stream Type ST_CLIENT/ST_SERVER
diff --git a/ace/SSL/SSL_Context.cpp b/ace/SSL/SSL_Context.cpp
index f3505cce1e2..6e162350e99 100644
--- a/ace/SSL/SSL_Context.cpp
+++ b/ace/SSL/SSL_Context.cpp
@@ -337,7 +337,7 @@ ACE_SSL_Context::load_trusted_ca (const char* ca_file, const char* ca_dir)
           || mode_ == SSLv2_server)
         {
           STACK_OF (X509_NAME) * cert_names;
-          cert_names = ::SSL_CTX_get_client_CA_list(this->context_);
+          cert_names = ::SSL_CTX_get_client_CA_list (this->context_);
 
           if (cert_names == 0)
             {
@@ -526,8 +526,8 @@ ACE_SSL_Context::dh_params (const char *file_name,
       return -1;
 
     // Swiped from Rescorla's examples and the OpenSSL s_server.c app
-    DH *ret=0;
-    BIO *bio = 0;
+    DH * ret=0;
+    BIO * bio = 0;
 
     if ((bio = ::BIO_new_file (this->dh_params_.file_name (), "r")) == NULL)
       return -1;
diff --git a/ace/SSL/SSL_Context.h b/ace/SSL/SSL_Context.h
index f06d1ac04a7..aebe25eeb4a 100644
--- a/ace/SSL/SSL_Context.h
+++ b/ace/SSL/SSL_Context.h
@@ -287,18 +287,13 @@ private:
   void ssl_library_init ();
   void ssl_library_fini ();
 
-  // = Prevent assignment and initialization.
+  // = Prevent assignment and copy initialization.
   //@{
-  ACE_UNIMPLEMENTED_FUNC (void operator= (const ACE_SSL_Context &))
-  ACE_UNIMPLEMENTED_FUNC (ACE_SSL_Context (const ACE_SSL_Context &))
+  ACE_SSL_Context (const ACE_SSL_Context &);
+  ACE_SSL_Context & operator= (const ACE_SSL_Context &);
   //@}
 
 private:
-  // @@ Carlos, I protected this variable with an ACE_GUARD, just like
-  //    what we do for the orb_init_count_ variable in
-  //    tao/ORB.cpp.   The code isn't pretty but it should suffice
-  //    until the SSL context is stored in a Singleton.
-  //       -Ossama
 
   /// The SSL_CTX structure
   SSL_CTX *context_;