* SoObjects/SOGo/LDAPSource.m (changePasswordForLogin):

if userPasswordAlgorithm was not set or was set to "none",
    use the plaintext password directly instead of using '{none}plaintext'
    which isn't valid.

Monotone-Parent: d538a70c8651aa1849c88eedda7782a21b41b591
Monotone-Revision: a6dfa4114eeabf1790dbbd7a169d81c988375c12

Monotone-Author: jraby@inverse.ca
Monotone-Date: 2012-08-03T18:10:01
maint-2.0.2
Jean Raby 2012-08-03 18:10:01 +00:00
parent c36eafc69c
commit 0f65eab377
2 changed files with 11 additions and 1 deletions

View File

@ -1,3 +1,10 @@
2012-08-03 Jean Raby <jraby@inverse.ca>
* SoObjects/SOGo/LDAPSource.m (changePasswordForLogin):
if userPasswordAlgorithm was not set or was set to "none",
use the plaintext password directly instead of using '{none}plaintext'
which isn't valid.
2012-07-31 Jean Raby <jraby@inverse.ca>
* sogo.spec:

View File

@ -631,7 +631,10 @@ andMultipleBookingsField: (NSString *) newMultipleBookingsField
NSArray *changes;
attr = [[NGLdapAttribute alloc] initWithAttributeName: @"userPassword"];
[attr addStringValue: [self _encryptPassword: newPassword]];
if ([_userPasswordAlgorithm isEqualToString: @"none"])
[attr addStringValue: newPassword];
else
[attr addStringValue: [self _encryptPassword: newPassword]];
mod = [NGLdapModification replaceModification: attr];
changes = [NSArray arrayWithObject: mod];