From dc6ef09c49d5685f85818203045c3f3a07b631c9 Mon Sep 17 00:00:00 2001
From: skodak <skodak>
Date: Sun, 1 Jul 2007 15:41:24 +0000
Subject: [PATCH] =?UTF-8?q?MDL-10309=20Broken=20password=20expiration=20su?=
 =?UTF-8?q?pport=20for=20LDAP=20user=20types=20rfc2307=20and=20rfc2307bis,?=
 =?UTF-8?q?=20patch=20by=20I=C3=B1aki=20Arenaza?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
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 863ff0072e1..408f4606ea3 100644
--- a/auth/ldap/auth.php
+++ b/auth/ldap/auth.php
@@ -1216,7 +1216,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':
@@ -1239,7 +1240,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: