From 9b7150daea46853b31f80dffbfc3f6f64cd7a635 Mon Sep 17 00:00:00 2001 From: Apple Date: Tue, 10 Jan 2006 21:32:46 +0000 Subject: [PATCH] securityd-25991.tar.gz --- etc/CodeEquivalenceCandidates | 2 ++ securityd.xcode/project.pbxproj | 2 +- src/AuthorizationEngine.cpp | 2 ++ src/AuthorizationMechEval.cpp | 3 +++ src/AuthorizationRule.cpp | 2 ++ src/database.cpp | 2 +- src/structure.h | 4 ++-- 7 files changed, 13 insertions(+), 4 deletions(-) diff --git a/etc/CodeEquivalenceCandidates b/etc/CodeEquivalenceCandidates index 45cc39a..7c90c92 100644 --- a/etc/CodeEquivalenceCandidates +++ b/etc/CodeEquivalenceCandidates @@ -11,6 +11,7 @@ /Applications/Utilities/Keychain Access.app /Applications/Utilities/Keychain Access.app/Contents/Resources/Keychain Agent /Applications/iCal.app +/Applications/iCal.app/Contents/Resources/iCal Helper.app /Applications/iChat.app /Applications/iMovie.app /Applications/iPhoto.app @@ -21,6 +22,7 @@ /System/Library/CoreServices/MirrorAgent.app /System/Library/CoreServices/SecurityAgent.app /System/Library/CoreServices/SyncServer.app +/System/Library/CoreServices/SyncServer.app/Contents/Resources/safaritool /System/Library/CoreServices/SystemUIServer.app /System/Library/CoreServices/dotmacsyncclient /System/Library/Filesystems/ftp.fs/mount_ftp diff --git a/securityd.xcode/project.pbxproj b/securityd.xcode/project.pbxproj index a84ae96..b041ec5 100644 --- a/securityd.xcode/project.pbxproj +++ b/securityd.xcode/project.pbxproj @@ -838,7 +838,7 @@ ); buildSettings = { BUILD_VARIANTS = "normal debug"; - CURRENT_PROJECT_VERSION = 25481; + CURRENT_PROJECT_VERSION = 25991; FRAMEWORK_SEARCH_PATHS = "/usr/local/SecurityPieces/Frameworks /usr/local/SecurityPieces/Components/securityd $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks"; INSTALL_PATH = /usr/sbin; OPT_CPPXFLAGS = "$(OPT_CXFLAGS) -fno-enforce-eh-specs -fno-implement-inlines -fcoalesce-templates"; diff --git a/src/AuthorizationEngine.cpp b/src/AuthorizationEngine.cpp index a7078ae..0a41fd1 100644 --- a/src/AuthorizationEngine.cpp +++ b/src/AuthorizationEngine.cpp @@ -131,6 +131,8 @@ Engine::authorize(const AuthItemSet &inRights, const AuthItemSet &environment, if (username.length()) { + // Call to checkpw in DS + Server::active().longTermActivity(); // Let's create a credential from the passed in username and password. Credential newCredential(username, password, shared); // If it's valid insert it into the credentials list. Normally this is diff --git a/src/AuthorizationMechEval.cpp b/src/AuthorizationMechEval.cpp index 87ccdc2..571cff7 100644 --- a/src/AuthorizationMechEval.cpp +++ b/src/AuthorizationMechEval.cpp @@ -209,6 +209,9 @@ AuthorizationResult AgentMechanismEvaluator::authinternal(AuthItemSet &context) break; string password(static_cast((*found)->value().data), (*found)->value().length); secdebug("AuthEvalMech", "found password"); + + // Call to checkpw in DS + Server::active().longTermActivity(); Credential newCredential(username, password, true); // create a new shared credential if (newCredential->isValid()) diff --git a/src/AuthorizationRule.cpp b/src/AuthorizationRule.cpp index fdbbac9..c1a1b21 100644 --- a/src/AuthorizationRule.cpp +++ b/src/AuthorizationRule.cpp @@ -570,6 +570,8 @@ RuleImpl::makeCredentials(const AuthorizationToken &auth) const secdebug("AuthEvalMech", "found password"); string password = (**found).stringValue(); secdebug("AuthEvalMech", "falling back on username/password credential if valid"); + // Call to checkpw in DS + Server::active().longTermActivity(); Credential newCred(username, password, mShared); newCredentials.insert(newCred); CommonCriteria::AuditRecord auditrec(auth.creatorAuditToken()); diff --git a/src/database.cpp b/src/database.cpp index edc689d..e1e652c 100644 --- a/src/database.cpp +++ b/src/database.cpp @@ -231,7 +231,7 @@ bool SystemKeychainKey::matches(const DbBlob::Signature &signature) bool SystemKeychainKey::update() { // if we checked recently, just assume it's okay - if (mUpdateThreshold > Time::now()) + if (mValid && mUpdateThreshold > Time::now()) return mValid; // check the file diff --git a/src/structure.h b/src/structure.h index 025d7f2..2be7527 100644 --- a/src/structure.h +++ b/src/structure.h @@ -132,8 +132,8 @@ template void NodeCore::allReferences(void (Sub::*func)()) { StLock _(*this); - for (ReferenceSet::const_iterator it = mReferences.begin(); it != mReferences.end(); it++) - if (RefPointer sub = dynamic_cast(it->get())) + for (ReferenceSet::const_iterator it = mReferences.begin(); it != mReferences.end();) + if (RefPointer sub = dynamic_cast((it++)->get())) (sub->*func)(); } -- 2.45.2