Update to allow change password from select and enter identity dialogs

ticket: 6055

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20813 dc483132-0cff-0310-8789-dd5450dbe970

5 files changed, 167 insertions, 118 deletions

diff --git a/src/kim/agent/mac/AuthenticationController.m b/src/kim/agent/mac/AuthenticationController.m
index 8880cb809..742c622fe 100644
--- a/src/kim/agent/mac/AuthenticationController.m
+++ b/src/kim/agent/mac/AuthenticationController.m
@@ -75,7 +75,7 @@
 {
     [[self window] center];
     // We need to float over the loginwindow and SecurityAgent so use its hardcoded level.
-    [[self window] setLevel:2003];
+    [[self window] setLevel:NSScreenSaverWindowLevel];
     
     lifetimeFormatter.displaySeconds = NO;
     lifetimeFormatter.displayShortFormat = NO;
diff --git a/src/kim/agent/mac/KerberosAgentListener.m b/src/kim/agent/mac/KerberosAgentListener.m
index 019fbb4ff..e192e1991 100644
--- a/src/kim/agent/mac/KerberosAgentListener.m
+++ b/src/kim/agent/mac/KerberosAgentListener.m
@@ -166,9 +166,10 @@ static KerberosAgentListener *sharedListener = nil;
 {
     kim_error err = KIM_NO_ERROR;
     mach_port_t reply_port = [[info objectForKey:@"reply_port"] integerValue];
+    NSString *identityString = [info objectForKey:@"identity_string"];
     kim_identity identity = NULL;
     kim_options options = NULL;
-    NSString *identityString = [info objectForKey:@"identity_string"];
+    BOOL wants_change_password = [[info objectForKey:@"wants_change_password"] boolValue];
     
     if (identityString) {
         err = kim_identity_create_from_string (&identity, [identityString UTF8String]);
@@ -176,9 +177,10 @@ static KerberosAgentListener *sharedListener = nil;
     
     if (!err) {
         options = [KIMUtilities kimOptionsForDictionary:[info objectForKey:@"options"]];
-    }    
+        
+    }
     if (!err) {
-        err = kim_handle_reply_enter_identity(reply_port, identity, options, error);
+        err = kim_handle_reply_enter_identity(reply_port, identity, options, wants_change_password, error);
     }
     
     kim_options_free (&options);
@@ -211,6 +213,7 @@ static KerberosAgentListener *sharedListener = nil;
     mach_port_t reply_port = [portNumber integerValue];
     kim_identity identity = NULL;
     kim_options options = NULL;
+    BOOL wants_change_password = [[info objectForKey:@"wants_change_password"] boolValue];
     NSLog(@"%s", __FUNCTION__);
 
     if (identityString) {
@@ -222,7 +225,7 @@ static KerberosAgentListener *sharedListener = nil;
     }
 
     if (!err) {
-        err = kim_handle_reply_select_identity(reply_port, identity, options, error);
+        err = kim_handle_reply_select_identity(reply_port, identity, options, wants_change_password, error);
     }
     
     kim_options_free (&options);
diff --git a/src/kim/agent/mac/SelectIdentityController.m b/src/kim/agent/mac/SelectIdentityController.m
index f6f891ab3..243670e77 100644
--- a/src/kim/agent/mac/SelectIdentityController.m
+++ b/src/kim/agent/mac/SelectIdentityController.m
@@ -56,7 +56,7 @@
 
     // We need to float over the loginwindow and SecurityAgent so use its hardcoded level.
     [[self window] center];
-    [[self window] setLevel:2003];
+    [[self window] setLevel:NSScreenSaverWindowLevel];
 
     [identityTableView setDoubleAction:@selector(select:)];
     identities = [[Identities alloc] init];
diff --git a/src/kim/agent/mac/resources/English.lproj/Authentication.xib b/src/kim/agent/mac/resources/English.lproj/Authentication.xib
index e9745bd2a..dbd68481c 100644
--- a/src/kim/agent/mac/resources/English.lproj/Authentication.xib
+++ b/src/kim/agent/mac/resources/English.lproj/Authentication.xib
@@ -8,12 +8,9 @@
 		<string key="IBDocument.HIToolboxVersion">352.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="300175"/>
-			<integer value="300314"/>
-			<integer value="19"/>
 			<integer value="300274"/>
+			<integer value="19"/>
 			<integer value="300420"/>
-			<integer value="300193"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -91,6 +88,7 @@
 						<int key="NSvFlags">266</int>
 						<string key="NSFrame">{{101, 103}, {382, 54}}</string>
 						<reference key="NSSuperview" ref="92892041"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="645367368">
 							<int key="NSCellFlags">67239424</int>
@@ -127,6 +125,7 @@
 						<int key="NSvFlags">290</int>
 						<string key="NSFrame">{{104, 59}, {379, 26}}</string>
 						<reference key="NSSuperview" ref="92892041"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSComboBoxCell" key="NSCell" id="100557652">
 							<int key="NSCellFlags">343014976</int>
@@ -229,6 +228,7 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{17, 64}, {82, 17}}</string>
 						<reference key="NSSuperview" ref="92892041"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="1073582594">
 							<int key="NSCellFlags">67239424</int>
@@ -245,6 +245,7 @@
 						<int key="NSvFlags">289</int>
 						<string key="NSFrame">{{388, 15}, {98, 32}}</string>
 						<reference key="NSSuperview" ref="92892041"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="563505192">
 							<int key="NSCellFlags">67239424</int>
@@ -266,6 +267,7 @@
 						<int key="NSvFlags">289</int>
 						<string key="NSFrame">{{295, 15}, {93, 32}}</string>
 						<reference key="NSSuperview" ref="92892041"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="927675304">
 							<int key="NSCellFlags">67239424</int>
@@ -287,6 +289,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{20, 103}, {64, 64}}</string>
 						<reference key="NSSuperview" ref="92892041"/>
+						<reference key="NSWindow"/>
 						<string key="NSClassName">BadgedImageView</string>
 					</object>
 					<object class="NSPopUpButton" id="1016187493">
@@ -294,6 +297,7 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{20, 20}, {38, 26}}</string>
 						<reference key="NSSuperview" ref="92892041"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSPopUpButtonCell" key="NSCell" id="690863814">
 							<int key="NSCellFlags">-2076049856</int>
@@ -356,7 +360,6 @@
 									</object>
 								</object>
 							</object>
-							<int key="NSSelectedIndex">2</int>
 							<bool key="NSPullDown">YES</bool>
 							<int key="NSPreferredEdge">1</int>
 							<bool key="NSUsesItemFromMenu">YES</bool>
@@ -370,6 +373,7 @@
 						<object class="NSPSMatrix" key="NSDrawMatrix"/>
 						<string key="NSFrame">{{66, 25}, {16, 16}}</string>
 						<reference key="NSSuperview" ref="92892041"/>
+						<reference key="NSWindow"/>
 						<int key="NSpiFlags">28938</int>
 						<double key="NSMinValue">1.600000e+01</double>
 						<double key="NSMaxValue">1.000000e+02</double>
@@ -377,6 +381,7 @@
 				</object>
 				<string key="NSFrameSize">{500, 187}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSCustomView" id="866582848">
@@ -389,6 +394,7 @@
 						<int key="NSvFlags">266</int>
 						<string key="NSFrame">{{104, 82}, {376, 22}}</string>
 						<reference key="NSSuperview" ref="866582848"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="508869457">
 							<int key="NSCellFlags">-1804468671</int>
@@ -411,6 +417,7 @@
 						<int key="NSvFlags">289</int>
 						<string key="NSFrame">{{388, 12}, {98, 32}}</string>
 						<reference key="NSSuperview" ref="866582848"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="200893597">
 							<int key="NSCellFlags">67239424</int>
@@ -432,6 +439,7 @@
 						<int key="NSvFlags">289</int>
 						<string key="NSFrame">{{295, 12}, {93, 32}}</string>
 						<reference key="NSSuperview" ref="866582848"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="935364959">
 							<int key="NSCellFlags">67239424</int>
@@ -451,8 +459,9 @@
 					<object class="NSTextField" id="464070473">
 						<reference key="NSNextResponder" ref="866582848"/>
 						<int key="NSvFlags">266</int>
-						<string key="NSFrame">{{101, 126}, {382, 41}}</string>
+						<string key="NSFrame">{{101, 124}, {382, 54}}</string>
 						<reference key="NSSuperview" ref="866582848"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="999660494">
 							<int key="NSCellFlags">67239424</int>
@@ -469,6 +478,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{17, 84}, {80, 17}}</string>
 						<reference key="NSSuperview" ref="866582848"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="916263740">
 							<int key="NSCellFlags">68288064</int>
@@ -485,6 +495,7 @@
 						<int key="NSvFlags">290</int>
 						<string key="NSFrame">{{102, 58}, {380, 18}}</string>
 						<reference key="NSSuperview" ref="866582848"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="883697888">
 							<int key="NSCellFlags">-2080244224</int>
@@ -510,8 +521,9 @@
 					<object class="NSCustomView" id="775546934">
 						<reference key="NSNextResponder" ref="866582848"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{20, 126}, {64, 64}}</string>
+						<string key="NSFrame">{{20, 124}, {64, 64}}</string>
 						<reference key="NSSuperview" ref="866582848"/>
+						<reference key="NSWindow"/>
 						<string key="NSClassName">BadgedImageView</string>
 					</object>
 					<object class="NSProgressIndicator" id="524728083">
@@ -520,13 +532,15 @@
 						<object class="NSPSMatrix" key="NSDrawMatrix"/>
 						<string key="NSFrame">{{19, 22}, {16, 16}}</string>
 						<reference key="NSSuperview" ref="866582848"/>
+						<reference key="NSWindow"/>
 						<int key="NSpiFlags">28938</int>
 						<double key="NSMinValue">1.600000e+01</double>
 						<double key="NSMaxValue">1.000000e+02</double>
 					</object>
 				</object>
-				<string key="NSFrameSize">{500, 210}</string>
+				<string key="NSFrameSize">{500, 208}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSCustomView" id="898191415">
@@ -539,6 +553,7 @@
 						<int key="NSvFlags">266</int>
 						<string key="NSFrame">{{101, 140}, {382, 17}}</string>
 						<reference key="NSSuperview" ref="898191415"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="169380754">
 							<int key="NSCellFlags">67239424</int>
@@ -555,6 +570,7 @@
 						<int key="NSvFlags">290</int>
 						<string key="NSFrame">{{202, 62}, {278, 22}}</string>
 						<reference key="NSSuperview" ref="898191415"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="572127639">
 							<int key="NSCellFlags">-1804468671</int>
@@ -572,6 +588,7 @@
 						<int key="NSvFlags">289</int>
 						<string key="NSFrame">{{388, 12}, {98, 32}}</string>
 						<reference key="NSSuperview" ref="898191415"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="359264782">
 							<int key="NSCellFlags">67239424</int>
@@ -593,6 +610,7 @@
 						<int key="NSvFlags">274</int>
 						<string key="NSFrame">{{101, 104}, {382, 28}}</string>
 						<reference key="NSSuperview" ref="898191415"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="840858923">
 							<int key="NSCellFlags">67239424</int>
@@ -613,6 +631,7 @@
 						<int key="NSvFlags">268</int>
 						<string key="NSFrame">{{20, 103}, {64, 64}}</string>
 						<reference key="NSSuperview" ref="898191415"/>
+						<reference key="NSWindow"/>
 						<string key="NSClassName">BadgedImageView</string>
 					</object>
 					<object class="NSButton" id="907069022">
@@ -620,6 +639,7 @@
 						<int key="NSvFlags">289</int>
 						<string key="NSFrame">{{295, 12}, {93, 32}}</string>
 						<reference key="NSSuperview" ref="898191415"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="119720976">
 							<int key="NSCellFlags">67239424</int>
@@ -641,6 +661,7 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{17, 20}, {180, 61}}</string>
 						<reference key="NSSuperview" ref="898191415"/>
+						<reference key="NSWindow"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="370337827">
 							<int key="NSCellFlags">67239424</int>
@@ -662,6 +683,7 @@
 						<object class="NSPSMatrix" key="NSDrawMatrix"/>
 						<string key="NSFrame">{{20, 22}, {16, 16}}</string>
 						<reference key="NSSuperview" ref="898191415"/>
+						<reference key="NSWindow"/>
 						<int key="NSpiFlags">28938</int>
 						<double key="NSMinValue">1.600000e+01</double>
 						<double key="NSMaxValue">1.000000e+02</double>
@@ -669,6 +691,7 @@
 				</object>
 				<string key="NSFrameSize">{500, 187}</string>
 				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<string key="NSClassName">NSView</string>
 			</object>
 			<object class="NSCustomView" id="60326189">
@@ -686,7 +709,7 @@
 					<object class="NSTextField" id="299103498">
 						<reference key="NSNextResponder" ref="60326189"/>
 						<int key="NSvFlags">274</int>
-						<string key="NSFrame">{{101, 146}, {382, 19}}</string>
+						<string key="NSFrame">{{101, 146}, {382, 29}}</string>
 						<reference key="NSSuperview" ref="60326189"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="627916817">
@@ -705,7 +728,7 @@
 					<object class="NSTextField" id="1064523274">
 						<reference key="NSNextResponder" ref="60326189"/>
 						<int key="NSvFlags">266</int>
-						<string key="NSFrame">{{101, 173}, {382, 17}}</string>
+						<string key="NSFrame">{{101, 183}, {382, 17}}</string>
 						<reference key="NSSuperview" ref="60326189"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="246958577">
@@ -3165,7 +3188,7 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{790, 237}, {500, 210}}</string>
+					<string>{{628, 239}, {500, 208}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>NSSecureTextField</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
diff --git a/src/kim/agent/mac/resources/English.lproj/SelectIdentity.xib b/src/kim/agent/mac/resources/English.lproj/SelectIdentity.xib
index 8953d97db..38b494bd5 100644
--- a/src/kim/agent/mac/resources/English.lproj/SelectIdentity.xib
+++ b/src/kim/agent/mac/resources/English.lproj/SelectIdentity.xib
@@ -9,6 +9,7 @@
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<integer value="6"/>
+			<integer value="300295"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -472,7 +473,6 @@
 										</object>
 									</object>
 								</object>
-								<int key="NSSelectedIndex">4</int>
 								<bool key="NSPullDown">YES</bool>
 								<int key="NSPreferredEdge">2</int>
 								<bool key="NSUsesItemFromMenu">YES</bool>
@@ -520,7 +520,7 @@
 				<nil key="NSViewClass"/>
 				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
 				<object class="NSView" key="NSWindowView" id="1019868804">
-					<nil key="NSNextResponder"/>
+					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">258</int>
 					<object class="NSMutableArray" key="NSSubviews">
 						<bool key="EncodedWithXMLCoder">YES</bool>
@@ -862,6 +862,7 @@
 						</object>
 					</object>
 					<string key="NSFrameSize">{427, 348}</string>
+					<reference key="NSSuperview"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
 				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
@@ -882,8 +883,10 @@
 					<string>minValidLifetime</string>
 					<string>maxValidLifetime</string>
 					<string>maxRenewableLifetime</string>
+					<string>identity</string>
+					<string>renewable_lifetime</string>
+					<string>valid_lifetime</string>
 				</object>
-				<string key="NSObjectClassName">Identity</string>
 				<bool key="NSEditable">YES</bool>
 				<object class="_NSManagedProxy" key="_NSManagedProxy"/>
 			</object>
@@ -1177,22 +1180,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: selection.isRenewable</string>
-						<reference key="source" ref="606962746"/>
-						<reference key="destination" ref="196152721"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="606962746"/>
-							<reference key="NSDestination" ref="196152721"/>
-							<string key="NSLabel">value: selection.isRenewable</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">selection.isRenewable</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">300366</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
 						<string key="label">value: arrangedObjects.favorite</string>
 						<reference key="source" ref="850969979"/>
 						<reference key="destination" ref="333357907"/>
@@ -1208,38 +1195,6 @@
 					<int key="connectionID">300367</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: selection.isForwardable</string>
-						<reference key="source" ref="415869872"/>
-						<reference key="destination" ref="196152721"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="415869872"/>
-							<reference key="NSDestination" ref="196152721"/>
-							<string key="NSLabel">value: selection.isForwardable</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">selection.isForwardable</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">300368</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: selection.isAddressless</string>
-						<reference key="source" ref="910622795"/>
-						<reference key="destination" ref="196152721"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="910622795"/>
-							<reference key="NSDestination" ref="196152721"/>
-							<string key="NSLabel">value: selection.isAddressless</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">selection.isAddressless</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">300369</int>
-				</object>
-				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">identitiesController</string>
 						<reference key="source" ref="262677138"/>
@@ -1249,54 +1204,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: selection.renewableLifetimeString</string>
-						<reference key="source" ref="956800130"/>
-						<reference key="destination" ref="196152721"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="956800130"/>
-							<reference key="NSDestination" ref="196152721"/>
-							<string key="NSLabel">value: selection.renewableLifetimeString</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">selection.renewableLifetimeString</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">300386</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: selection.validLifetimeString</string>
-						<reference key="source" ref="54325332"/>
-						<reference key="destination" ref="196152721"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="54325332"/>
-							<reference key="NSDestination" ref="196152721"/>
-							<string key="NSLabel">value: selection.validLifetimeString</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">selection.validLifetimeString</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">300388</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: selection.componentsString</string>
-						<reference key="source" ref="958176038"/>
-						<reference key="destination" ref="196152721"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="958176038"/>
-							<reference key="NSDestination" ref="196152721"/>
-							<string key="NSLabel">value: selection.componentsString</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">selection.componentsString</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">300404</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
 						<string key="label">hidden: selection.hasCCache</string>
 						<reference key="source" ref="958176038"/>
 						<reference key="destination" ref="196152721"/>
@@ -1585,6 +1492,122 @@
 					</object>
 					<int key="connectionID">300486</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: selection.identity</string>
+						<reference key="source" ref="958176038"/>
+						<reference key="destination" ref="196152721"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="958176038"/>
+							<reference key="NSDestination" ref="196152721"/>
+							<string key="NSLabel">value: selection.identity</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">selection.identity</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">300487</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: selection.identity</string>
+						<reference key="source" ref="1047482753"/>
+						<reference key="destination" ref="196152721"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="1047482753"/>
+							<reference key="NSDestination" ref="196152721"/>
+							<string key="NSLabel">value: selection.identity</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">selection.identity</string>
+							<object class="NSDictionary" key="NSOptions">
+								<string key="NS.key.0">NSContinuouslyUpdatesValue</string>
+								<integer value="1" key="NS.object.0"/>
+							</object>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">300489</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: selection.forwardable</string>
+						<reference key="source" ref="415869872"/>
+						<reference key="destination" ref="196152721"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="415869872"/>
+							<reference key="NSDestination" ref="196152721"/>
+							<string key="NSLabel">value: selection.forwardable</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">selection.forwardable</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">300490</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: selection.addressless</string>
+						<reference key="source" ref="910622795"/>
+						<reference key="destination" ref="196152721"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="910622795"/>
+							<reference key="NSDestination" ref="196152721"/>
+							<string key="NSLabel">value: selection.addressless</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">selection.addressless</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">300491</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: selection.renewable</string>
+						<reference key="source" ref="606962746"/>
+						<reference key="destination" ref="196152721"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="606962746"/>
+							<reference key="NSDestination" ref="196152721"/>
+							<string key="NSLabel">value: selection.renewable</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">selection.renewable</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">300492</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: selection.renewable_lifetime</string>
+						<reference key="source" ref="956800130"/>
+						<reference key="destination" ref="196152721"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="956800130"/>
+							<reference key="NSDestination" ref="196152721"/>
+							<string key="NSLabel">value: selection.renewable_lifetime</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">selection.renewable_lifetime</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">300493</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: selection.valid_lifetime</string>
+						<reference key="source" ref="54325332"/>
+						<reference key="destination" ref="196152721"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="54325332"/>
+							<reference key="NSDestination" ref="196152721"/>
+							<string key="NSLabel">value: selection.valid_lifetime</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">selection.valid_lifetime</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">300494</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -2326,7 +2349,7 @@
 					<reference ref="9"/>
 					<string>{{503, 256}, {419, 465}}</string>
 					<reference ref="9"/>
-					<integer value="0"/>
+					<reference ref="75542549"/>
 					<string>{600, 600}</string>
 					<string>{419, 298}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2355,7 +2378,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">300486</int>
+			<int key="maxID">300494</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">