Security-57740.51.3.tar.gz

[apple/security.git] / KeychainSyncAccountNotification / KeychainSyncAccountNotification.m

diff --git a/KeychainSyncAccountNotification/KeychainSyncAccountNotification.m b/KeychainSyncAccountNotification/KeychainSyncAccountNotification.m
index c710f8661cf5e429ecf65b26810afa530f23a1e1..be7452c4b00eccbb0d297b924128a9db6a594903 100644 (file)
--- a/KeychainSyncAccountNotification/KeychainSyncAccountNotification.m
+++ b/KeychainSyncAccountNotification/KeychainSyncAccountNotification.m
@@ -4,7 +4,6 @@
 //
 
 #import "KeychainSyncAccountNotification.h"
-#import <Accounts/ACLogging.h>
 #import <Accounts/Accounts.h>
 #import <Accounts/Accounts_Private.h>
 #if TARGET_OS_IPHONE
@@ -15,7 +14,9 @@
 #import <AccountsDaemon/ACDAccountStore.h>
 #import <AccountsDaemon/ACDClientAuthorizationManager.h>
 #import <AccountsDaemon/ACDClientAuthorization.h>
-#import <Security/SOSCloudCircle.h>
+#import <Security/SecureObjectSync/SOSCloudCircle.h>
+
+#import "utilities/debugging.h"
 
 @implementation KeychainSyncAccountNotification
 
@@ -38,17 +39,17 @@
                 
                 CFErrorRef removalError = NULL;
                 
-                ACLogDebug(@"Performing SOS circle credential removal for account %@: %@", oldAccount.identifier, oldAccount.username);
+                secinfo("accounts", "Performing SOS circle credential removal for account %@: %@", oldAccount.identifier, oldAccount.username);
                 
                 if (!SOSCCLoggedOutOfAccount(&removalError)) {
-                    ACLogError(@"Account %@ could not leave the SOS circle: %@", oldAccount.identifier, removalError);
+                    secerror("Account %@ could not leave the SOS circle: %@", oldAccount.identifier, removalError);
                 }
             } else {
-                ACLogDebug(@"NOT performing SOS circle credential removal for secondary account %@: %@", account.identifier, account.username);
+                secinfo("accounts", "NOT performing SOS circle credential removal for secondary account %@: %@", account.identifier, account.username);
             }
         }
         else{
-            ACLogDebug(@"Already logged out of account");
+            secinfo("accounts", "Already logged out of account");
             
         }
     }
@@ -62,15 +63,15 @@
 
             if ([self accountIsPrimary:oldAccount]) {
                 CFErrorRef removalError = NULL;
-                ACLogDebug(@"Performing SOS circle credential removal for account %@: %@", oldAccount.identifier, oldAccount.username);
+                secinfo("accounts", "Performing SOS circle credential removal for account %@: %@", oldAccount.identifier, oldAccount.username);
                 if (!SOSCCLoggedOutOfAccount(&removalError)) {
-                    ACLogError(@"Account %@ could not leave the SOS circle: %@", oldAccount.identifier, removalError);
+                    secerror("Account %@ could not leave the SOS circle: %@", oldAccount.identifier, removalError);
                 }
             } else {
-                ACLogDebug(@"NOT performing SOS circle credential removal for secondary account %@: %@", account.identifier, account.username);
+                secinfo("accounts", "NOT performing SOS circle credential removal for secondary account %@: %@", account.identifier, account.username);
             }
         }
-        ACLogDebug(@"Already logged out of account");
+        secinfo("accounts", "Already logged out of account");
     }
 }