securityd-55199.3.tar.gz

diff --git a/src/kcdatabase.cpp b/src/kcdatabase.cpp
index 5899fbe4e02c6978a5b69224db9aedae4e8837af..6d1037933645c360cd9fcb1ae6ec23542a89133c 100644 (file)
--- a/src/kcdatabase.cpp
+++ b/src/kcdatabase.cpp
@@ -199,8 +199,7 @@ KeychainDatabase::KeychainDatabase(const DLDbIdentifier &id, const DbBlob *blob,
     // check to see if we already know about this database
     DbIdentifier ident(id, blob->randomSignature);
        Session &session = process().session();
     // check to see if we already know about this database
     DbIdentifier ident(id, blob->randomSignature);
        Session &session = process().session();

-       StLock<Mutex> _(session);
-       if (KeychainDbCommon *dbcom =
+       if (RefPointer<KeychainDbCommon> dbcom =

                        session.findFirst<KeychainDbCommon, const DbIdentifier &>(&KeychainDbCommon::identifier, ident)) {
                parent(*dbcom);
                //@@@ arbitrate sequence number here, perhaps update common().mParams
                        session.findFirst<KeychainDbCommon, const DbIdentifier &>(&KeychainDbCommon::identifier, ident)) {
                parent(*dbcom);
                //@@@ arbitrate sequence number here, perhaps update common().mParams