Properly revert [1096] (refs #3)

1 files changed, 2 insertions, 34 deletions

diff --git a/bin/bbstored/BackupStoreDaemon.cpp b/bin/bbstored/BackupStoreDaemon.cpp
index ca28ed57..91d7cd12 100644
--- a/bin/bbstored/BackupStoreDaemon.cpp
+++ b/bin/bbstored/BackupStoreDaemon.cpp
@@ -241,49 +241,17 @@ void BackupStoreDaemon::Run()
 	}
 }
 
+
 // --------------------------------------------------------------------------
 //
 // Function
 //		Name:    BackupStoreDaemon::Connection(SocketStreamTLS &)
-//		Purpose: Handles a connection, by catching exceptions and
-//			 delegating to Connection2
+//		Purpose: Handles a connection
 //		Created: 2003/08/20
 //
 // --------------------------------------------------------------------------
 void BackupStoreDaemon::Connection(SocketStreamTLS &rStream)
 {
-	try
-	{
-		Connection2(rStream);
-	}
-	catch(BoxException &e)
-	{
-		::syslog(LOG_ERR, "%s: disconnecting due to "
-			"exception %s (%d/%d)", DaemonName(), 
-			e.what(), e.GetType(), e.GetSubType());
-	}
-	catch(std::exception &e)
-	{
-		::syslog(LOG_ERR, "%s: disconnecting due to "
-			"exception %s", DaemonName(), e.what());
-	}
-	catch(...)
-	{
-		::syslog(LOG_ERR, "%s: disconnecting due to "
-			"unknown exception", DaemonName());
-	}
-}
-	
-// --------------------------------------------------------------------------
-//
-// Function
-//		Name:    BackupStoreDaemon::Connection2(SocketStreamTLS &)
-//		Purpose: Handles a connection from bbackupd
-//		Created: 2006/11/12
-//
-// --------------------------------------------------------------------------
-void BackupStoreDaemon::Connection2(SocketStreamTLS &rStream)
-{
 	// Get the common name from the certificate
 	std::string clientCommonName(rStream.GetPeerCommonName());