X-Git-Url: https://git.saurik.com/apple/security.git/blobdiff_plain/5c19dc3ae3bd8e40a9c028b0deddd50ff337692c..7e6b461318c8a779d91381531435a68ee4e8b6ed:/OSX/libsecurity_mds/lib/MDSDatabase.cpp

diff --git a/OSX/libsecurity_mds/lib/MDSDatabase.cpp b/OSX/libsecurity_mds/lib/MDSDatabase.cpp
index fb388dae..a822021a 100644
--- a/OSX/libsecurity_mds/lib/MDSDatabase.cpp
+++ b/OSX/libsecurity_mds/lib/MDSDatabase.cpp
@@ -48,7 +48,7 @@ MDSDatabase::~MDSDatabase ()
 DbContext *
 MDSDatabase::makeDbContext (DatabaseSession &inDatabaseSession,
                             CSSM_DB_ACCESS_TYPE inAccessRequest,
-                            const CSSM_ACCESS_CREDENTIALS *inAccessCred,
+                            const AccessCredentials *inAccessCred,
                             const void *inOpenParameters)
 {
     return new DbContext (*this, inDatabaseSession, inAccessRequest,
@@ -75,7 +75,7 @@ MDSDatabase::createRelation(DbContext &dbContext,
 	CSSM_DB_RECORDTYPE inRelationID,
 	const char *inRelationName,
 	uint32 inNumberOfAttributes,
-	const CSSM_DB_SCHEMA_ATTRIBUTE_INFO &inAttributeInfo,
+	const CSSM_DB_SCHEMA_ATTRIBUTE_INFO *inAttributeInfo,
 	uint32 inNumberOfIndexes,
 	const CSSM_DB_SCHEMA_INDEX_INFO &inIndexInfo)
 {
@@ -140,7 +140,6 @@ MDSDatabase::dataGetNext (DbContext &dbContext,
                           CSSM_DB_UNIQUE_RECORD_PTR &UniqueRecordIdentifier)
 {
     CssmError ::throwMe(CSSM_ERRCODE_FUNCTION_NOT_IMPLEMENTED);
-	return false;
 }
 
 void
@@ -176,7 +175,7 @@ MDSDatabase::dbCreate (DbContext &inDbContext, const CSSM_DBINFO &inDBInfo,
 
 void
 MDSDatabase::dbDelete (DatabaseSession &inDatabaseSession,
-                       const CSSM_ACCESS_CREDENTIALS *inAccessCred)
+                       const AccessCredentials *inAccessCred)
 {
     CssmError ::throwMe(CSSM_ERRCODE_FUNCTION_NOT_IMPLEMENTED);
 }
@@ -184,7 +183,7 @@ MDSDatabase::dbDelete (DatabaseSession &inDatabaseSession,
 void
 MDSDatabase::authenticate(DbContext &dbContext,
                           CSSM_DB_ACCESS_TYPE inAccessRequest,
-                          const CSSM_ACCESS_CREDENTIALS &inAccessCred)
+                          const AccessCredentials &inAccessCred)
 {
     CssmError ::throwMe(CSSM_ERRCODE_FUNCTION_NOT_IMPLEMENTED);
 }
@@ -200,7 +199,7 @@ MDSDatabase::getDbAcl(DbContext &dbContext,
 
 void
 MDSDatabase::changeDbAcl(DbContext &dbContext,
-                         const CSSM_ACCESS_CREDENTIALS &inAccessCred,
+                         const AccessCredentials &inAccessCred,
                          const CSSM_ACL_EDIT &inAclEdit)
 {
     CssmError ::throwMe(CSSM_ERRCODE_FUNCTION_NOT_IMPLEMENTED);
@@ -214,7 +213,7 @@ MDSDatabase::getDbOwner(DbContext &dbContext, CSSM_ACL_OWNER_PROTOTYPE &outOwner
 
 void
 MDSDatabase::changeDbOwner(DbContext &dbContext,
-                           const CSSM_ACCESS_CREDENTIALS &inAccessCred,
+                           const AccessCredentials &inAccessCred,
                            const CSSM_ACL_OWNER_PROTOTYPE &inNewOwner)
 {
     CssmError ::throwMe(CSSM_ERRCODE_FUNCTION_NOT_IMPLEMENTED);