From 9347082d1002974c0177d93ba4d32e4aff0558e6 Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Sun, 1 Jul 2007 15:42:36 +0000
Subject: [PATCH] =?utf8?q?MDL-10309=20Broken=20password=20expiration=20sup?=
 =?utf8?q?port=20for=20LDAP=20user=20types=20rfc2307=20and=20rfc2307bis,?=
 =?utf8?q?=20patch=20by=20I=C3=B1aki=20Arenaza;=20merged=20from=20MOODLE?=
 =?utf8?q?=5F18=5FSTABLE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 auth/ldap/auth.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/auth/ldap/auth.php b/auth/ldap/auth.php
index 95f6a61b66..039b5209cb 100644
--- 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:
-- 
2.39.5