Fixes #3757 Added an option to force password ask for SASL method

contrib/openldap/core-fd-conf.schema

@@ -404,6 +404,12 @@ attributetype ( 1.3.6.1.4.1.38414.8.19.1 NAME 'fdOGroupRDN'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
   SINGLE-VALUE)
 
+attributetype ( 1.3.6.1.4.1.38414.8.19.2 NAME 'fdForceSaslPasswordAsk'
+  DESC 'FusionDirectory - Force password ask for SASL users'
+  EQUALITY booleanMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+  SINGLE-VALUE )
+
 # merged from dashboard-fd.schema - Needed by Fusion Directory for dashboard options
 
 attributetype ( 1.3.6.1.4.1.38414.27.1.1 NAME 'fdDashboardPrefix'
@@ -514,7 +520,7 @@ objectclass ( 1.3.6.1.4.1.38414.8.2.2 NAME 'fusionDirectoryPluginsConf'
   DESC 'FusionDirectory plugins configuration'
   SUP top AUXILIARY
   MUST ( cn )
-  MAY ( fdOGroupRDN ) )
+  MAY ( fdOGroupRDN $ fdForceSaslPasswordAsk ) )
 
 objectclass ( 1.3.6.1.4.1.38414.8.2.3 NAME 'fdPasswordRecoveryConf'
   DESC 'FusionDirectory password recovery configuration'

include/password-methods/class_password-methods-sasl.inc

@@ -103,7 +103,8 @@ class passwordMethodsasl extends passwordMethod {
    */
   function need_password()
   {
-    return FALSE;
+    global $config;
+    return ($config->get_cfg_value('forceSaslPasswordAsk', 'FALSE') == 'TRUE');
   }
 }
 ?>

plugins/config/class_mainPluginsConfig.inc

@@ -38,8 +38,8 @@ class mainPluginsConfig extends simplePlugin
   static function getAttributesInfo ()
   {
     return array(
-      'main' => array(
-        'name'  => _('LDAP tree'),
+      'ogroups' => array(
+        'name'  => _('Object groups'),
         'attrs' => array(
           new StringAttribute (
             _('OGroup RDN'), _('Branch in which object groups will be stored'),
@@ -48,6 +48,16 @@ class mainPluginsConfig extends simplePlugin
           ),
         )
       ),
+      'sasl' => array(
+        'name'  => _('SASL'),
+        'attrs' => array(
+          new BooleanAttribute (
+            _('Force Password asking'), _('Useful if you add a hook using password value when SASL user passwords are edited'),
+            'fdForceSaslPasswordAsk', TRUE,
+            FALSE
+          ),
+        )
+      ),
     );
   }