From c72eac85d7073d9cdff4cb389e9f1b9eabb212a9 Mon Sep 17 00:00:00 2001
From: paca70 <paca70>
Date: Tue, 28 Sep 2004 12:50:33 +0000
Subject: [PATCH] Added basic configuration for rfc2307bis

---
 auth/ldap/lib.php | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/auth/ldap/lib.php b/auth/ldap/lib.php
index 2f266a2ba0..48c9b43159 100644
--- a/auth/ldap/lib.php
+++ b/auth/ldap/lib.php
@@ -568,7 +568,8 @@ function auth_ldap_suppported_usertypes (){
 // And then add case clauses in relevant places in functions
 // iauth_ldap_init, auth_user_create, auth_check_expire, auth_check_grace
     $types['edir']='Novell Edirectory';
-    $types['posix']='posixAccount (rfc2307)';
+    $types['rfc2307']='posixAccount (rfc2307)';
+    $types['rfc2307bis']='posixAccount (rfc2307bis)';
     $types['samba']='sambaSamAccount (v.3.0.7)';
     $types['ad']='MS ActiveDirectory'; 
     return $types;
@@ -580,35 +581,40 @@ function auth_ldap_init () {
     global $CFG;
     $default['ldap_objectclass'] = array(
                         'edir' => 'User',
-                        'posix' => 'posixAccount',
+                        'rfc2703' => 'posixAccount',
+                        'rfc2703bis' => 'posixAccount',
                         'samba' => 'sambaSamAccount',
                         'ad' => 'user',
                         'default' => '*'
                         );
     $default['ldap_user_attribute'] = array(
                         'edir' => 'cn',
-                        'posix' => 'uid',
+                        'rfc2307' => 'uid',
+                        'rfc2307bis' => 'uid',
                         'samba' => 'uid',
                         'ad' => 'cn',
                         'default' => 'cn'
                         );
     $default['ldap_memberattribute'] = array(
                         'edir' => 'member',
-                        'posix' => 'member',
+                        'rfc2307' => 'member',
+                        'rfc2307bis' => 'member',
                         'samba' => 'member',
                         'ad' => 'member', //is this right?
                         'default' => 'member'
                         );
     $default['ldap_memberattribute_isdn'] = array(
                         'edir' => '1',
-                        'posix' => '0',
+                        'rfs2307' => '0',
+                        'rfs2307bis' => '1',
                         'samba' => '0', //is this right?
                         'ad' => '0', //is this right?
                         'default' => '0'
                         );
     $default['ldap_expireattr'] = array (
                         'edir' => 'passwordExpirationTime',
-                        'posix' => 'shadowExpire',
+                        'rfc2307' => 'shadowExpire',
+                        'rfc2307bis' => 'shadowExpire',
                         'samba' => '', //No support yet
                         'ad' => '', //No support yet
                         'default' => ''
-- 
2.39.5