X-Git-Url: https://git.saurik.com/apple/security.git/blobdiff_plain/b3971512e61ecab68b17ca7ffe6c8c600310a026..refs/heads/master:/OSX/libsecurity_cdsa_utilities/lib/cssmdb.h

diff --git a/OSX/libsecurity_cdsa_utilities/lib/cssmdb.h b/OSX/libsecurity_cdsa_utilities/lib/cssmdb.h
index 66c9bcb2..be227a3b 100644
--- a/OSX/libsecurity_cdsa_utilities/lib/cssmdb.h
+++ b/OSX/libsecurity_cdsa_utilities/lib/cssmdb.h
@@ -220,9 +220,7 @@ class CssmDLPolyData
 public:
 	CssmDLPolyData(const CSSM_DATA &data, CSSM_DB_ATTRIBUTE_FORMAT format)
 	: mData(CssmData::overlay(data))
-#ifndef NDEBUG
     , mFormat(format)
-#endif 
     {}
 
 	// @@@ Don't use assert, but throw an exception.
@@ -269,9 +267,7 @@ public:
 
 private:
 	const CssmData &mData;
-#ifndef NDEBUG
 	CSSM_DB_ATTRIBUTE_FORMAT mFormat;
-#endif
 };
 
 
@@ -686,6 +682,8 @@ public:
 		const CSSM_NET_ADDRESS *location = NULL)
 		: mImpl(new Impl(CssmSubserviceUid(guid, NULL, ssid, sstype), name, location)) { }
 
+    DLDbIdentifier(const DLDbIdentifier& i) : mImpl(i.mImpl) {}
+
 	// Conversion Operators
 	bool operator !() const { return !mImpl; }
 	operator bool() const { return mImpl; }
@@ -749,7 +747,10 @@ struct DLDbFlatIdentifier {
 		address(const_cast<CssmNetAddress *>(ident.dbLocation()))
 		{ }
 
-    operator DLDbIdentifier ()	{ return DLDbIdentifier(*uid, name, address); }
+    operator DLDbIdentifier ()	{
+        DLDbIdentifier db(*uid, name, address);
+        return db;
+    }
 };
 
 template<class Action>