.

1 files changed, 59 insertions, 48 deletions

diff --git a/netsvcs/servers/main.cpp b/netsvcs/servers/main.cpp
index c0881b3b0aa..87acc540ca0 100644
--- a/netsvcs/servers/main.cpp
+++ b/netsvcs/servers/main.cpp
@@ -33,109 +33,120 @@ main (int argc, char *argv[])
   if (ACE_Service_Config::open (argc, argv) == -1)
     {
       if (errno != ENOENT)
-	ACE_ERROR_RETURN ((LM_ERROR,
+        ACE_ERROR_RETURN ((LM_ERROR,
                            "%p\n",
                            "open"),
                           1);
       else // Use static linking.
-	{
+        {
+          if (ACE::debug () == 0)
+            ACE_Log_Msg::disable_debug_messages ();
+
           // Calling ACE_SVC_INVOKE to create a new Service_Object.
           // Stash the newly created Service_Object into an
           // ACE_Service_Object_Ptr which is an <auto_ptr> specialized
           // for ACE_Service_Object.
 
-	  char *l_argv[3];
+          char *l_argv[3];
           char name_port[] = "-p " ACE_DEFAULT_NAME_SERVER_PORT_STR;
 
           l_argv[0] = name_port;
-	  l_argv[1] = 0;
-	  ACE_Service_Object_Ptr sp_1 = ACE_SVC_INVOKE (ACE_Name_Acceptor);
+          l_argv[1] = 0;
+          ACE_Service_Object_Ptr sp_1 = ACE_SVC_INVOKE (ACE_Name_Acceptor);
 
-	  if (sp_1->init (1, l_argv) == -1)
-	    ACE_ERROR ((LM_ERROR,
+          if (sp_1->init (1, l_argv) == -1)
+            ACE_ERROR ((LM_ERROR,
                         "%p\n%a",
                         "Name Service",
                         1));
 
           char time_port[] = "-p " ACE_DEFAULT_TIME_SERVER_PORT_STR;
-	  l_argv[0] = time_port;
-	  l_argv[1] = 0;
-	  ACE_Service_Object_Ptr sp_2 = ACE_SVC_INVOKE (ACE_TS_Server_Acceptor);
+          l_argv[0] = time_port;
+          l_argv[1] = 0;
+          ACE_Service_Object_Ptr sp_2 = ACE_SVC_INVOKE (ACE_TS_Server_Acceptor);
 
-	  if (sp_2->init (1, l_argv) == -1)
-	    ACE_ERROR ((LM_ERROR,
+          if (sp_2->init (1, l_argv) == -1)
+            ACE_ERROR ((LM_ERROR,
                         "%p\n%a",
                         "TS Server Acceptor", 1));
 
           char clerk_port[] = "-p 10011";
-	  l_argv[0] = argv[0];
-	  l_argv[1] = clerk_port;
-	  l_argv[2] = 0;
-	  ACE_Service_Object_Ptr sp_3 = ACE_SVC_INVOKE (ACE_TS_Clerk_Processor);
+          l_argv[0] = argv[0];
+          l_argv[1] = clerk_port;
+          l_argv[2] = 0;
+          ACE_Service_Object_Ptr sp_3 = ACE_SVC_INVOKE (ACE_TS_Clerk_Processor);
 
-	  if (sp_3->init (2, l_argv) == -1)
-	    ACE_ERROR ((LM_ERROR,
+          if (sp_3->init (2, l_argv) == -1)
+            ACE_ERROR ((LM_ERROR,
                         "%p\n%a",
                         "TS Clerk Processor",
                         1));
 
           char token_port[] = "-p " ACE_DEFAULT_TOKEN_SERVER_PORT_STR;
-	  l_argv[0] = token_port;
-	  l_argv[1] = 0;
-	  ACE_Service_Object_Ptr sp_4 = ACE_SVC_INVOKE (ACE_Token_Acceptor);
+          l_argv[0] = token_port;
+          l_argv[1] = 0;
+          ACE_Service_Object_Ptr sp_4 = ACE_SVC_INVOKE (ACE_Token_Acceptor);
 
-	  if (sp_4->init (1, l_argv) == -1)
-	    ACE_ERROR ((LM_ERROR,
+          if (sp_4->init (1, l_argv) == -1)
+            ACE_ERROR ((LM_ERROR,
                         "%p\n%a",
                         "Token Service",
                         1));
 
-          char thr_logging_port[] = "-p " ACE_DEFAULT_THR_LOGGING_SERVER_PORT_STR;
-	  l_argv[0] = thr_logging_port;
-	  l_argv[1] = 0;
-	  ACE_Service_Object_Ptr sp_5 = ACE_SVC_INVOKE (ACE_Thr_Server_Logging_Acceptor);
+          char thr_logging_port[] = "-p " ACE_DEFAULT_THR_LOGGING_SERVER_PORT_S
+            TR;
+          l_argv[0] = thr_logging_port;
+          l_argv[1] = 0;
+          ACE_Service_Object_Ptr sp_5 =
+            ACE_SVC_INVOKE (ACE_Thr_Server_Logging_Acceptor);
 
-	  if (sp_5->init (1, l_argv) == -1)
-	    ACE_ERROR ((LM_ERROR,
+          if (sp_5->init (1, l_argv) == -1)
+            ACE_ERROR ((LM_ERROR,
                         "%p\n%a",
                         "Threaded Logging Server",
                         1));
 
           char logging_port[] = "-p " ACE_DEFAULT_LOGGING_SERVER_PORT_STR;
-	  l_argv[0] = logging_port;
-	  l_argv[1] = 0;
-	  ACE_Service_Object_Ptr sp_6 = ACE_SVC_INVOKE (ACE_Server_Logging_Acceptor);
+          l_argv[0] = logging_port;
+          l_argv[1] = 0;
+          ACE_Service_Object_Ptr sp_6 =
+            ACE_SVC_INVOKE (ACE_Server_Logging_Acceptor);
 
-	  if (sp_6->init (1, l_argv) == -1)
-	    ACE_ERROR ((LM_ERROR,
+          if (sp_6->init (1, l_argv) == -1)
+            ACE_ERROR ((LM_ERROR,
                         "%p\n%a",
                         "Logging Server", 1));
 
-	  l_argv[0] = logging_port;
-	  l_argv[1] = 0;
-	  ACE_Service_Object_Ptr sp_7 = ACE_SVC_INVOKE (ACE_Client_Logging_Acceptor);
+          l_argv[0] = logging_port;
+          l_argv[1] = 0;
+          ACE_Service_Object_Ptr sp_7 =
+            ACE_SVC_INVOKE (ACE_Client_Logging_Acceptor);
 
-	  if (sp_7->init (1, l_argv) == -1)
-	    ACE_ERROR ((LM_ERROR,
+          if (sp_7->init (1, l_argv) == -1)
+            ACE_ERROR ((LM_ERROR,
                         "%p\n%a",
                         "Logging Client",
                         1));
 
-	  // Run forever, performing the configured services until we
-	  // are shut down by a SIGINT/SIGQUIT signal.
+          // Run forever, performing the configured services until we
+          // are shut down by a SIGINT/SIGQUIT signal.
 
-	  ACE_Reactor::run_event_loop ();
+          ACE_Reactor::run_event_loop ();
 
-	  // Destructors of ACE_Service_Object_Ptr's automagically
-	  // call fini().
-	}
+          // Destructors of ACE_Service_Object_Ptr's automagically
+          // call fini().
+        }
     }
   else // Use dynamic linking.
+    {
+      if (ACE::debug () == 0)
+        ACE_Log_Msg::disable_debug_messages ();
 
-    // Run forever, performing the configured services until we are
-    // shut down by a SIGINT/SIGQUIT signal.
+      // Run forever, performing the configured services until we are
+      // shut down by a SIGINT/SIGQUIT signal.
 
-    ACE_Reactor::run_event_loop ();
+      ACE_Reactor::run_event_loop ();
+    }
 
   return 0;
 }