From 9ac71594613f038cf59c5864e64a0d63aa16bb68 Mon Sep 17 00:00:00 2001
From: Apple <opensource@apple.com>
Date: Fri, 6 Mar 2009 02:02:32 +0000
Subject: [PATCH] securityd-36489.tar.gz

---
 etc/authorization.plist             | 27 +++++++--------------------
 securityd.xcodeproj/project.pbxproj |  8 ++++----
 src/transition.cpp                  |  7 +++++++
 3 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/etc/authorization.plist b/etc/authorization.plist
index c5d1370..53f8837 100644
--- a/etc/authorization.plist
+++ b/etc/authorization.plist
@@ -261,16 +261,14 @@ See remaining rules for examples.
 		</dict>
 		<key>system.print.admin</key>
 		<dict>
+			<key>allow-root</key>
+			<true/>
 			<key>class</key>
-			<string>rule</string>
-			<key>k-of-n</key>
-			<integer>1</integer>
-			<key>rule</key>
-			<array>
-				<string>is-lpadmin</string>
-				<string>is-admin</string>
-				<string>default</string>
-			</array>
+			<string>user</string>
+			<key>group</key>
+			<string>_lpadmin</string>
+			<key>shared</key>
+			<true/>
 		</dict>
 		<key>system.identity.write.</key>
 		<dict>
@@ -669,17 +667,6 @@ See remaining rules for examples.
 			<key>shared</key>
 			<string>true</string>
 		</dict>
-		<key>is-lpadmin</key>
-		<dict>
-			<key>class</key>
-			<string>user</string>
-			<key>comment</key>
-			<string>Verify that the user asking for authorization is an lp administrator.</string>
-			<key>group</key>
-			<string>lpadmin</string>
-			<key>authenticate-user</key>
-			<false/>
-		</dict>
 		<key>is-root</key>
 		<dict>
 			<key>allow-root</key>
diff --git a/securityd.xcodeproj/project.pbxproj b/securityd.xcodeproj/project.pbxproj
index c7a7e71..721a19d 100644
--- a/securityd.xcodeproj/project.pbxproj
+++ b/securityd.xcodeproj/project.pbxproj
@@ -897,7 +897,7 @@
 				BUILD_VARIANTS = debug;
 				COPY_PHASE_STRIP = NO;
 				CSSM_HEADERS = "$(BUILT_PRODUCTS_DIR)/Security.framework/Headers:$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework/Headers";
-				CURRENT_PROJECT_VERSION = 33639;
+				CURRENT_PROJECT_VERSION = 36489;
 				FRAMEWORK_SEARCH_PATHS = (
 					/usr/local/SecurityPieces/Frameworks,
 					/usr/local/SecurityPieces/Components/securityd,
@@ -959,7 +959,7 @@
 					debug,
 				);
 				CSSM_HEADERS = "$(BUILT_PRODUCTS_DIR)/Security.framework/Headers:$(SYSTEM_LIBRARY_DIR)/Frameworks/Security.framework/Headers";
-				CURRENT_PROJECT_VERSION = 33639;
+				CURRENT_PROJECT_VERSION = 36489;
 				DEAD_CODE_STRIPPING = YES;
 				EXPORTED_SYMBOLS_FILE = "$(SRCROOT)/src/securityd.exp";
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1018,7 +1018,7 @@
 			buildSettings = {
 				BUILD_VARIANTS = normal;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 33639;
+				CURRENT_PROJECT_VERSION = 36489;
 				EXPORTED_SYMBOLS_FILE = "$(SRCROOT)/src/securityd.exp";
 				FRAMEWORK_SEARCH_PATHS = (
 					/usr/local/SecurityPieces/Frameworks,
@@ -1075,7 +1075,7 @@
 					normal,
 					debug,
 				);
-				CURRENT_PROJECT_VERSION = 33639;
+				CURRENT_PROJECT_VERSION = 36489;
 				EXPORTED_SYMBOLS_FILE = "$(SRCROOT)/src/securityd.exp";
 				FRAMEWORK_SEARCH_PATHS = (
 					/usr/local/SecurityPieces/Frameworks,
diff --git a/src/transition.cpp b/src/transition.cpp
index b18fa2b..40f3646 100644
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -260,6 +260,13 @@ kern_return_t ucsp_server_teardown(UCSP_ARGS)
 	return KERN_SUCCESS;
 }
 
+kern_return_t ucsp_server_verifyPrivileged(UCSP_ARGS)
+{
+	BEGIN_IPCN
+	// This line intentionally left blank.
+	END_IPCN(CSSM)
+	return KERN_SUCCESS;
+}
 
 //
 // Common database operations
-- 
2.45.2