deon/phpldapadmin
1
0
Fork 0
Code Issues 36 Pull Requests Packages Projects Releases Wiki Activity

SF Bug #3373466 - Unable to define force_may attributes

Browse Source
This commit is contained in:
Deon George 2011-09-08 22:30:35 +10:00
parent 64668e882b
commit 80d027d569
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/config.php.example
View File

@ -491,8 +491,8 @@ $servers->setValue('server','name','My LDAP Server');
server may automatically calculate a default value. server may automatically calculate a default value.
In Fedora Directory Server using the DNA Plugin one could ignore uidNumber, In Fedora Directory Server using the DNA Plugin one could ignore uidNumber,
gidNumber and sambaSID. */ gidNumber and sambaSID. */
// $servers->setValue('force_may','attrs',array('')); // $servers->setValue('server','force_may',array(''));
# $servers->setValue('force_may','attrs',array('uidNumber','gidNumber','sambaSID')); # $servers->setValue('server','force_may',array('uidNumber','gidNumber','sambaSID'));
/********************************************* /*********************************************
* Unique attributes * * Unique attributes *
@ -564,6 +564,6 @@ $servers->setValue('login','timeout',30);
$servers->setValue('server','branch_rename',false); $servers->setValue('server','branch_rename',false);
$servers->setValue('server','custom_sys_attrs',array('passwordExpirationTime','passwordAllowChangeTime')); $servers->setValue('server','custom_sys_attrs',array('passwordExpirationTime','passwordAllowChangeTime'));
$servers->setValue('server','custom_attrs',array('nsRoleDN','nsRole','nsAccountLock')); $servers->setValue('server','custom_attrs',array('nsRoleDN','nsRole','nsAccountLock'));
$servers->setValue('force_may','attrs',array('uidNumber','gidNumber','sambaSID')); $servers->setValue('server','force_may',array('uidNumber','gidNumber','sambaSID'));
*/ */
?> ?>

7
lib/ds_ldap.php
View File

@ -19,8 +19,6 @@ class ldap extends DS {
private $_schema_entries = null; private $_schema_entries = null;
# Schema DN # Schema DN
private $_schemaDN = null; private $_schemaDN = null;
# Attributes that should be treated as MAY attributes, even though the scheme has them as MUST attributes.
private $force_may = array();
public function __construct($index) { public function __construct($index) {
if (defined('DEBUG_ENABLED') && DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS')) if (defined('DEBUG_ENABLED') && DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS'))
@ -1912,14 +1910,13 @@ class ldap extends DS {
* This function determines if the specified attribute is contained in the force_may list * This function determines if the specified attribute is contained in the force_may list
* as configured in config.php. * as configured in config.php.
* *
* @return boolean True if the specified attribute is in the $force_may list and false * @return boolean True if the specified attribute is configured to be force as a may attribute
* otherwise.
*/ */
function isForceMay($attr_name) { function isForceMay($attr_name) {
if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS')) if (DEBUG_ENABLED && (($fargs=func_get_args())||$fargs='NOARGS'))
debug_log('Entered (%%)',17,0,__FILE__,__LINE__,__METHOD__,$fargs); debug_log('Entered (%%)',17,0,__FILE__,__LINE__,__METHOD__,$fargs);
return in_array($attr_name,$this->force_may); return in_array($attr_name,unserialize(strtolower(serialize($this->getValue('server','force_may')))));
} }
/** /**

8
lib/ds_ldap_pla.php
View File

@ -13,9 +13,6 @@
* @subpackage DataStore * @subpackage DataStore
*/ */
class ldap_pla extends ldap { class ldap_pla extends ldap {
# Attributes that should be treated as MAY attributes, even though the scheme has them as MUST attributes.
private $force_may = array();
function __construct($index) { function __construct($index) {
parent::__construct($index); parent::__construct($index);
@ -89,6 +86,11 @@ class ldap_pla extends ldap {
'*' '*'
)); ));
$this->default->server['force_may'] = array(
'desc'=>'Force server MUST attributes as MAY attributes',
'default'=>array(
));
# Settings for auto_number # Settings for auto_number
$this->default->auto_number['enable'] = array( $this->default->auto_number['enable'] = array(
'desc'=>'Enable the AUTO UID feature', 'desc'=>'Enable the AUTO UID feature',