summaryrefslogtreecommitdiff
path: root/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization
diff options
context:
space:
mode:
Diffstat (limited to 'kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization')
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/LdapAuthorizationConsumerConf.class.php21
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/ldap_authorization.inc3
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/ldap_authorization.info6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/ldap_authorization_drupal_role/LdapAuthorizationConsumerRole.class.php72
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/ldap_authorization_drupal_role/ldap_authorization_drupal_role.info6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/ldap_authorization_og/ldap_authorization_og.info6
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/1197636/1197636.ldap_servers.test_data.inc2
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/BasicTests/ldap_servers.inc14
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/DeriveFromAttr/ldap_servers.inc15
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/DeriveFromDN/ldap_servers.inc9
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/Og/ldap_servers.inc14
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/Other/ldap_servers.inc14
12 files changed, 126 insertions, 56 deletions
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/LdapAuthorizationConsumerConf.class.php b/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/LdapAuthorizationConsumerConf.class.php
index 5155981..fd59266 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/LdapAuthorizationConsumerConf.class.php
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/LdapAuthorizationConsumerConf.class.php
@@ -118,28 +118,27 @@ class LdapAuthorizationConsumerConf {
$this->sid = $consumer_conf->sid;
$this->consumerType = $consumer_conf->consumer_type;
- $this->numericConsumerConfId = $consumer_conf->numeric_consumer_conf_id;
+ $this->numericConsumerConfId = isset($consumer_conf->numeric_consumer_conf_id)? $consumer_conf->numeric_consumer_conf_id : NULL;
$this->status = ($consumer_conf->status) ? 1 : 0;
$this->onlyApplyToLdapAuthenticated = (bool)(@$consumer_conf->only_ldap_authenticated);
$this->deriveFromDn = (bool)(@$consumer_conf->derive_from_dn);
- $this->deriveFromDnAttr = $consumer_conf->derive_from_dn_attr;
+ $this->deriveFromDnAttr = isset($consumer_conf->derive_from_dn_attr) ? $consumer_conf->derive_from_dn_attr : NULL;
- $this->deriveFromAttr = (bool)($consumer_conf->derive_from_attr);
+ $this->deriveFromAttr = (bool)(@$consumer_conf->derive_from_attr);
$this->deriveFromAttrAttr = $this->linesToArray($consumer_conf->derive_from_attr_attr);
- $this->deriveFromAttrUseFirstAttr = (bool)($consumer_conf->derive_from_attr_use_first_attr);
- $this->deriveFromAttrNested = (bool)($consumer_conf->derive_from_attr_nested);
+ $this->deriveFromAttrUseFirstAttr = (bool)(@$consumer_conf->derive_from_attr_use_first_attr);
+ $this->deriveFromAttrNested = (bool)(@$consumer_conf->derive_from_attr_nested);
$this->deriveFromEntry = (bool)(@$consumer_conf->derive_from_entry);
$this->deriveFromEntryEntries = $this->linesToArray($consumer_conf->derive_from_entry_entries);
- $this->deriveFromEntryEntriesAttr = $consumer_conf->derive_from_entry_entries_attr;
-
+ $this->deriveFromEntryEntriesAttr = isset($consumer_conf->derive_from_entry_entries_attr) ? $consumer_conf->derive_from_entry_entries_attr : NULL;
$this->deriveFromEntryMembershipAttr = $consumer_conf->derive_from_entry_attr;
- $this->deriveFromEntryAttrMatchingUserAttr = $consumer_conf->derive_from_entry_user_ldap_attr;
- $this->deriveFromEntrySearchAll = (bool)($consumer_conf->derive_from_entry_search_all);
- $this->deriveFromEntryUseFirstAttr = (bool)($consumer_conf->derive_from_entry_use_first_attr);
- $this->deriveFromEntryNested = $consumer_conf->derive_from_entry_nested;
+ $this->deriveFromEntryAttrMatchingUserAttr = isset($consumer_conf->derive_from_entry_user_ldap_attr) ? $consumer_conf->derive_from_entry_user_ldap_attr : NULL;
+ $this->deriveFromEntrySearchAll = (bool)(@$consumer_conf->derive_from_entry_search_all);
+ $this->deriveFromEntryUseFirstAttr = (bool)(@$consumer_conf->derive_from_entry_use_first_attr);
+ $this->deriveFromEntryNested = isset($consumer_conf->derive_from_entry_nested) ? $consumer_conf->derive_from_entry_nested : NULL;
$this->mappings = $this->pipeListToArray($consumer_conf->mappings, FALSE);
$this->useMappingsAsFilter = (bool)(@$consumer_conf->use_filter);
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/ldap_authorization.inc b/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/ldap_authorization.inc
index 69b6a26..452bb1d 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/ldap_authorization.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/ldap_authorization.inc
@@ -495,7 +495,7 @@ function _ldap_authorization_ldap_authorization_maps_alter(&$user, &$user_ldap_e
}
}
elseif (isset($user_ldap_entry[$consumer_conf->deriveFromEntryAttrMatchingUserAttr]) ||
- isset($user_ldap_entry['attr'][$consumer_conf->deriveFromEntryAttrMatchingUserAttr])) {
+ isset($user_ldap_entry['attr'][ldap_server_massage_text($consumer_conf->deriveFromEntryAttrMatchingUserAttr, 'attr_name', LDAP_SERVER_MASSAGE_QUERY_ARRAY)])) {
// $derive_from_entries_entries, $derive_from_entry_attr, $derive_from_entry_user_ldap_attr, $user_ldap_entry, $nested = FALSE
$derive_from_entry_authorizations = $ldap_server->deriveFromEntryGroups(
$consumer_conf->deriveFromEntryEntries,
@@ -505,6 +505,7 @@ function _ldap_authorization_ldap_authorization_maps_alter(&$user, &$user_ldap_e
$user_ldap_entry,
$consumer_conf->deriveFromEntryNested
);
+ // deriveFromEntryGroups($entries, $entries_attr
if (count($derive_from_entry_authorizations)) {
foreach ($derive_from_entry_authorizations as $i => $authorization) {
if ($consumer_conf->deriveFromEntryUseFirstAttr) {
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/ldap_authorization.info b/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/ldap_authorization.info
index 2f9addb..75bff56 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/ldap_authorization.info
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/ldap_authorization.info
@@ -23,9 +23,9 @@ files[] = tests/Og/Og.test
files[] = tests/Og/Og2.test
configure = admin/config/people/ldap/authorization
-; Information added by drupal.org packaging script on 2012-06-14
-version = "7.x-1.0-beta11"
+; Information added by drupal.org packaging script on 2012-08-20
+version = "7.x-1.0-beta12"
core = "7.x"
project = "ldap"
-datestamp = "1339643179"
+datestamp = "1345503423"
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/ldap_authorization_drupal_role/LdapAuthorizationConsumerRole.class.php b/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/ldap_authorization_drupal_role/LdapAuthorizationConsumerRole.class.php
index 102f749..f6fd40b 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/ldap_authorization_drupal_role/LdapAuthorizationConsumerRole.class.php
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/ldap_authorization_drupal_role/LdapAuthorizationConsumerRole.class.php
@@ -25,7 +25,7 @@ class LdapAuthorizationConsumerDrupalRole extends LdapAuthorizationConsumerAbstr
public $revokeLdapProvisionedDefault = TRUE;
public $regrantLdapProvisionedDefault = TRUE;
public $createContainersDefault = TRUE;
- public $drupalRolesByName = array();
+ private $drupalRolesByName = array();
/**
* Constructor Method
@@ -112,15 +112,15 @@ class LdapAuthorizationConsumerDrupalRole extends LdapAuthorizationConsumerAbstr
public function revokeSingleAuthorization(&$user, $role_name, &$user_auth_data) {
- $user_edit = array('roles' => array_diff($user->roles, array($this->drupalRolesByName[$role_name] => $role_name)));
+ $user_edit = array('roles' => array_diff($user->roles, array($this->getDrupalRoleByName($role_name) => $role_name)));
$account = user_load($user->uid);
$user = user_save($account, $user_edit);
- $result = ($user && !isset($user->roles[$this->drupalRolesByName[$role_name]]));
+ $result = ($user && !isset($user->roles[$this->getDrupalRoleByName($role_name)]));
if ($this->detailedWatchdogLog) {
watchdog('ldap_authorization', 'LdapAuthorizationConsumerDrupalRole.revokeSingleAuthorization()
revoked: rid=%rid, role_name=%role_name for username=%username, result=%result',
- array('%rid' => $this->drupalRolesByName[$role_name], '%role_name' => $role_name, '%username' => $user->name,
+ array('%rid' => $this->getDrupalRoleByName($role_name), '%role_name' => $role_name, '%username' => $user->name,
'%result' => $result), WATCHDOG_DEBUG);
}
@@ -133,19 +133,16 @@ class LdapAuthorizationConsumerDrupalRole extends LdapAuthorizationConsumerAbstr
*/
public function grantSingleAuthorization(&$user, $role_name, &$user_auth_data) {
- if (! isset($this->drupalRolesByName[$role_name])) {
+ if (is_null($this->getDrupalRoleByName($role_name))) {
watchdog('ldap_authorization', 'LdapAuthorizationConsumerDrupalRole.grantSingleAuthorization()
failed to grant %username the role %role_name because role does not exist',
array('%role_name' => $role_name, '%username' => $user->name),
WATCHDOG_ERROR);
return FALSE;
}
- debug($user->roles);
- $new_roles = $user->roles + array($this->drupalRolesByName[$role_name] => $role_name);
+ $new_roles = $user->roles + array($this->getDrupalRoleByName($role_name) => $role_name);
$user_edit = array('roles' => $new_roles);
- debug($new_roles);
- debug($user_edit);
if ($this->detailedWatchdogLog) {
watchdog('ldap_authorization', 'grantSingleAuthorization in drupal rold' . print_r($user, TRUE), array(), WATCHDOG_DEBUG);
}
@@ -157,7 +154,7 @@ class LdapAuthorizationConsumerDrupalRole extends LdapAuthorizationConsumerAbstr
if ($this->detailedWatchdogLog) {
watchdog('ldap_authorization', 'LdapAuthorizationConsumerDrupalRole.grantSingleAuthorization()
granted: rid=%rid, role_name=%role_name for username=%username, result=%result',
- array('%rid' => $this->drupalRolesByName[$role_name], '%role_name' => $role_name, '%username' => $user->name,
+ array('%rid' => $this->getDrupalRoleByName($role_name), '%role_name' => $role_name, '%username' => $user->name,
'%result' => $result), WATCHDOG_DEBUG);
}
@@ -171,40 +168,45 @@ class LdapAuthorizationConsumerDrupalRole extends LdapAuthorizationConsumerAbstr
public function validateAuthorizationMappingTarget($map_to, $form_values = NULL, $clear_cache = FALSE) {
$has_form_values = is_array($form_values);
- $message_type = NULL;
- $message_text = NULL;
- $normalized = $this->normalizeMappings(array($map_to));
- $tokens = array('!map_to' => $map_to);
- $pass = FALSE;
- if (is_array($normalized) && isset($normalized[0][1]) && $normalized[0][1] !== FALSE ) {
- $available_authorization_ids = $this->availableConsumerIDs($clear_cache);
+ $message_type = NULL;
+ $message_text = NULL;
+ $normalized = $this->normalizeMappings(array($map_to));
+ $tokens = array('!map_to' => $map_to);
+ $pass = FALSE;
+
+ if (is_array($normalized) && isset($normalized[0][1]) && $normalized[0][1] !== FALSE ) {
+ $available_authorization_ids = $this->availableConsumerIDs($clear_cache);
$available_authorization_ids = array_map('drupal_strtolower', $available_authorization_ids);
- // debug($available_authorization_ids); debug($normalized[0]);
- $pass = (in_array(drupal_strtolower($normalized[0]), $available_authorization_ids));
- }
+ $pass = (in_array(drupal_strtolower($normalized[0]), $available_authorization_ids));
+ }
- if (!$pass) {
- $message_text = '<code>"' . t('!map_to', $tokens) . '</code>" ' . t('does not map to any existing Drupal roles. ');
+ if (!$pass) {
+ $message_text = '<code>"' . t('!map_to', $tokens) . '</code>" ' . t('does not map to any existing Drupal roles. ');
if ($has_form_values) {
$create_consumers = (isset($form_values['synchronization_actions']['create_consumers']) && $form_values['synchronization_actions']['create_consumers']);
}
else {
$create_consumers = $this->consumerConf->create_consumers;
}
- if ($create_consumers && $this->allowConsumerObjectCreation) {
- $message_type = 'warning';
+ if ($create_consumers && $this->allowConsumerObjectCreation) {
+ $message_type = 'warning';
$message_text .= t('It will be created when needed. If "!map_to" is not intentional, please fix it', $tokens);
- }
- elseif (!$this->allowConsumerObjectCreation) {
- $message_type = 'error';
- $message_text .= t('Since automatic Drupal role creation is not possible with this module, an existing role must be mapped to.');
- }
- elseif (!$create_consumers) {
- $message_type = 'error';
- $message_text .= t('Since automatic Drupal role creation is disabled, an existing role must be mapped to. Either enable role creation or map to an existing role.');
- }
-
- }
+ }
+ elseif (!$this->allowConsumerObjectCreation) {
+ $message_type = 'error';
+ $message_text .= t('Since automatic Drupal role creation is not possible with this module, an existing role must be mapped to.');
+ }
+ elseif (!$create_consumers) {
+ $message_type = 'error';
+ $message_text .= t('Since automatic Drupal role creation is disabled, an existing role must be mapped to. Either enable role creation or map to an existing role.');
+ }
+ }
return array($message_type, $message_text);
}
+
+ private function getDrupalRoleByName($role_name) {
+ $role_name_lowercase = drupal_strtolower($role_name);
+
+ return (isset($this->drupalRolesByName[$role_name_lowercase]) ? $this->drupalRolesByName[$role_name_lowercase] : NULL);
+ }
}
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/ldap_authorization_drupal_role/ldap_authorization_drupal_role.info b/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/ldap_authorization_drupal_role/ldap_authorization_drupal_role.info
index 39c1848..29163f2 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/ldap_authorization_drupal_role/ldap_authorization_drupal_role.info
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/ldap_authorization_drupal_role/ldap_authorization_drupal_role.info
@@ -10,9 +10,9 @@ files[] = LdapAuthorizationConsumerRole.class.php
files[] = ldap_authorization_drupal_role.module
files[] = ldap_authorization_drupal_role.inc
-; Information added by drupal.org packaging script on 2012-06-14
-version = "7.x-1.0-beta11"
+; Information added by drupal.org packaging script on 2012-08-20
+version = "7.x-1.0-beta12"
core = "7.x"
project = "ldap"
-datestamp = "1339643179"
+datestamp = "1345503423"
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/ldap_authorization_og/ldap_authorization_og.info b/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/ldap_authorization_og/ldap_authorization_og.info
index b6434df..9b67c71 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/ldap_authorization_og/ldap_authorization_og.info
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/ldap_authorization_og/ldap_authorization_og.info
@@ -13,9 +13,9 @@ files[] = ldap_authorization_og.inc
core = "7.x"
-; Information added by drupal.org packaging script on 2012-06-14
-version = "7.x-1.0-beta11"
+; Information added by drupal.org packaging script on 2012-08-20
+version = "7.x-1.0-beta12"
core = "7.x"
project = "ldap"
-datestamp = "1339643179"
+datestamp = "1345503423"
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/1197636/1197636.ldap_servers.test_data.inc b/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/1197636/1197636.ldap_servers.test_data.inc
index 2a73919..b4d8064 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/1197636/1197636.ldap_servers.test_data.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/1197636/1197636.ldap_servers.test_data.inc
@@ -45,6 +45,7 @@ $servers['fake_server1']['search_results']['member=cn=verykool,ou=special guests
*/
$servers['fake_server1']['users']['cn=verykool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=verykool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=verykool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'verykool@myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'verykool', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -59,6 +60,7 @@ $servers['fake_server1']['users']['cn=verykool,ou=special guests,ou=guest accoun
*/
$servers['fake_server1']['users']['cn=service-account,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=service-account,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=service-account,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'service-account@myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'service-account', 'count' => 1),
'memberOf' => array(
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/BasicTests/ldap_servers.inc b/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/BasicTests/ldap_servers.inc
index fcc766f..71637de 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/BasicTests/ldap_servers.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/BasicTests/ldap_servers.inc
@@ -50,6 +50,7 @@ $servers['ldapauthor1']['search_results']['(member=cn=jkool,ou=guest accounts,dc
*/
$servers['ldapauthor1']['users']['cn=jdoe,ou=campus accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=jdoe,ou=campus accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=jdoe,ou=campus accounts,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'jdoe@myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'jdoe', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -58,6 +59,7 @@ $servers['ldapauthor1']['users']['cn=jdoe,ou=campus accounts,dc=ad,dc=myuniversi
$servers['ldapauthor1']['users']['cn=jkool,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=jkool,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=jkool,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'jkool@guests.myuniversity.edu', 'count' => 1),
'mailcode' => array( 0 => '17', 'count' => 1),
'sAMAccountName' => array( 0 => 'jkool', 'count' => 1),
@@ -68,6 +70,7 @@ $servers['ldapauthor1']['users']['cn=jkool,ou=guest accounts,dc=ad,dc=myuniversi
// duplicate of previous with escaped commas in cn.
$servers['ldapauthor1']['users']['cn=Flintstone\, Wilma,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=Flintstone\, Wilma,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=Flintstone\, Wilma,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'wilmaf@guests.myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'wilmaf', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -81,6 +84,7 @@ $servers['ldapauthor1']['users']['cn=Flintstone\, Wilma,ou=guest accounts,dc=ad,
// duplicate of previous with quoted cn.
$servers['ldapauthor1']['users']['cn=Rubble\, Barney,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=Rubble\, Barney,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=Rubble\, Barney,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'barneyr@guests.myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'barneyr', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -94,6 +98,7 @@ $servers['ldapauthor1']['users']['cn=Rubble\, Barney,ou=guest accounts,dc=ad,dc=
$servers['ldapauthor1']['users']['cn=unkool,ou=lost,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=unkool,ou=lost,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=unkool,ou=lost,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'unkool@nowhere.myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'jkool', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -102,6 +107,7 @@ $servers['ldapauthor1']['users']['cn=unkool,ou=lost,dc=ad,dc=myuniversity,dc=edu
$servers['ldapauthor1']['users']['cn=verykool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=verykool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=verykool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'verykool@myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'verykool', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -117,6 +123,7 @@ $servers['ldapauthor1']['users']['cn=verykool,ou=special guests,ou=guest account
$servers['ldapauthor1']['users']['cn=newkool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=newkool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=newkool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'newkool@guests.myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'newkool', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -125,6 +132,7 @@ $servers['ldapauthor1']['users']['cn=newkool,ou=special guests,ou=guest accounts
$servers['ldapauthor1']['users']['cn=joeprogrammer,ou=it,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=joeprogrammer,ou=it,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=joeprogrammer,ou=it,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'joeprogrammer@myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'joeprogrammer', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -147,27 +155,32 @@ $servers['ldapauthor1']['users']['cn=joeprogrammer,ou=it,dc=ad,dc=myuniversity,d
*/
$servers['ldapauthor1']['groups']['cn=sysadmins,ou=it,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=sysadmins,ou=it,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=sysadmins,ou=it,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'memberOf' => array( 0 => 'cn=it,ou=it,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
);
$servers['ldapauthor1']['groups']['cn=developers,ou=it,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=developers,ou=it,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=developers,ou=it,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'memberOf' => array( 0 => 'cn=it,ou=it,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
);
$servers['ldapauthor1']['groups']['cn=it,ou=it,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=it,ou=it,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=it,ou=it,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'memberOf' => array( 0 => 'cn=staff,ou=people,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'memberOf' => array( 0 => 'cn=sysadmins,ou=it,dc=ad,dc=myuniversity,dc=edu', 'count' => 1), // bogus recursion to test bogus recursion
);
$servers['ldapauthor1']['groups']['cn=staff,ou=people,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=staff,ou=people,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=staff,ou=people,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'memberOf' => array( 0 => 'cn=people,ou=it,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
);
$servers['ldapauthor1']['groups']['cn=people,ou=it,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=people,ou=it,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=people,ou=it,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'memberOf' => array('count' => 0),
);
@@ -188,6 +201,7 @@ $servers['ldapauthor1']['search_results']['(|((dn=cn=staff,ou=people,dc=ad,dc=my
*/
$servers['ldapauthor1']['users']['cn=service-account,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=service-account,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=service-account,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'service-account@myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'service-account', 'count' => 1),
'memberOf' => array(
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/DeriveFromAttr/ldap_servers.inc b/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/DeriveFromAttr/ldap_servers.inc
index 4ebe5a6..1cc5578 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/DeriveFromAttr/ldap_servers.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/DeriveFromAttr/ldap_servers.inc
@@ -50,6 +50,7 @@ $servers['ldapauthor1']['search_results']['(member=cn=jkool,ou=guest accounts,dc
*/
$servers['ldapauthor1']['users']['cn=jdoe,ou=campus accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=jdoe,ou=campus accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=jdoe,ou=campus accounts,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'jdoe@myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'jdoe', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -58,6 +59,7 @@ $servers['ldapauthor1']['users']['cn=jdoe,ou=campus accounts,dc=ad,dc=myuniversi
$servers['ldapauthor1']['users']['cn=jkool,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=jkool,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=jkool,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'jkool@guests.myuniversity.edu', 'count' => 1),
'mailcode' => array( 0 => '17', 'count' => 1),
'sAMAccountName' => array( 0 => 'jkool', 'count' => 1),
@@ -68,6 +70,7 @@ $servers['ldapauthor1']['users']['cn=jkool,ou=guest accounts,dc=ad,dc=myuniversi
// duplicate of previous with escaped commas in cn.
$servers['ldapauthor1']['users']['cn=Flintstone\, Wilma,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=Flintstone\, Wilma,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=Flintstone\, Wilma,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'wilmaf@guests.myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'wilmaf', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -81,6 +84,7 @@ $servers['ldapauthor1']['users']['cn=Flintstone\, Wilma,ou=guest accounts,dc=ad,
// duplicate of previous with quoted cn.
$servers['ldapauthor1']['users']['cn=Rubble\, Barney,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=Rubble\, Barney,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=Rubble\, Barney,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'barneyr@guests.myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'barneyr', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -94,6 +98,7 @@ $servers['ldapauthor1']['users']['cn=Rubble\, Barney,ou=guest accounts,dc=ad,dc=
$servers['ldapauthor1']['users']['cn=unkool,ou=lost,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=unkool,ou=lost,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=unkool,ou=lost,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'unkool@nowhere.myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'jkool', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -102,6 +107,7 @@ $servers['ldapauthor1']['users']['cn=unkool,ou=lost,dc=ad,dc=myuniversity,dc=edu
$servers['ldapauthor1']['users']['cn=verykool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=verykool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=verykool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'verykool@myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'verykool', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -119,6 +125,7 @@ $servers['ldapauthor1']['users']['cn=verykool,ou=special guests,ou=guest account
$servers['ldapauthor1']['users']['cn=service-account,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=service-account,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=service-account,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'service-account@myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'service-account', 'count' => 1),
'memberOf' => array(
@@ -132,6 +139,7 @@ $servers['ldapauthor1']['users']['cn=service-account,dc=ad,dc=myuniversity,dc=ed
$servers['ldapauthor1']['users']['cn=justin,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=justin,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=justin,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'justin@myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'justin', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -141,6 +149,7 @@ $servers['ldapauthor1']['users']['cn=justin,ou=guest accounts,dc=ad,dc=myunivers
$servers['ldapauthor1']['users']['cn=newkool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=newkool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=newkool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'newkool@guests.myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'newkool', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -149,6 +158,7 @@ $servers['ldapauthor1']['users']['cn=newkool,ou=special guests,ou=guest accounts
$servers['ldapauthor1']['users']['cn=joeprogrammer,ou=it,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=joeprogrammer,ou=it,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=joeprogrammer,ou=it,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'joeprogrammer@myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'joeprogrammer', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -186,26 +196,31 @@ $servers['ldapauthor1']['users']['cn=joeprogrammer,ou=it,dc=ad,dc=myuniversity,d
*/
$servers['ldapauthor1']['groups']['cn=sysadmins,ou=it,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=sysadmins,ou=it,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=sysadmins,ou=it,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'memberOf' => array( 0 => 'cn=it,ou=it,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
);
$servers['ldapauthor1']['groups']['cn=developers,ou=it,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=developers,ou=it,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=developers,ou=it,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'memberOf' => array( 0 => 'cn=it,ou=it,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
);
$servers['ldapauthor1']['groups']['cn=it,ou=it,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=it,ou=it,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=it,ou=it,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'memberOf' => array( 0 => 'cn=staff,ou=people,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'memberOf' => array( 0 => 'cn=sysadmins,ou=it,dc=ad,dc=myuniversity,dc=edu', 'count' => 1), // bogus recursion to test bogus recursion
);
$servers['ldapauthor1']['groups']['cn=staff,ou=people,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=staff,ou=people,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=staff,ou=people,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'memberOf' => array( 0 => 'cn=people,ou=it,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
);
$servers['ldapauthor1']['groups']['cn=people,ou=it,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=people,ou=it,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=people,ou=it,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'memberOf' => array('count' => 0),
);
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/DeriveFromDN/ldap_servers.inc b/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/DeriveFromDN/ldap_servers.inc
index 046345e..483b43a 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/DeriveFromDN/ldap_servers.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/DeriveFromDN/ldap_servers.inc
@@ -50,6 +50,7 @@ $servers['ldapauthor1']['search_results']['(member=cn=jkool,ou=guest accounts,dc
*/
$servers['ldapauthor1']['users']['cn=jdoe,ou=campus accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=jdoe,ou=campus accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=jdoe,ou=campus accounts,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'jdoe@myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'jdoe', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -58,6 +59,7 @@ $servers['ldapauthor1']['users']['cn=jdoe,ou=campus accounts,dc=ad,dc=myuniversi
$servers['ldapauthor1']['users']['cn=jkool,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=jkool,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=jkool,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'jkool@guests.myuniversity.edu', 'count' => 1),
'mailcode' => array( 0 => '17', 'count' => 1),
'sAMAccountName' => array( 0 => 'jkool', 'count' => 1),
@@ -68,6 +70,7 @@ $servers['ldapauthor1']['users']['cn=jkool,ou=guest accounts,dc=ad,dc=myuniversi
// duplicate of previous with escaped commas in cn.
$servers['ldapauthor1']['users']['cn=Flintstone\, Wilma,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=Flintstone\, Wilma,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=Flintstone\, Wilma,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'wilmaf@guests.myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'wilmaf', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -81,6 +84,7 @@ $servers['ldapauthor1']['users']['cn=Flintstone\, Wilma,ou=guest accounts,dc=ad,
// duplicate of previous with quoted cn.
$servers['ldapauthor1']['users']['cn=Rubble\, Barney,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=Rubble\, Barney,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=Rubble\, Barney,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'barneyr@guests.myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'barneyr', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -94,6 +98,7 @@ $servers['ldapauthor1']['users']['cn=Rubble\, Barney,ou=guest accounts,dc=ad,dc=
$servers['ldapauthor1']['users']['cn=unkool,ou=lost,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=unkool,ou=lost,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=unkool,ou=lost,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'unkool@nowhere.myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'jkool', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -102,6 +107,7 @@ $servers['ldapauthor1']['users']['cn=unkool,ou=lost,dc=ad,dc=myuniversity,dc=edu
$servers['ldapauthor1']['users']['cn=verykool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=verykool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=verykool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'verykool@myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'verykool', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -117,6 +123,7 @@ $servers['ldapauthor1']['users']['cn=verykool,ou=special guests,ou=guest account
$servers['ldapauthor1']['users']['cn=newkool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=newkool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=newkool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'newkool@guests.myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'newkool', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -125,6 +132,7 @@ $servers['ldapauthor1']['users']['cn=newkool,ou=special guests,ou=guest accounts
$servers['ldapauthor1']['users']['cn=joeprogrammer,ou=it,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=joeprogrammer,ou=it,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=joeprogrammer,ou=it,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'joeprogrammer@myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'joeprogrammer', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -138,6 +146,7 @@ $servers['ldapauthor1']['users']['cn=joeprogrammer,ou=it,dc=ad,dc=myuniversity,d
*/
$servers['ldapauthor1']['users']['cn=service-account,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=service-account,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=service-account,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'mail' => array( 0 => 'service-account@myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'service-account', 'count' => 1),
'memberOf' => array(
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/Og/ldap_servers.inc b/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/Og/ldap_servers.inc
index e4f20c1..19463f7 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/Og/ldap_servers.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/Og/ldap_servers.inc
@@ -50,6 +50,7 @@ $servers['ldapauthor1']['search_results']['(member=cn=jkool,ou=guest accounts,dc
*/
$servers['ldapauthor1']['users']['cn=jdoe,ou=campus accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=jdoe,ou=campus accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=jdoe,ou=campus accounts,dc=ad,dc=myuniversity,dc=edu'),
'mail' => array( 0 => 'jdoe@myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'jdoe', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -58,6 +59,7 @@ $servers['ldapauthor1']['users']['cn=jdoe,ou=campus accounts,dc=ad,dc=myuniversi
$servers['ldapauthor1']['users']['cn=jkool,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=jkool,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=jkool,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu'),
'mail' => array( 0 => 'jkool@guests.myuniversity.edu', 'count' => 1),
'mailcode' => array( 0 => '17', 'count' => 1),
'sAMAccountName' => array( 0 => 'jkool', 'count' => 1),
@@ -68,6 +70,7 @@ $servers['ldapauthor1']['users']['cn=jkool,ou=guest accounts,dc=ad,dc=myuniversi
// duplicate of previous with escaped commas in cn.
$servers['ldapauthor1']['users']['cn=Flintstone\, Wilma,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=Flintstone\, Wilma,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=Flintstone\, Wilma,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu'),
'mail' => array( 0 => 'wilmaf@guests.myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'wilmaf', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -81,6 +84,7 @@ $servers['ldapauthor1']['users']['cn=Flintstone\, Wilma,ou=guest accounts,dc=ad,
// duplicate of previous with quoted cn.
$servers['ldapauthor1']['users']['cn=Rubble\, Barney,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=Rubble\, Barney,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=Rubble\, Barney,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu'),
'mail' => array( 0 => 'barneyr@guests.myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'barneyr', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -94,6 +98,7 @@ $servers['ldapauthor1']['users']['cn=Rubble\, Barney,ou=guest accounts,dc=ad,dc=
$servers['ldapauthor1']['users']['cn=unkool,ou=lost,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=unkool,ou=lost,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=unkool,ou=lost,dc=ad,dc=myuniversity,dc=edu'),
'mail' => array( 0 => 'unkool@nowhere.myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'jkool', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -102,6 +107,7 @@ $servers['ldapauthor1']['users']['cn=unkool,ou=lost,dc=ad,dc=myuniversity,dc=edu
$servers['ldapauthor1']['users']['cn=verykool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=verykool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=verykool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu'),
'mail' => array( 0 => 'verykool@myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'verykool', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -117,6 +123,7 @@ $servers['ldapauthor1']['users']['cn=verykool,ou=special guests,ou=guest account
$servers['ldapauthor1']['users']['cn=newkool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=newkool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=newkool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu'),
'mail' => array( 0 => 'newkool@guests.myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'newkool', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -125,6 +132,7 @@ $servers['ldapauthor1']['users']['cn=newkool,ou=special guests,ou=guest accounts
$servers['ldapauthor1']['users']['cn=joeprogrammer,ou=it,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=joeprogrammer,ou=it,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=joeprogrammer,ou=it,dc=ad,dc=myuniversity,dc=edu'),
'mail' => array( 0 => 'joeprogrammer@myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'joeprogrammer', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -147,27 +155,32 @@ $servers['ldapauthor1']['users']['cn=joeprogrammer,ou=it,dc=ad,dc=myuniversity,d
*/
$servers['ldapauthor1']['groups']['cn=sysadmins,ou=it,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=sysadmins,ou=it,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=sysadmins,ou=it,dc=ad,dc=myuniversity,dc=edu'),
'memberOf' => array( 0 => 'cn=it,ou=it,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
);
$servers['ldapauthor1']['groups']['cn=developers,ou=it,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=developers,ou=it,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=developers,ou=it,dc=ad,dc=myuniversity,dc=edu'),
'memberOf' => array( 0 => 'cn=it,ou=it,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
);
$servers['ldapauthor1']['groups']['cn=it,ou=it,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=it,ou=it,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=it,ou=it,dc=ad,dc=myuniversity,dc=edu'),
'memberOf' => array( 0 => 'cn=staff,ou=people,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'memberOf' => array( 0 => 'cn=sysadmins,ou=it,dc=ad,dc=myuniversity,dc=edu', 'count' => 1), // bogus recursion to test bogus recursion
);
$servers['ldapauthor1']['groups']['cn=staff,ou=people,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=staff,ou=people,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=staff,ou=people,dc=ad,dc=myuniversity,dc=edu'),
'memberOf' => array( 0 => 'cn=people,ou=it,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
);
$servers['ldapauthor1']['groups']['cn=people,ou=it,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=people,ou=it,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=people,ou=it,dc=ad,dc=myuniversity,dc=edu'),
'memberOf' => array('count' => 0),
);
@@ -227,6 +240,7 @@ $servers['ldapauthor1']['search_results']['(|((dn=cn=staff,ou=people,dc=ad,dc=my
*/
$servers['ldapauthor1']['users']['cn=service-account,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=service-account,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=people,cn=groups,dc=ad,dc=myuniversity,dc=edu'),
'mail' => array( 0 => 'service-account@myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'service-account', 'count' => 1),
'memberOf' => array(
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/Other/ldap_servers.inc b/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/Other/ldap_servers.inc
index e4f20c1..ac40759 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/Other/ldap_servers.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/ldap/ldap_authorization/tests/Other/ldap_servers.inc
@@ -50,6 +50,7 @@ $servers['ldapauthor1']['search_results']['(member=cn=jkool,ou=guest accounts,dc
*/
$servers['ldapauthor1']['users']['cn=jdoe,ou=campus accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=jdoe,ou=campus accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=jdoe,ou=campus accounts,dc=ad,dc=myuniversity,dc=edu'),
'mail' => array( 0 => 'jdoe@myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'jdoe', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -58,6 +59,7 @@ $servers['ldapauthor1']['users']['cn=jdoe,ou=campus accounts,dc=ad,dc=myuniversi
$servers['ldapauthor1']['users']['cn=jkool,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=jkool,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=jkool,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu'),
'mail' => array( 0 => 'jkool@guests.myuniversity.edu', 'count' => 1),
'mailcode' => array( 0 => '17', 'count' => 1),
'sAMAccountName' => array( 0 => 'jkool', 'count' => 1),
@@ -68,6 +70,7 @@ $servers['ldapauthor1']['users']['cn=jkool,ou=guest accounts,dc=ad,dc=myuniversi
// duplicate of previous with escaped commas in cn.
$servers['ldapauthor1']['users']['cn=Flintstone\, Wilma,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=Flintstone\, Wilma,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=Flintstone\, Wilma,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu'),
'mail' => array( 0 => 'wilmaf@guests.myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'wilmaf', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -81,6 +84,7 @@ $servers['ldapauthor1']['users']['cn=Flintstone\, Wilma,ou=guest accounts,dc=ad,
// duplicate of previous with quoted cn.
$servers['ldapauthor1']['users']['cn=Rubble\, Barney,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=Rubble\, Barney,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=Rubble\, Barney,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu'),
'mail' => array( 0 => 'barneyr@guests.myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'barneyr', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -94,6 +98,7 @@ $servers['ldapauthor1']['users']['cn=Rubble\, Barney,ou=guest accounts,dc=ad,dc=
$servers['ldapauthor1']['users']['cn=unkool,ou=lost,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=unkool,ou=lost,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=unkool,ou=lost,dc=ad,dc=myuniversity,dc=edu'),
'mail' => array( 0 => 'unkool@nowhere.myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'jkool', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -102,6 +107,7 @@ $servers['ldapauthor1']['users']['cn=unkool,ou=lost,dc=ad,dc=myuniversity,dc=edu
$servers['ldapauthor1']['users']['cn=verykool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=verykool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=verykool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu'),
'mail' => array( 0 => 'verykool@myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'verykool', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -117,6 +123,7 @@ $servers['ldapauthor1']['users']['cn=verykool,ou=special guests,ou=guest account
$servers['ldapauthor1']['users']['cn=newkool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=newkool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=newkool,ou=special guests,ou=guest accounts,dc=ad,dc=myuniversity,dc=edu'),
'mail' => array( 0 => 'newkool@guests.myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'newkool', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -125,6 +132,7 @@ $servers['ldapauthor1']['users']['cn=newkool,ou=special guests,ou=guest accounts
$servers['ldapauthor1']['users']['cn=joeprogrammer,ou=it,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=joeprogrammer,ou=it,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=joeprogrammer,ou=it,dc=ad,dc=myuniversity,dc=edu'),
'mail' => array( 0 => 'joeprogrammer@myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'joeprogrammer', 'count' => 1),
'password' => array( 0 => 'goodpwd', 'count' => 1),
@@ -147,27 +155,32 @@ $servers['ldapauthor1']['users']['cn=joeprogrammer,ou=it,dc=ad,dc=myuniversity,d
*/
$servers['ldapauthor1']['groups']['cn=sysadmins,ou=it,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=sysadmins,ou=it,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=sysadmins,ou=it,dc=ad,dc=myuniversity,dc=edu'),
'memberOf' => array( 0 => 'cn=it,ou=it,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
);
$servers['ldapauthor1']['groups']['cn=developers,ou=it,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=developers,ou=it,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=developers,ou=it,dc=ad,dc=myuniversity,dc=edu'),
'memberOf' => array( 0 => 'cn=it,ou=it,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
);
$servers['ldapauthor1']['groups']['cn=it,ou=it,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=it,ou=it,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=it,ou=it,dc=ad,dc=myuniversity,dc=edu'),
'memberOf' => array( 0 => 'cn=staff,ou=people,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
'memberOf' => array( 0 => 'cn=sysadmins,ou=it,dc=ad,dc=myuniversity,dc=edu', 'count' => 1), // bogus recursion to test bogus recursion
);
$servers['ldapauthor1']['groups']['cn=staff,ou=people,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=staff,ou=people,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=staff,ou=people,dc=ad,dc=myuniversity,dc=edu'),
'memberOf' => array( 0 => 'cn=people,ou=it,dc=ad,dc=myuniversity,dc=edu', 'count' => 1),
);
$servers['ldapauthor1']['groups']['cn=people,ou=it,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=people,ou=it,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=people,ou=it,dc=ad,dc=myuniversity,dc=edu'),
'memberOf' => array('count' => 0),
);
@@ -227,6 +240,7 @@ $servers['ldapauthor1']['search_results']['(|((dn=cn=staff,ou=people,dc=ad,dc=my
*/
$servers['ldapauthor1']['users']['cn=service-account,dc=ad,dc=myuniversity,dc=edu']['attr'] = array(
'dn' => 'cn=service-account,dc=ad,dc=myuniversity,dc=edu',
+ 'distinguishedname' => array( 0 => 'cn=service-account,dc=ad,dc=myuniversity,dc=edu'),
'mail' => array( 0 => 'service-account@myuniversity.edu', 'count' => 1),
'sAMAccountName' => array( 0 => 'service-account', 'count' => 1),
'memberOf' => array(