securityd-55199.3.tar.gz

[apple/securityd.git] / src / database.cpp

diff --git a/src/database.cpp b/src/database.cpp
index cb49a92dbfd410ba6e48ec66f08bd32fd5ef99b9..25a7d413977a8262a1343adff332f9c839db033d 100644 (file)
--- a/src/database.cpp
+++ b/src/database.cpp
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000-2001 Apple Computer, Inc. All Rights Reserved.
+ * Copyright (c) 2000-2007 Apple Inc. All Rights Reserved.

  * 
  * @APPLE_LICENSE_HEADER_START@
  * 
  * 
  * @APPLE_LICENSE_HEADER_START@
  * 


@@ -67,7 +67,7 @@ Process& Database::process() const
 {
        return referent<Process>();
 }
 {
        return referent<Process>();
 }

-
+       

 
 //
 // Send a keychain-related notification event about this database
 
 //
 // Send a keychain-related notification event about this database


@@ -87,6 +87,7 @@ void DbCommon::notify(NotificationEvent event, const DLDbIdentifier &ident)
     free (data.data());
 }
 
     free (data.data());
 }
 

+

 //
 // Default behaviors
 //
 //
 // Default behaviors
 //


@@ -100,6 +101,11 @@ void DbCommon::lockProcessing()
        // nothing
 }
 
        // nothing
 }
 

+bool DbCommon::belongsToSystem() const
+{
+       return false;
+}
+

 
 void Database::releaseKey(Key &key)
 {
 
 void Database::releaseKey(Key &key)
 {


@@ -186,7 +192,7 @@ SecurityServerAcl &Database::acl()
        CssmError::throwMe(CSSM_ERRCODE_FUNCTION_NOT_IMPLEMENTED);
 }
 
        CssmError::throwMe(CSSM_ERRCODE_FUNCTION_NOT_IMPLEMENTED);
 }
 

-bool Database::isLocked() const
+bool Database::isLocked()

 {
        secdebug("database", "%p calling unimplemented isLocked", this);
        CssmError::throwMe(CSSM_ERRCODE_FUNCTION_NOT_IMPLEMENTED);
 {
        secdebug("database", "%p calling unimplemented isLocked", this);
        CssmError::throwMe(CSSM_ERRCODE_FUNCTION_NOT_IMPLEMENTED);


@@ -207,11 +213,6 @@ AclKind Database::aclKind() const
        return dbAcl;
 }
 
        return dbAcl;
 }
 

-GenericHandle Database::aclHandle() const
-{
-       return HandleObject::handle();
-}
-

 
 //
 // Remote validation is not, by default, supported
 
 //
 // Remote validation is not, by default, supported