[CalendarServer-changes] [3540] PyOpenDirectory/trunk/support

source_changes at macosforge.org source_changes at macosforge.org
Wed Dec 17 10:15:17 PST 2008


Revision: 3540
          http://trac.macosforge.org/projects/calendarserver/changeset/3540
Author:   cdaboo at apple.com
Date:     2008-12-17 10:15:16 -0800 (Wed, 17 Dec 2008)
Log Message:
-----------
Latest project and test file.

Modified Paths:
--------------
    PyOpenDirectory/trunk/support/PyOpenDirectory.xcodeproj/cyrusdaboo.mode1v3
    PyOpenDirectory/trunk/support/PyOpenDirectory.xcodeproj/cyrusdaboo.pbxuser
    PyOpenDirectory/trunk/support/PyOpenDirectory.xcodeproj/project.pbxproj
    PyOpenDirectory/trunk/support/test.cpp

Modified: PyOpenDirectory/trunk/support/PyOpenDirectory.xcodeproj/cyrusdaboo.mode1v3
===================================================================
--- PyOpenDirectory/trunk/support/PyOpenDirectory.xcodeproj/cyrusdaboo.mode1v3	2008-12-17 18:14:59 UTC (rev 3539)
+++ PyOpenDirectory/trunk/support/PyOpenDirectory.xcodeproj/cyrusdaboo.mode1v3	2008-12-17 18:15:16 UTC (rev 3540)
@@ -269,13 +269,12 @@
 								<string>08FB7794FE84155DC02AAC07</string>
 								<string>08FB7795FE84155DC02AAC07</string>
 								<string>AF155A3D0A501FA0007E1E6E</string>
-								<string>AF155A350A501F9D007E1E6E</string>
 								<string>1C37FABC05509CD000000102</string>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
-									<integer>8</integer>
+									<integer>4</integer>
 									<integer>1</integer>
 									<integer>0</integer>
 								</array>
@@ -318,7 +317,7 @@
 								<key>PBXProjectModuleGUID</key>
 								<string>1CE0B20306471E060097A5F4</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>PythonWrapper.cpp</string>
+								<string>CDirectoryServiceManager.h</string>
 								<key>PBXSplitModuleInNavigatorKey</key>
 								<dict>
 									<key>Split0</key>
@@ -326,26 +325,36 @@
 										<key>PBXProjectModuleGUID</key>
 										<string>1CE0B20406471E060097A5F4</string>
 										<key>PBXProjectModuleLabel</key>
-										<string>PythonWrapper.cpp</string>
+										<string>CDirectoryServiceManager.h</string>
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>AFDF2BFB0ECC846100B8B73B</string>
+										<string>AF02EA010EF9578E005EC935</string>
 										<key>history</key>
 										<array>
-											<string>AFDF2BF10ECC846100B8B73B</string>
-											<string>AFDF2BF20ECC846100B8B73B</string>
-											<string>AFDF2BF30ECC846100B8B73B</string>
-											<string>AFDF2BF40ECC846100B8B73B</string>
+											<string>AF02E9ED0EF9578E005EC935</string>
+											<string>AF02E9EE0EF9578E005EC935</string>
+											<string>AF02E9EF0EF9578E005EC935</string>
+											<string>AF02E9F00EF9578E005EC935</string>
+											<string>AF02E9F10EF9578E005EC935</string>
+											<string>AF02E9F20EF9578E005EC935</string>
+											<string>AF02E9F30EF9578E005EC935</string>
+											<string>AF02E9F40EF9578E005EC935</string>
+											<string>AF02E9F50EF9578E005EC935</string>
 										</array>
 										<key>prevStack</key>
 										<array>
-											<string>AFDF2BF50ECC846100B8B73B</string>
-											<string>AFDF2BF60ECC846100B8B73B</string>
-											<string>AFDF2BF70ECC846100B8B73B</string>
-											<string>AFDF2BF80ECC846100B8B73B</string>
-											<string>AFDF2BF90ECC846100B8B73B</string>
-											<string>AFDF2BFA0ECC846100B8B73B</string>
+											<string>AF02E9F60EF9578E005EC935</string>
+											<string>AF02E9F70EF9578E005EC935</string>
+											<string>AF02E9F80EF9578E005EC935</string>
+											<string>AF02E9F90EF9578E005EC935</string>
+											<string>AF02E9FA0EF9578E005EC935</string>
+											<string>AF02E9FB0EF9578E005EC935</string>
+											<string>AF02E9FC0EF9578E005EC935</string>
+											<string>AF02E9FD0EF9578E005EC935</string>
+											<string>AF02E9FE0EF9578E005EC935</string>
+											<string>AF02E9FF0EF9578E005EC935</string>
+											<string>AF02EA000EF9578E005EC935</string>
 										</array>
 									</dict>
 									<key>SplitCount</key>
@@ -357,14 +366,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {1654, 1019}}</string>
+								<string>{{0, 0}, {1654, 1073}}</string>
 								<key>RubberWindowFrame</key>
 								<string>0 59 1920 1119 0 0 1920 1178 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>1019pt</string>
+							<string>1073pt</string>
 						</dict>
 						<dict>
 							<key>ContentConfiguration</key>
@@ -377,14 +386,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 1024}, {1654, 54}}</string>
+								<string>{{0, 1078}, {1654, 0}}</string>
 								<key>RubberWindowFrame</key>
 								<string>0 59 1920 1119 0 0 1920 1178 </string>
 							</dict>
 							<key>Module</key>
 							<string>XCDetailModule</string>
 							<key>Proportion</key>
-							<string>54pt</string>
+							<string>0pt</string>
 						</dict>
 					</array>
 					<key>Proportion</key>
@@ -403,9 +412,9 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>AFDF2BFC0ECC846100B8B73B</string>
+				<string>AF02EA020EF9578E005EC935</string>
 				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>AFDF2BFD0ECC846100B8B73B</string>
+				<string>AF02EA030EF9578E005EC935</string>
 				<string>1CE0B20306471E060097A5F4</string>
 				<string>1CE0B20506471E060097A5F4</string>
 			</array>
@@ -539,6 +548,11 @@
 	<integer>5</integer>
 	<key>WindowOrderList</key>
 	<array>
+		<string>AF02EA040EF9578E005EC935</string>
+		<string>AF02EA050EF9578E005EC935</string>
+		<string>AF275A0D0CAC0FEA005A6274</string>
+		<string>1CD10A99069EF8BA00B06720</string>
+		<string>1C78EAAD065D492600B07095</string>
 		<string>/Volumes/Data/Users/cyrusdaboo/Documents/Development/Apple/eclipse/PyOpenDirectory/support/PyOpenDirectory.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
@@ -558,34 +572,32 @@
 					<key>Dock</key>
 					<array>
 						<dict>
-							<key>BecomeActive</key>
-							<true/>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXProjectModuleGUID</key>
 								<string>1CD0528F0623707200166675</string>
 								<key>PBXProjectModuleLabel</key>
-								<string>CDirectoryService.h</string>
+								<string></string>
 								<key>StatusBarVisibility</key>
 								<true/>
 							</dict>
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {1224, 453}}</string>
+								<string>{{0, 0}, {1224, 0}}</string>
 								<key>RubberWindowFrame</key>
-								<string>8 106 1224 772 0 0 1440 878 </string>
+								<string>26 406 1224 772 0 0 1920 1178 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
 							<key>Proportion</key>
-							<string>453pt</string>
+							<string>0pt</string>
 						</dict>
 						<dict>
 							<key>ContentConfiguration</key>
 							<dict>
 								<key>PBXBuildLogShowsTranscriptDefaultKey</key>
-								<string>{{0, 232}, {1224, 218}}</string>
+								<string>{{0, 229}, {1224, 497}}</string>
 								<key>PBXProjectModuleGUID</key>
 								<string>XCMainBuildResultsModuleGUID</string>
 								<key>PBXProjectModuleLabel</key>
@@ -598,14 +610,14 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 458}, {1224, 450}}</string>
+								<string>{{0, 5}, {1224, 726}}</string>
 								<key>RubberWindowFrame</key>
-								<string>8 106 1224 772 0 0 1440 878 </string>
+								<string>26 406 1224 772 0 0 1920 1178 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXBuildResultsModule</string>
 							<key>Proportion</key>
-							<string>450pt</string>
+							<string>726pt</string>
 						</dict>
 					</array>
 					<key>Proportion</key>
@@ -623,14 +635,14 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>AF275A0D0CAC0FEA005A6274</string>
-				<string>AF42FB6B0E8B1C2F008B0A12</string>
+				<string>AF02E9DF0EF95396005EC935</string>
 				<string>1CD0528F0623707200166675</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.buildV3</string>
 			<key>WindowString</key>
-			<string>8 106 1224 772 0 0 1440 878 </string>
+			<string>26 406 1224 772 0 0 1920 1178 </string>
 			<key>WindowToolGUID</key>
 			<string>AF275A0D0CAC0FEA005A6274</string>
 			<key>WindowToolIsVisible</key>
@@ -665,8 +677,8 @@
 										<string>yes</string>
 										<key>sizes</key>
 										<array>
-											<string>{{0, 0}, {657, 404}}</string>
-											<string>{{657, 0}, {783, 404}}</string>
+											<string>{{0, 0}, {484, 393}}</string>
+											<string>{{484, 0}, {956, 393}}</string>
 										</array>
 									</dict>
 									<key>VerticalSplitView</key>
@@ -681,8 +693,8 @@
 										<string>yes</string>
 										<key>sizes</key>
 										<array>
-											<string>{{0, 0}, {1440, 404}}</string>
-											<string>{{0, 404}, {1440, 373}}</string>
+											<string>{{0, 0}, {1440, 393}}</string>
+											<string>{{0, 393}, {1440, 384}}</string>
 										</array>
 									</dict>
 								</dict>
@@ -710,12 +722,12 @@
 										<string>Name</string>
 										<real>265</real>
 										<string>Value</string>
-										<real>85</real>
+										<real>124</real>
 										<string>Summary</string>
-										<real>408</real>
+										<real>542</real>
 									</array>
 									<key>Frame</key>
-									<string>{{657, 0}, {783, 404}}</string>
+									<string>{{484, 0}, {956, 393}}</string>
 									<key>RubberWindowFrame</key>
 									<string>480 360 1440 818 0 0 1920 1178 </string>
 								</dict>
@@ -743,13 +755,13 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1CD10A99069EF8BA00B06720</string>
-				<string>AF2FBA020E814EE100C9D8E5</string>
+				<string>AF02E9E00EF95396005EC935</string>
 				<string>1C162984064C10D400B95A72</string>
-				<string>AF2FBA030E814EE100C9D8E5</string>
-				<string>AF2FBA040E814EE100C9D8E5</string>
-				<string>AF2FBA050E814EE100C9D8E5</string>
-				<string>AF2FBA060E814EE100C9D8E5</string>
-				<string>AF2FBA070E814EE100C9D8E5</string>
+				<string>AF02E9E10EF95396005EC935</string>
+				<string>AF02E9E20EF95396005EC935</string>
+				<string>AF02E9E30EF95396005EC935</string>
+				<string>AF02E9E40EF95396005EC935</string>
+				<string>AF02E9E50EF95396005EC935</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.debugV3</string>
@@ -882,7 +894,7 @@
 								<key>Frame</key>
 								<string>{{0, 0}, {1085, 479}}</string>
 								<key>RubberWindowFrame</key>
-								<string>365 528 1085 520 0 0 1920 1178 </string>
+								<string>402 371 1085 520 0 0 1920 1178 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXDebugCLIModule</string>
@@ -905,17 +917,17 @@
 			<key>TableOfContents</key>
 			<array>
 				<string>1C78EAAD065D492600B07095</string>
-				<string>AF2FBA080E814EE100C9D8E5</string>
+				<string>AF02E9E60EF95396005EC935</string>
 				<string>1C78EAAC065D492600B07095</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.consoleV3</string>
 			<key>WindowString</key>
-			<string>365 528 1085 520 0 0 1920 1178 </string>
+			<string>402 371 1085 520 0 0 1920 1178 </string>
 			<key>WindowToolGUID</key>
 			<string>1C78EAAD065D492600B07095</string>
 			<key>WindowToolIsVisible</key>
-			<false/>
+			<true/>
 		</dict>
 		<dict>
 			<key>Identifier</key>

Modified: PyOpenDirectory/trunk/support/PyOpenDirectory.xcodeproj/cyrusdaboo.pbxuser
===================================================================
--- PyOpenDirectory/trunk/support/PyOpenDirectory.xcodeproj/cyrusdaboo.pbxuser	2008-12-17 18:14:59 UTC (rev 3539)
+++ PyOpenDirectory/trunk/support/PyOpenDirectory.xcodeproj/cyrusdaboo.pbxuser	2008-12-17 18:15:16 UTC (rev 3540)
@@ -1,7 +1,6 @@
 // !$*UTF8*$!
 {
 	08FB7793FE84155DC02AAC07 /* Project object */ = {
-		activeArchitecture = i386;
 		activeBuildConfigurationName = Debug;
 		activeExecutable = AF155A290A501F5C007E1E6E /* PyOpenDirectory */;
 		activeTarget = 8DD76F620486A84900D96B5E /* PyOpenDirectory */;
@@ -9,7 +8,6 @@
 			8DD76F620486A84900D96B5E /* PyOpenDirectory */,
 		);
 		breakpoints = (
-			AF0015650B8A245A0045DAEE /* test.cpp:209 */,
 		);
 		codeSenseManager = AF155A2E0A501F7B007E1E6E /* Code sense */;
 		executables = (
@@ -62,21 +60,31 @@
 					PBXFileDataSource_Target_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 248282819;
-			PBXWorkspaceStateSaveDate = 248282819;
+			PBXPerProjectTemplateStateSaveDate = 251221906;
+			PBXWorkspaceStateSaveDate = 251221906;
 		};
 		perUserProjectItems = {
-			AFDF2BF10ECC846100B8B73B /* PBXTextBookmark */ = AFDF2BF10ECC846100B8B73B /* PBXTextBookmark */;
-			AFDF2BF20ECC846100B8B73B /* PBXTextBookmark */ = AFDF2BF20ECC846100B8B73B /* PBXTextBookmark */;
-			AFDF2BF30ECC846100B8B73B /* PBXTextBookmark */ = AFDF2BF30ECC846100B8B73B /* PBXTextBookmark */;
-			AFDF2BF40ECC846100B8B73B /* PBXTextBookmark */ = AFDF2BF40ECC846100B8B73B /* PBXTextBookmark */;
-			AFDF2BF50ECC846100B8B73B /* PBXTextBookmark */ = AFDF2BF50ECC846100B8B73B /* PBXTextBookmark */;
-			AFDF2BF60ECC846100B8B73B /* PBXTextBookmark */ = AFDF2BF60ECC846100B8B73B /* PBXTextBookmark */;
-			AFDF2BF70ECC846100B8B73B /* PBXTextBookmark */ = AFDF2BF70ECC846100B8B73B /* PBXTextBookmark */;
-			AFDF2BF80ECC846100B8B73B /* PBXTextBookmark */ = AFDF2BF80ECC846100B8B73B /* PBXTextBookmark */;
-			AFDF2BF90ECC846100B8B73B /* PBXTextBookmark */ = AFDF2BF90ECC846100B8B73B /* PBXTextBookmark */;
-			AFDF2BFA0ECC846100B8B73B /* PBXTextBookmark */ = AFDF2BFA0ECC846100B8B73B /* PBXTextBookmark */;
-			AFDF2BFB0ECC846100B8B73B /* PBXTextBookmark */ = AFDF2BFB0ECC846100B8B73B /* PBXTextBookmark */;
+			AF02E9ED0EF9578E005EC935 = AF02E9ED0EF9578E005EC935 /* PBXTextBookmark */;
+			AF02E9EE0EF9578E005EC935 = AF02E9EE0EF9578E005EC935 /* PBXTextBookmark */;
+			AF02E9EF0EF9578E005EC935 = AF02E9EF0EF9578E005EC935 /* PBXTextBookmark */;
+			AF02E9F00EF9578E005EC935 = AF02E9F00EF9578E005EC935 /* PBXTextBookmark */;
+			AF02E9F10EF9578E005EC935 = AF02E9F10EF9578E005EC935 /* PBXTextBookmark */;
+			AF02E9F20EF9578E005EC935 = AF02E9F20EF9578E005EC935 /* PBXTextBookmark */;
+			AF02E9F30EF9578E005EC935 = AF02E9F30EF9578E005EC935 /* PBXTextBookmark */;
+			AF02E9F40EF9578E005EC935 = AF02E9F40EF9578E005EC935 /* PBXTextBookmark */;
+			AF02E9F50EF9578E005EC935 = AF02E9F50EF9578E005EC935 /* PBXTextBookmark */;
+			AF02E9F60EF9578E005EC935 = AF02E9F60EF9578E005EC935 /* PBXTextBookmark */;
+			AF02E9F70EF9578E005EC935 = AF02E9F70EF9578E005EC935 /* PBXTextBookmark */;
+			AF02E9F80EF9578E005EC935 = AF02E9F80EF9578E005EC935 /* PBXTextBookmark */;
+			AF02E9F90EF9578E005EC935 = AF02E9F90EF9578E005EC935 /* PBXTextBookmark */;
+			AF02E9FA0EF9578E005EC935 = AF02E9FA0EF9578E005EC935 /* PBXTextBookmark */;
+			AF02E9FB0EF9578E005EC935 = AF02E9FB0EF9578E005EC935 /* PBXTextBookmark */;
+			AF02E9FC0EF9578E005EC935 = AF02E9FC0EF9578E005EC935 /* PBXTextBookmark */;
+			AF02E9FD0EF9578E005EC935 = AF02E9FD0EF9578E005EC935 /* PBXTextBookmark */;
+			AF02E9FE0EF9578E005EC935 = AF02E9FE0EF9578E005EC935 /* PBXTextBookmark */;
+			AF02E9FF0EF9578E005EC935 = AF02E9FF0EF9578E005EC935 /* PBXTextBookmark */;
+			AF02EA000EF9578E005EC935 = AF02EA000EF9578E005EC935 /* PBXTextBookmark */;
+			AF02EA010EF9578E005EC935 = AF02EA010EF9578E005EC935 /* PBXTextBookmark */;
 		};
 		sourceControlManager = AF155A2D0A501F7B007E1E6E /* Source Control */;
 		userBuildSettings = {
@@ -84,9 +92,9 @@
 	};
 	08FB7796FE84155DC02AAC07 /* test.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1118, 4760}}";
-			sepNavSelRange = "{1614, 30}";
-			sepNavVisRange = "{905, 2059}";
+			sepNavIntBoundsRect = "{{0, 0}, {1593, 4788}}";
+			sepNavSelRange = "{4457, 0}";
+			sepNavVisRange = "{4065, 2579}";
 			sepNavVisRect = "{{0, 1574}, {1521, 647}}";
 			sepNavWindowFrame = "{{344, 35}, {1220, 1036}}";
 		};
@@ -97,28 +105,11 @@
 			AF155A290A501F5C007E1E6E /* PyOpenDirectory */,
 		);
 	};
-	AF0015650B8A245A0045DAEE /* test.cpp:209 */ = {
-		isa = PBXFileBreakpoint;
-		actions = (
-		);
-		breakpointStyle = 0;
-		continueAfterActions = 0;
-		countType = 0;
-		delayBeforeContinue = 0;
-		fileReference = 08FB7796FE84155DC02AAC07 /* test.cpp */;
-		functionName = "AuthenticateUser(CDirectoryService* dir, const char* user, const char* pswd)";
-		hitCount = 0;
-		ignoreCount = 0;
-		lineNumber = 209;
-		location = test.ob;
-		modificationTime = 243311414.909002;
-		state = 2;
-	};
 	AF02AC560CBE690500F478B8 /* CDirectoryServiceException.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1593, 987}}";
-			sepNavSelRange = "{1235, 12}";
-			sepNavVisRange = "{0, 1744}";
+			sepNavIntBoundsRect = "{{0, 0}, {1379, 840}}";
+			sepNavSelRange = "{1658, 0}";
+			sepNavVisRange = "{981, 763}";
 			sepNavWindowFrame = "{{684, 53}, {1145, 959}}";
 		};
 	};
@@ -130,6 +121,216 @@
 			sepNavWindowFrame = "{{73, 219}, {1145, 959}}";
 		};
 	};
+	AF02E9ED0EF9578E005EC935 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = AFC1CA770E809C5200FAB3DB /* base64.h */;
+		name = "base64.h: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 746;
+		vrLoc = 0;
+	};
+	AF02E9EE0EF9578E005EC935 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = AFC1CA780E809C5200FAB3DB /* base64.cpp */;
+		name = "base64.cpp: 45";
+		rLen = 0;
+		rLoc = 1633;
+		rType = 0;
+		vrLen = 2561;
+		vrLoc = 0;
+	};
+	AF02E9EF0EF9578E005EC935 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = AF155A310A501F84007E1E6E /* PythonWrapper.cpp */;
+		name = "PythonWrapper.cpp: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 1657;
+		vrLoc = 0;
+	};
+	AF02E9F00EF9578E005EC935 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = AFC9AC0A0EF8A3FC0050787E /* CDirectoryServiceAuth.h */;
+		name = "CDirectoryServiceAuth.h: 45";
+		rLen = 0;
+		rLoc = 1662;
+		rType = 0;
+		vrLen = 1665;
+		vrLoc = 0;
+	};
+	AF02E9F10EF9578E005EC935 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = AFC9AC0B0EF8A3FC0050787E /* CDirectoryServiceAuth.cpp */;
+		name = "CDirectoryServiceAuth.cpp: 146";
+		rLen = 0;
+		rLoc = 4391;
+		rType = 0;
+		vrLen = 2290;
+		vrLoc = 3525;
+	};
+	AF02E9F20EF9578E005EC935 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = AF155A300A501F84007E1E6E /* CDirectoryService.h */;
+		name = "CDirectoryService.h: 32";
+		rLen = 0;
+		rLoc = 978;
+		rType = 0;
+		vrLen = 2623;
+		vrLoc = 0;
+	};
+	AF02E9F30EF9578E005EC935 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = AF155A2F0A501F84007E1E6E /* CDirectoryService.cpp */;
+		name = "CDirectoryService.cpp: 710";
+		rLen = 0;
+		rLoc = 26937;
+		rType = 0;
+		vrLen = 2731;
+		vrLoc = 5528;
+	};
+	AF02E9F40EF9578E005EC935 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = AF41D9AB0CBDBAE200AB863D /* CDirectoryServiceManager.cpp */;
+		name = "CDirectoryServiceManager.cpp: 23";
+		rLen = 0;
+		rLoc = 821;
+		rType = 0;
+		vrLen = 1469;
+		vrLoc = 0;
+	};
+	AF02E9F50EF9578E005EC935 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = AF41D9AC0CBDBAE200AB863D /* CDirectoryServiceManager.h */;
+		name = "CDirectoryServiceManager.h: 39";
+		rLen = 12;
+		rLoc = 1107;
+		rType = 0;
+		vrLen = 1124;
+		vrLoc = 0;
+	};
+	AF02E9F60EF9578E005EC935 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = AFC1CA770E809C5200FAB3DB /* base64.h */;
+		name = "base64.h: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 746;
+		vrLoc = 0;
+	};
+	AF02E9F70EF9578E005EC935 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = AFC1CA780E809C5200FAB3DB /* base64.cpp */;
+		name = "base64.cpp: 45";
+		rLen = 0;
+		rLoc = 1633;
+		rType = 0;
+		vrLen = 2561;
+		vrLoc = 0;
+	};
+	AF02E9F80EF9578E005EC935 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = AF155A310A501F84007E1E6E /* PythonWrapper.cpp */;
+		name = "PythonWrapper.cpp: 842";
+		rLen = 0;
+		rLoc = 29065;
+		rType = 0;
+		vrLen = 3751;
+		vrLoc = 22585;
+	};
+	AF02E9F90EF9578E005EC935 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = AFC9AC0A0EF8A3FC0050787E /* CDirectoryServiceAuth.h */;
+		name = "CDirectoryServiceAuth.h: 45";
+		rLen = 0;
+		rLoc = 1662;
+		rType = 0;
+		vrLen = 1665;
+		vrLoc = 0;
+	};
+	AF02E9FA0EF9578E005EC935 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = AF155A310A501F84007E1E6E /* PythonWrapper.cpp */;
+		name = "PythonWrapper.cpp: 1";
+		rLen = 0;
+		rLoc = 0;
+		rType = 0;
+		vrLen = 1657;
+		vrLoc = 0;
+	};
+	AF02E9FB0EF9578E005EC935 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = AFC9AC0A0EF8A3FC0050787E /* CDirectoryServiceAuth.h */;
+		name = "CDirectoryServiceAuth.h: 45";
+		rLen = 0;
+		rLoc = 1662;
+		rType = 0;
+		vrLen = 1665;
+		vrLoc = 0;
+	};
+	AF02E9FC0EF9578E005EC935 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = AFC9AC0B0EF8A3FC0050787E /* CDirectoryServiceAuth.cpp */;
+		name = "CDirectoryServiceAuth.cpp: 146";
+		rLen = 0;
+		rLoc = 4391;
+		rType = 0;
+		vrLen = 2290;
+		vrLoc = 3525;
+	};
+	AF02E9FD0EF9578E005EC935 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = AF155A300A501F84007E1E6E /* CDirectoryService.h */;
+		name = "CDirectoryService.h: 32";
+		rLen = 0;
+		rLoc = 978;
+		rType = 0;
+		vrLen = 2623;
+		vrLoc = 0;
+	};
+	AF02E9FE0EF9578E005EC935 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = AF155A2F0A501F84007E1E6E /* CDirectoryService.cpp */;
+		name = "CDirectoryService.cpp: 710";
+		rLen = 0;
+		rLoc = 26937;
+		rType = 0;
+		vrLen = 2731;
+		vrLoc = 5528;
+	};
+	AF02E9FF0EF9578E005EC935 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = AF41D9AC0CBDBAE200AB863D /* CDirectoryServiceManager.h */;
+		name = "CDirectoryServiceManager.h: 39";
+		rLen = 12;
+		rLoc = 1107;
+		rType = 0;
+		vrLen = 1124;
+		vrLoc = 0;
+	};
+	AF02EA000EF9578E005EC935 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = AF41D9AB0CBDBAE200AB863D /* CDirectoryServiceManager.cpp */;
+		name = "CDirectoryServiceManager.cpp: 23";
+		rLen = 0;
+		rLoc = 821;
+		rType = 0;
+		vrLen = 1469;
+		vrLoc = 0;
+	};
+	AF02EA010EF9578E005EC935 /* PBXTextBookmark */ = {
+		isa = PBXTextBookmark;
+		fRef = AF41D9AC0CBDBAE200AB863D /* CDirectoryServiceManager.h */;
+		name = "CDirectoryServiceManager.h: 39";
+		rLen = 12;
+		rLoc = 1107;
+		rType = 0;
+		vrLen = 1124;
+		vrLoc = 0;
+	};
 	AF155A290A501F5C007E1E6E /* PyOpenDirectory */ = {
 		isa = PBXExecutable;
 		activeArgIndices = (
@@ -141,6 +342,9 @@
 		configStateDict = {
 		};
 		customDataFormattersEnabled = 1;
+		dataTipCustomDataFormattersEnabled = 1;
+		dataTipShowTypeColumn = 1;
+		dataTipSortType = 0;
 		debuggerPlugin = GDBDebugging;
 		disassemblyDisplayState = 0;
 		dylibVariantSuffix = "";
@@ -153,6 +357,7 @@
 		name = PyOpenDirectory;
 		savedGlobals = {
 		};
+		showTypeColumn = 0;
 		sourceDirectories = (
 		);
 		variableFormatDictionary = {
@@ -177,7 +382,11 @@
 		isa = PBXSourceControlManager;
 		fallbackIsa = XCSourceControlManager;
 		isSCMEnabled = 0;
+		repositoryNamesForRoots = {
+		};
 		scmConfiguration = {
+			repositoryNamesForRoots = {
+			};
 		};
 		scmType = "";
 	};
@@ -187,27 +396,27 @@
 	};
 	AF155A2F0A501F84007E1E6E /* CDirectoryService.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1593, 16282}}";
-			sepNavSelRange = "{967, 11}";
-			sepNavVisRange = "{0, 1702}";
+			sepNavIntBoundsRect = "{{0, 0}, {1593, 12992}}";
+			sepNavSelRange = "{26937, 0}";
+			sepNavVisRange = "{5528, 2731}";
 			sepNavVisRect = "{{0, 0}, {1309, 1017}}";
 			sepNavWindowFrame = "{{85, 4}, {1280, 874}}";
 		};
 	};
 	AF155A300A501F84007E1E6E /* CDirectoryService.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1593, 1316}}";
-			sepNavSelRange = "{2531, 0}";
-			sepNavVisRange = "{824, 2709}";
+			sepNavIntBoundsRect = "{{0, 0}, {1593, 1232}}";
+			sepNavSelRange = "{978, 0}";
+			sepNavVisRange = "{0, 2623}";
 			sepNavVisRect = "{{0, 123}, {752, 676}}";
 			sepNavWindowFrame = "{{50, 9}, {1390, 869}}";
 		};
 	};
 	AF155A310A501F84007E1E6E /* PythonWrapper.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1593, 13342}}";
-			sepNavSelRange = "{20077, 60}";
-			sepNavVisRange = "{0, 1590}";
+			sepNavIntBoundsRect = "{{0, 0}, {1593, 12096}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRange = "{0, 1657}";
 			sepNavVisRect = "{{0, 0}, {1521, 647}}";
 			sepNavWindowFrame = "{{89, 4}, {1043, 828}}";
 		};
@@ -232,143 +441,47 @@
 	};
 	AF41D9AB0CBDBAE200AB863D /* CDirectoryServiceManager.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1593, 987}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRange = "{0, 1164}";
+			sepNavIntBoundsRect = "{{0, 0}, {1593, 1041}}";
+			sepNavSelRange = "{1031, 0}";
+			sepNavVisRange = "{0, 1469}";
 			sepNavWindowFrame = "{{558, 246}, {1280, 828}}";
 		};
 	};
 	AF41D9AC0CBDBAE200AB863D /* CDirectoryServiceManager.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1113, 687}}";
-			sepNavSelRange = "{775, 0}";
-			sepNavVisRange = "{0, 1060}";
+			sepNavIntBoundsRect = "{{0, 0}, {1593, 1041}}";
+			sepNavSelRange = "{1107, 12}";
+			sepNavVisRange = "{0, 1124}";
 			sepNavWindowFrame = "{{677, 13}, {1280, 828}}";
 		};
 	};
 	AFC1CA770E809C5200FAB3DB /* base64.h */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1113, 687}}";
-			sepNavSelRange = "{674, 13}";
-			sepNavVisRange = "{0, 787}";
+			sepNavIntBoundsRect = "{{0, 0}, {1593, 1041}}";
+			sepNavSelRange = "{0, 0}";
+			sepNavVisRange = "{0, 746}";
 			sepNavWindowFrame = "{{15, -1}, {1067, 874}}";
 		};
 	};
 	AFC1CA780E809C5200FAB3DB /* base64.cpp */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1379, 1596}}";
+			sepNavIntBoundsRect = "{{0, 0}, {1593, 1610}}";
 			sepNavSelRange = "{1633, 0}";
-			sepNavVisRange = "{1217, 820}";
+			sepNavVisRange = "{0, 2561}";
 		};
 	};
-	AFDF2BF10ECC846100B8B73B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = AF155A2F0A501F84007E1E6E /* CDirectoryService.cpp */;
-		name = "CDirectoryService.cpp: 35";
-		rLen = 11;
-		rLoc = 967;
-		rType = 0;
-		vrLen = 1702;
-		vrLoc = 0;
+	AFC9AC0A0EF8A3FC0050787E /* CDirectoryServiceAuth.h */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {1593, 1041}}";
+			sepNavSelRange = "{1662, 0}";
+			sepNavVisRange = "{0, 1665}";
+		};
 	};
-	AFDF2BF20ECC846100B8B73B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = AF41D9AB0CBDBAE200AB863D /* CDirectoryServiceManager.cpp */;
-		name = "CDirectoryServiceManager.cpp: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 1164;
-		vrLoc = 0;
+	AFC9AC0B0EF8A3FC0050787E /* CDirectoryServiceAuth.cpp */ = {
+		uiCtxt = {
+			sepNavIntBoundsRect = "{{0, 0}, {1593, 4158}}";
+			sepNavSelRange = "{4391, 0}";
+			sepNavVisRange = "{3525, 2290}";
+		};
 	};
-	AFDF2BF30ECC846100B8B73B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = AF02AC560CBE690500F478B8 /* CDirectoryServiceException.cpp */;
-		name = "CDirectoryServiceException.cpp: 40";
-		rLen = 12;
-		rLoc = 1235;
-		rType = 0;
-		vrLen = 1744;
-		vrLoc = 0;
-	};
-	AFDF2BF40ECC846100B8B73B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = AF155A310A501F84007E1E6E /* PythonWrapper.cpp */;
-		name = "PythonWrapper.cpp: 386";
-		rLen = 72;
-		rLoc = 10790;
-		rType = 0;
-		vrLen = 2458;
-		vrLoc = 11118;
-	};
-	AFDF2BF50ECC846100B8B73B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = AF155A2F0A501F84007E1E6E /* CDirectoryService.cpp */;
-		name = "CDirectoryService.cpp: 582";
-		rLen = 32;
-		rLoc = 21372;
-		rType = 0;
-		vrLen = 3503;
-		vrLoc = 20090;
-	};
-	AFDF2BF60ECC846100B8B73B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = AF155A2F0A501F84007E1E6E /* CDirectoryService.cpp */;
-		name = "CDirectoryService.cpp: 656";
-		rLen = 0;
-		rLoc = 25530;
-		rType = 0;
-		vrLen = 3488;
-		vrLoc = 23025;
-	};
-	AFDF2BF70ECC846100B8B73B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = AF155A310A501F84007E1E6E /* PythonWrapper.cpp */;
-		name = "PythonWrapper.cpp: 386";
-		rLen = 72;
-		rLoc = 10790;
-		rType = 0;
-		vrLen = 2458;
-		vrLoc = 11118;
-	};
-	AFDF2BF80ECC846100B8B73B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = AF155A2F0A501F84007E1E6E /* CDirectoryService.cpp */;
-		name = "CDirectoryService.cpp: 35";
-		rLen = 11;
-		rLoc = 967;
-		rType = 0;
-		vrLen = 1702;
-		vrLoc = 0;
-	};
-	AFDF2BF90ECC846100B8B73B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = AF41D9AB0CBDBAE200AB863D /* CDirectoryServiceManager.cpp */;
-		name = "CDirectoryServiceManager.cpp: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 1164;
-		vrLoc = 0;
-	};
-	AFDF2BFA0ECC846100B8B73B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = AF02AC560CBE690500F478B8 /* CDirectoryServiceException.cpp */;
-		name = "CDirectoryServiceException.cpp: 40";
-		rLen = 12;
-		rLoc = 1235;
-		rType = 0;
-		vrLen = 1744;
-		vrLoc = 0;
-	};
-	AFDF2BFB0ECC846100B8B73B /* PBXTextBookmark */ = {
-		isa = PBXTextBookmark;
-		fRef = AF155A310A501F84007E1E6E /* PythonWrapper.cpp */;
-		name = "PythonWrapper.cpp: 648";
-		rLen = 60;
-		rLoc = 20077;
-		rType = 0;
-		vrLen = 1590;
-		vrLoc = 0;
-	};
 }

Modified: PyOpenDirectory/trunk/support/PyOpenDirectory.xcodeproj/project.pbxproj
===================================================================
--- PyOpenDirectory/trunk/support/PyOpenDirectory.xcodeproj/project.pbxproj	2008-12-17 18:14:59 UTC (rev 3539)
+++ PyOpenDirectory/trunk/support/PyOpenDirectory.xcodeproj/project.pbxproj	2008-12-17 18:15:16 UTC (rev 3540)
@@ -19,6 +19,7 @@
 		AF155AFE0A502C09007E1E6E /* CFStringUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AF155AFC0A502C09007E1E6E /* CFStringUtil.cpp */; };
 		AF41D9AD0CBDBAE200AB863D /* CDirectoryServiceManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AF41D9AB0CBDBAE200AB863D /* CDirectoryServiceManager.cpp */; };
 		AFC1CA790E809C5200FAB3DB /* base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AFC1CA780E809C5200FAB3DB /* base64.cpp */; };
+		AFC9AC0C0EF8A3FC0050787E /* CDirectoryServiceAuth.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AFC9AC0B0EF8A3FC0050787E /* CDirectoryServiceAuth.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -52,6 +53,8 @@
 		AF41D9AC0CBDBAE200AB863D /* CDirectoryServiceManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDirectoryServiceManager.h; path = ../src/CDirectoryServiceManager.h; sourceTree = SOURCE_ROOT; };
 		AFC1CA770E809C5200FAB3DB /* base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = base64.h; path = ../src/base64.h; sourceTree = SOURCE_ROOT; };
 		AFC1CA780E809C5200FAB3DB /* base64.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 4; name = base64.cpp; path = ../src/base64.cpp; sourceTree = SOURCE_ROOT; };
+		AFC9AC0A0EF8A3FC0050787E /* CDirectoryServiceAuth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDirectoryServiceAuth.h; path = ../src/CDirectoryServiceAuth.h; sourceTree = SOURCE_ROOT; };
+		AFC9AC0B0EF8A3FC0050787E /* CDirectoryServiceAuth.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CDirectoryServiceAuth.cpp; path = ../src/CDirectoryServiceAuth.cpp; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -87,6 +90,8 @@
 				AF41D9AC0CBDBAE200AB863D /* CDirectoryServiceManager.h */,
 				AF155A2F0A501F84007E1E6E /* CDirectoryService.cpp */,
 				AF155A300A501F84007E1E6E /* CDirectoryService.h */,
+				AFC9AC0B0EF8A3FC0050787E /* CDirectoryServiceAuth.cpp */,
+				AFC9AC0A0EF8A3FC0050787E /* CDirectoryServiceAuth.h */,
 				AF155A310A501F84007E1E6E /* PythonWrapper.cpp */,
 				08FB7796FE84155DC02AAC07 /* test.cpp */,
 				AF155AFC0A502C09007E1E6E /* CFStringUtil.cpp */,
@@ -165,6 +170,7 @@
 				AF41D9AD0CBDBAE200AB863D /* CDirectoryServiceManager.cpp in Sources */,
 				AF02AC580CBE690500F478B8 /* CDirectoryServiceException.cpp in Sources */,
 				AFC1CA790E809C5200FAB3DB /* base64.cpp in Sources */,
+				AFC9AC0C0EF8A3FC0050787E /* CDirectoryServiceAuth.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Modified: PyOpenDirectory/trunk/support/test.cpp
===================================================================
--- PyOpenDirectory/trunk/support/test.cpp	2008-12-17 18:14:59 UTC (rev 3539)
+++ PyOpenDirectory/trunk/support/test.cpp	2008-12-17 18:15:16 UTC (rev 3540)
@@ -22,6 +22,7 @@
 #include <DirectoryService/DirectoryService.h>
 
 #include "CDirectoryService.h"
+#include "CDirectoryServiceAuth.h"
 #include "CFStringUtil.h"
 
 tDirReference gDirRef = NULL;
@@ -31,8 +32,8 @@
 void PrintDictionary(const void* key, const void* value, void* ref);
 void PrintArrayArray(CFMutableArrayRef list);
 void PrintArray(CFArrayRef list);
-void AuthenticateUser(CDirectoryService* dir, const char* guid, const char* user, const char* pswd);
-void AuthenticateUserDigest(CDirectoryService* dir, const char* guid, const char* user, const char* challenge, const char* response, const char* method);
+void AuthenticateUser(CDirectoryServiceAuth* dir, const char* guid, const char* user, const char* pswd);
+void AuthenticateUserDigest(CDirectoryServiceAuth* dir, const char* guid, const char* user, const char* challenge, const char* response, const char* method);
 
 #define		kDSStdRecordTypeResources					"dsRecTypeStandard:Resources"
 #define		kDSNAttrServicesLocator						"dsAttrTypeStandard:ServicesLocator"
@@ -41,9 +42,10 @@
 int main (int argc, const char * argv[]) {
 
 	CDirectoryService* dir = new CDirectoryService("/Search");
+	CDirectoryServiceAuth* authdir = new CDirectoryServiceAuth();
 
 #if 1
-#if 1
+#if 0
 	CFStringRef attrs[3];
 	attrs[0] = CFSTR(kDS1AttrDistinguishedName);
 	attrs[1] = CFSTR(kDS1AttrGeneratedUID);
@@ -55,7 +57,11 @@
 	types[2] = CFSTR("base64");
 	CFDictionaryRef attrsdict = CFDictionaryCreate(kCFAllocatorDefault, (const void **)attrs, (const void **)types, 3, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
 
-	CFMutableArrayRef data = dir->ListAllRecordsWithAttributes(kDSStdRecordTypeUsers, attrsdict, false);
+	CFStringRef rtypes[1];
+	rtypes[0] = CFSTR(kDSStdRecordTypeUsers);
+	CFArrayRef recordTypes = CFArrayCreate(kCFAllocatorDefault, (const void**)rtypes, 1, &kCFTypeArrayCallBacks);
+
+	CFMutableArrayRef data = dir->ListAllRecordsWithAttributes(recordTypes, attrsdict, 0, false);
 	if (data != NULL)
 	{
 		printf("\n*** Users: %d ***\n", CFArrayGetCount(data));
@@ -121,8 +127,8 @@
 #endif
 #endif
 
-	//AuthenticateUser(dir, "gooeyed", "test", "test-no");
-	//AuthenticateUser(dir, "gooeyed", "test", "test-yes");
+	AuthenticateUser(authdir, "/LDAPv3/127.0.0.1", "oliverdaboo", "oliver");
+	AuthenticateUser(authdir, "/LDAPv3/127.0.0.1", "eleanordaboo", "eleanor");
 #elif 0
 	CFStringRef keys[2];
 	keys[0] = CFSTR(kDS1AttrFirstName);
@@ -196,15 +202,15 @@
 	//const char* r = "username=\"test\", nonce=\"1\", cnonce=\"1\", nc=\"1\", realm=\"Test\", algorithm=\"md5\", opaque=\"1\", qop=\"auth\", uri=\"/\", response=\"4241f31ffe6f9c99b891f88e9c41caa9\"";
 	const char* c = "WWW-Authenticate: digest nonce=\"1621696297327727918745238639\", opaque=\"121994e78694cbdff74f12cb32ee6f00-MTYyMTY5NjI5NzMyNzcyNzkxODc0NTIzODYzOSwxMjcuMC4wLjEsMTE2ODU2ODg5NQ==\", realm=\"Test Realm\", algorithm=\"md5\", qop=\"auth\"";
 	const char* r = "Authorization: Digest username=\"test\", realm=\"Test Realm\", nonce=\"1621696297327727918745238639\", uri=\"/principals/users/test/\", response=\"e260f13cffcc15572ddeec9c31de437b\", opaque=\"121994e78694cbdff74f12cb32ee6f00-MTYyMTY5NjI5NzMyNzcyNzkxODc0NTIzODYzOSwxMjcuMC4wLjEsMTE2ODU2ODg5NQ==\", algorithm=\"md5\", cnonce=\"70cbd8f04227d8d46c0193b290beaf0d\", nc=00000001, qop=\"auth\"";
-	AuthenticateUserDigest(dir, u, c, r, "GET");
+	AuthenticateUserDigest(authdir, u, c, r, "GET");
 #endif
 	return 0;
 }
 
-void AuthenticateUser(CDirectoryService* dir, const char* guid, const char* user, const char* pswd)
+void AuthenticateUser(CDirectoryServiceAuth* dir, const char* nodename, const char* user, const char* pswd)
 {
 	bool result = false;
-	if (dir->AuthenticateUserBasic(guid, user, pswd, result))
+	if (dir->AuthenticateUserBasic(nodename, user, pswd, result, false))
 	{
 		if (result)
 			printf("Authenticated user: %s\n", user);
@@ -215,10 +221,10 @@
 		printf("Failed authentication user: %s\n", user);
 }
 
-void AuthenticateUserDigest(CDirectoryService* dir, const char* guid, const char* user, const char* challenge, const char* response, const char* method)
+void AuthenticateUserDigest(CDirectoryServiceAuth* dir, const char* nodename, const char* user, const char* challenge, const char* response, const char* method)
 {
 	bool result = false;
-	if (dir->AuthenticateUserDigest(guid, user, challenge, response, method, result))
+	if (dir->AuthenticateUserDigest(nodename, user, challenge, response, method, result, false))
 	{
 		if (result)
 			printf("Authenticated user: %s\n", user);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20081217/261f6d85/attachment-0001.html>


More information about the calendarserver-changes mailing list