From fd07a9b028960eeb6906b2797b6c2568f481a07a Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Tue, 3 Aug 2010 14:49:28 +0000 Subject: [PATCH] See ChangeLog Monotone-Parent: ec4781f04b708ab2a5944c8097cb08a1e608213e Monotone-Revision: b7ca5a591c7686be57e44bf98aae0c7b148afa20 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2010-08-03T14:49:28 --- ChangeLog | 1 + SoObjects/SOGo/GNUmakefile.preamble | 2 +- SoObjects/SOGo/SQLSource.m | 12 ++++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6591ba18b..dda920ef7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2010-08-03 Ludovic Marcotte * Applied patch for bug #690 + * Applied patch for bug #703 2010-07-28 Francis Lachapelle diff --git a/SoObjects/SOGo/GNUmakefile.preamble b/SoObjects/SOGo/GNUmakefile.preamble index dbe5f3cbc..afd4c9796 100644 --- a/SoObjects/SOGo/GNUmakefile.preamble +++ b/SoObjects/SOGo/GNUmakefile.preamble @@ -19,7 +19,7 @@ SOGo_LIBRARIES_DEPEND_UPON += \ -lNGCards \ -lNGMime \ -lNGStreams -lNGExtensions -lEOControl \ - -lXmlRpc -lDOM -lSaxObjC \ + -lXmlRpc -lDOM -lSaxObjC -lcrypt \ -lNGLdap ADDITIONAL_TOOL_LIBS += \ diff --git a/SoObjects/SOGo/SQLSource.m b/SoObjects/SOGo/SQLSource.m index 251456e15..aacb36869 100644 --- a/SoObjects/SOGo/SQLSource.m +++ b/SoObjects/SOGo/SQLSource.m @@ -35,6 +35,8 @@ #import #import +#include + #include #include @@ -139,6 +141,16 @@ { return [plainPassword isEqualToString: encryptedPassword]; } + else if ([_userPasswordAlgorithm caseInsensitiveCompare: @"crypt"] == NSOrderedSame) + { + NSString *s; + char *buf; + + buf = (char *)crypt([plainPassword UTF8String], [encryptedPassword UTF8String]); + s = [NSString stringWithUTF8String: buf]; + + return [s isEqualToString: encryptedPassword]; + } else if ([_userPasswordAlgorithm caseInsensitiveCompare: @"md5"] == NSOrderedSame) { NSString *s;