Revert "(fix) make sure to use crypt as the scheme for md5/sha256/sha512 (fixes #4137)"
This reverts commit 63cb80142b
.
pull/241/head
parent
3ac952fd58
commit
b0e59f9ac9
|
@ -603,13 +603,6 @@ groupObjectClasses: (NSArray *) newGroupObjectClasses
|
||||||
return nil;
|
return nil;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ([_userPasswordAlgorithm caseInsensitiveCompare: @"md5-crypt"] == NSOrderedSame ||
|
|
||||||
[_userPasswordAlgorithm caseInsensitiveCompare: @"sha256-crypt"] == NSOrderedSame ||
|
|
||||||
[_userPasswordAlgorithm caseInsensitiveCompare: @"sha512-crypt"] == NSOrderedSame)
|
|
||||||
{
|
|
||||||
_userPasswordAlgorithm = @"crypt";
|
|
||||||
}
|
|
||||||
|
|
||||||
return [NSString stringWithFormat: @"{%@}%@", _userPasswordAlgorithm, pass];
|
return [NSString stringWithFormat: @"{%@}%@", _userPasswordAlgorithm, pass];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -213,13 +213,6 @@
|
||||||
return nil;
|
return nil;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ([_userPasswordAlgorithm caseInsensitiveCompare: @"md5-crypt"] == NSOrderedSame ||
|
|
||||||
[_userPasswordAlgorithm caseInsensitiveCompare: @"sha256-crypt"] == NSOrderedSame ||
|
|
||||||
[_userPasswordAlgorithm caseInsensitiveCompare: @"sha512-crypt"] == NSOrderedSame)
|
|
||||||
{
|
|
||||||
_userPasswordAlgorithm = @"crypt";
|
|
||||||
}
|
|
||||||
|
|
||||||
if (_prependPasswordScheme)
|
if (_prependPasswordScheme)
|
||||||
result = [NSString stringWithFormat: @"{%@}%@", _userPasswordAlgorithm, pass];
|
result = [NSString stringWithFormat: @"{%@}%@", _userPasswordAlgorithm, pass];
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue