MDL-10309 Broken password expiration support for LDAP user types rfc2307 and rfc2307b...

diff --git a/auth/ldap/auth.php b/auth/ldap/auth.php
index 95f6a61b667f32a3173f1bececc2f094eb6ccb9b..039b5209cbd2ac84d1d35c8e9ec7bbbf2f7009a8 100644 (file)
--- a/auth/ldap/auth.php
+++ b/auth/ldap/auth.php
@@ -1365,7 +1365,8 @@ class auth_plugin_ldap extends auth_plugin_base {
                 $sec=substr($time,12,2);
                 $result = mktime($hr,$min,$sec,$mo,$dt,$yr);
                 break;
-            case 'posix':
+            case 'rfc2307':
+            case 'rfc2307bis':
                 $result = $time * DAYSECS; //The shadowExpire contains the number of DAYS between 01/01/1970 and the actual expiration date
                 break;
             case 'ad':
@@ -1388,7 +1389,8 @@ class auth_plugin_ldap extends auth_plugin_base {
             case 'edir':
                 $result=date('YmdHis', $time).'Z';
                 break;
-            case 'posix':
+            case 'rfc2307':
+            case 'rfc2307bis':
                 $result = $time ; //Already in correct format
                 break;
             default: