From cd1fb56658a3caddc6eb804ec2d85089e7e249f3 Mon Sep 17 00:00:00 2001
From: Apple <opensource@apple.com>
Date: Thu, 17 Aug 2006 21:06:10 +0000
Subject: [PATCH] securityd-29035.tar.gz

---
 etc/CodeEquivalenceCandidates   |  1 +
 etc/startup.mk                  |  2 +-
 securityd.xcode/project.pbxproj |  2 +-
 src/transition.cpp              | 12 ++++++++++++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/etc/CodeEquivalenceCandidates b/etc/CodeEquivalenceCandidates
index 01914b6..5404062 100644
--- a/etc/CodeEquivalenceCandidates
+++ b/etc/CodeEquivalenceCandidates
@@ -58,6 +58,7 @@
 /usr/bin/crlrefresh
 /usr/bin/security
 /usr/bin/smbutil
+/usr/libexec/airportd
 /usr/local/bin/cmsutil
 /usr/sbin/configd    
 /usr/sbin/pppd
diff --git a/etc/startup.mk b/etc/startup.mk
index 021f90f..f3912c3 100644
--- a/etc/startup.mk
+++ b/etc/startup.mk
@@ -37,7 +37,7 @@ install:
 	cp $(SRC)/securityd.plist $(SRC)/securityd-installCD.plist $(DST)
 	mkdir -p $(AUTHORIZATION_LOCATION)
 	cp $(SRC)/authorization.plist $(AUTHORIZATION_PLIST)
-	chown root:admin $(AUTHORIZATION_PLIST)
+	chown root:wheel $(AUTHORIZATION_PLIST)
 	chmod 644 $(AUTHORIZATION_PLIST)
 	mkdir -p $(VARDB)
 	cp $(SRC)/CodeEquivalenceCandidates $(CANDIDATES)
diff --git a/securityd.xcode/project.pbxproj b/securityd.xcode/project.pbxproj
index 2cbf2f2..00bde5d 100644
--- a/securityd.xcode/project.pbxproj
+++ b/securityd.xcode/project.pbxproj
@@ -836,7 +836,7 @@
 			);
 			buildSettings = {
 				BUILD_VARIANTS = "normal debug";
-				CURRENT_PROJECT_VERSION = 27896;
+				CURRENT_PROJECT_VERSION = 29035;
 				FRAMEWORK_SEARCH_PATHS = "/usr/local/SecurityPieces/Frameworks /usr/local/SecurityPieces/Components/securityd $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
 				INSTALL_PATH = /usr/sbin;
 				OPT_CPPXFLAGS = "$(OPT_CXFLAGS)";
diff --git a/src/transition.cpp b/src/transition.cpp
index 79f708e..c83169b 100644
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -218,6 +218,10 @@ kern_return_t ucsp_server_findFirst(UCSP_ARGS, DbHandle db,
 
 		// return data (temporary fix)
 		if (getData) {
+			if (key) {
+				flip (*outData.interpretedAs<CssmKey>());
+			}
+			
 			*data = outData.data();
 			*dataLength = outData.length();
 		}
@@ -257,6 +261,10 @@ kern_return_t ucsp_server_findNext(UCSP_ARGS, SearchHandle hSearch,
 
 		// return data (temporary fix)
 		if (getData) {
+			if (key) {
+				flip (*outData.interpretedAs<CssmKey>());
+			}
+			
 			*data = outData.data();
 			*dataLength = outData.length();
 		}
@@ -288,6 +296,10 @@ kern_return_t ucsp_server_findRecordHandle(UCSP_ARGS, RecordHandle hRecord,
 
 	// return data (temporary fix)
 	if (getData) {
+		if (key) {
+			flip (*outData.interpretedAs<CssmKey>());
+		}
+			
 		*data = outData.data();
 		*dataLength = outData.length();
 	}
-- 
2.45.2