@@ -119,7 +119,6 @@ - (void)_loadTableTask;
119
119
120
120
- (void) closeAndDisconnect;
121
121
122
- - (NSString *)keychainPassword;
123
122
- (NSString *)keychainPasswordForSSHConnection:(SPMySQLConnection *)connection;
124
123
125
124
@end
@@ -4672,7 +4671,7 @@ - (NSDictionary *) stateIncludingDetails:(NSDictionary *)detailsToReturn
4672
4671
[connection setObject:[self database] forKey:@"database"];
4673
4672
4674
4673
if (includePasswords) {
4675
- NSString *pw = [self keychainPassword];
4674
+ NSString *pw = [connectionController keychainPassword];
4676
4675
if (!pw) pw = [connectionController password];
4677
4676
if (pw) [connection setObject:pw forKey:@"password"];
4678
4677
@@ -4871,7 +4870,7 @@ - (BOOL)setState:(NSDictionary *)stateDetails fromFile:(BOOL)spfBased
4871
4870
if ([connection objectForKey:@"password"])
4872
4871
[connectionController setPassword:[connection objectForKey:@"password"]];
4873
4872
else {
4874
- NSString *pw = [self keychainPassword];
4873
+ NSString *pw = [connectionController keychainPassword];
4875
4874
if (pw) [connectionController setPassword:pw];
4876
4875
}
4877
4876
@@ -7138,23 +7137,7 @@ - (void)queryGaveError:(NSString *)error connection:(id)connection
7138
7137
- (NSString *)keychainPasswordForConnection:(SPMySQLConnection *)connection authPlugin:(NSString *)pluginName
7139
7138
{
7140
7139
//TODO check plugin name to see whether we want to fetch it from keychain
7141
- return [self keychainPassword];
7142
- }
7143
-
7144
- - (NSString *)keychainPassword
7145
- {
7146
- NSString *kcItemName = [connectionController connectionKeychainItemName];
7147
- // If no keychain item is available, return an empty password
7148
- if (!kcItemName) return nil;
7149
-
7150
- // Otherwise, pull the password from the keychain using the details from this connection
7151
- SPKeychain *keychain = [[SPKeychain alloc] init];
7152
-
7153
- NSString *password = [keychain getPasswordForName:kcItemName account:[connectionController connectionKeychainItemAccount]];
7154
-
7155
- [keychain release];
7156
-
7157
- return password;
7140
+ return [connectionController keychainPassword];
7158
7141
}
7159
7142
7160
7143
/**
0 commit comments