See ChangeLog

Monotone-Parent: c1e5870e5f5c7546c7a47515125246ca856a2f40
Monotone-Revision: 52bbcfeb1dfff49a3bb753faaefd8bf92a5ad7eb

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2010-03-18T12:58:39
Monotone-Branch: ca.inverse.sogo

SoObjects/SOGo/SOGoConstants.h

@@ -43,6 +43,5 @@ typedef enum
 
 // Domain defaults
 extern NSString *SOGoPasswordChangeEnabled;
-extern NSString *SOGoPasswordPolicyEnabled;
 
 #endif /* _SOGOCONSTANTS_H_ */

SoObjects/SOGo/SOGoConstants.m

@@ -24,4 +24,3 @@
 
 // LDAP Password Policy Constants
 NSString* SOGoPasswordChangeEnabled = @"SOGoPasswordChangeEnabled";
-NSString* SOGoPasswordPolicyEnabled = @"SOGoPasswordPolicyEnabled";

SoObjects/SOGo/SOGoDomainDefaults.h

@@ -46,8 +46,6 @@
 - (BOOL) sieveScriptsEnabled;
 - (BOOL) forwardEnabled;
 - (BOOL) vacationEnabled;
-- (BOOL) passwordChangeEnabled;
-- (BOOL) passwordPolicyEnabled;
 - (NSString *) mailingMechanism;
 - (NSString *) smtpServer;
 - (NSString *) mailSpoolPath;

SoObjects/SOGo/SOGoDomainDefaults.m

@@ -171,16 +171,6 @@
   return [self boolForKey: @"SOGoVacationEnabled"];
 }
 
-- (BOOL) passwordChangeEnabled
-{
-  return [self boolForKey: SOGoPasswordChangeEnabled];
-}
-
-- (BOOL) passwordPolicyEnabled
-{
-  return [self boolForKey: SOGoPasswordPolicyEnabled];
-}
-
 - (NSString *) mailingMechanism
 {
   NSString *mailingMechanism;

SoObjects/SOGo/SOGoSystemDefaults.m

@@ -34,6 +34,7 @@
 #import "SOGoStartupLogger.h"
 
 #import "SOGoSystemDefaults.h"
+#import "SOGoConstants.h"
 
 @implementation SOGoSystemDefaults
 
@@ -277,7 +278,7 @@ BootstrapNSUserDefaults ()
 
 - (BOOL) userCanChangePassword
 {
-  return [self boolForKey: @"SOGoUIxUserCanChangePassword"];
+  return [self boolForKey: SOGoPasswordChangeEnabled];
 }
 
 - (BOOL) uixAdditionalPreferences