Security-59754.80.3.tar.gz

[apple/security.git] / securityd / src / server.cpp

diff --git a/securityd/src/server.cpp b/securityd/src/server.cpp
index d510615c23aa803ccfaa7719c8604920ac5d3595..81fb8fced49926057aff6e1df70307e16fca81a4 100644 (file)
--- a/securityd/src/server.cpp
+++ b/securityd/src/server.cpp
@@ -37,7 +37,6 @@
 #include <mach/mach_error.h>
 #include <security_utilities/ccaudit.h>
 #include <security_utilities/casts.h>
 #include <mach/mach_error.h>
 #include <security_utilities/ccaudit.h>
 #include <security_utilities/casts.h>

-#include "pcscmonitor.h"

 
 #include "agentquery.h"
 
 
 #include "agentquery.h"
 


@@ -330,11 +329,8 @@ kern_return_t self_server_handleSignal(mach_port_t sport,
 #endif //DEBUGDUMP
 
                case SIGUSR2:
 #endif //DEBUGDUMP
 
                case SIGUSR2:

-                       {
-                               extern PCSCMonitor *gPCSC;
-                               gPCSC->startSoftTokens();
-                               break;
-                       }
+            fprintf(stderr, "securityd ignoring SIGUSR2 received");
+            break;

 
                default:
                        assert(false);
 
                default:
                        assert(false);


@@ -509,6 +505,8 @@ bool Server::inDarkWake()
 //
 void Server::loadCssm(bool mdsIsInstalled)
 {
 //
 void Server::loadCssm(bool mdsIsInstalled)
 {

+    try {
+

        if (!mCssm->isActive()) {
                StLock<Mutex> _(*this);
         xpc_transaction_begin();
        if (!mCssm->isActive()) {
                StLock<Mutex> _(*this);
         xpc_transaction_begin();


@@ -525,6 +523,23 @@ void Server::loadCssm(bool mdsIsInstalled)
                }
         xpc_transaction_end();
        }
                }
         xpc_transaction_end();
        }

+    } catch (const UnixError& err) {
+        secerror("load cssm failed: %s", err.what());
+        if (err.unixError() == ENOSPC) {
+            _exit(1);
+        } else {
+            abort();
+        }
+    } catch (const MacOSError& err) {
+        secerror("load cssm failed: %s", err.what());
+        abort();
+    } catch (const CommonError& err) {
+        secerror("load cssm failed: %d/%d", (int)err.osStatus(), err.unixError());
+        abort();
+    } catch (const std::exception& err) {
+        secerror("load cssm failed: %s", err.what());
+        abort();
+    }

 }
 
 
 }