From a1e0a5f5850cc505563fbe06427083e7862bd67d Mon Sep 17 00:00:00 2001
From: Vincent Massaro <vincent.massaro@yale.edu>
Date: Mon, 25 Jul 2016 16:24:18 -0400
Subject: [PATCH 1/2] Revert "Issue #1994850.  Fix for no context when mapping
 drupal username to existing ldap entry"

This reverts commit f09b2acaeadcf891fe0559cc08b319882ac7283e.
---
 ldap_servers/LdapServer.class.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ldap_servers/LdapServer.class.php b/ldap_servers/LdapServer.class.php
index 1fa9f37..9d98c2d 100644
--- a/ldap_servers/LdapServer.class.php
+++ b/ldap_servers/LdapServer.class.php
@@ -1195,18 +1195,18 @@ class LdapServer {
    */
   function userUserNameToExistingLdapEntry($drupal_user_name, $ldap_context = NULL) {
 
-    if (!$ldap_context) {
-      $ldap_context = 'all';
-    }
-
     $watchdog_tokens = array('%drupal_user_name' => $drupal_user_name);
     $ldap_username = $this->userUsernameToLdapNameTransform($drupal_user_name, $watchdog_tokens);
     if (!$ldap_username) {
       return FALSE;
     }
-
-    $attribute_maps = ldap_servers_attributes_needed($this->sid, $ldap_context);
-    $attributes = array_keys($attribute_maps);
+    if (!$ldap_context) {
+      $attributes = array();
+    }
+    else {
+      $attribute_maps = ldap_servers_attributes_needed($this->sid, $ldap_context);
+      $attributes = array_keys($attribute_maps);
+    }
 
     foreach ($this->basedn as $basedn) {
       if (empty($basedn)) continue;
-- 
2.9.2


From 092d1dccdaea372309c9e98bffe281e12ea58a8e Mon Sep 17 00:00:00 2001
From: Vincent Massaro <vincent.massaro@yale.edu>
Date: Mon, 25 Jul 2016 16:24:39 -0400
Subject: [PATCH 2/2] Revert "Issue #1994850.  Part 2. Fix for no context when
 mapping drupal username to existing ldap entry"

This reverts commit 1e56d1fafb86d5202a5c96569e8aeea7026801e6.
---
 ldap_user/ldap_user.module | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ldap_user/ldap_user.module b/ldap_user/ldap_user.module
index c1ac634..5cb65cb 100644
--- a/ldap_user/ldap_user.module
+++ b/ldap_user/ldap_user.module
@@ -225,7 +225,6 @@ function ldap_user_ldap_attributes_needed_alter(&$attributes, $params) {
       case 'ldap_user_insert_drupal_user':
       case 'ldap_user_update_drupal_user':
       case 'ldap_user_ldap_associate':
-      case 'all':
         $attributes[$ldap_server->user_attr] = ldap_servers_set_attribute_map(@$attributes[$ldap_server->user_attr]); // array($ldap_server->user_attr, 0, NULL);
         $attributes[$ldap_server->mail_attr] = ldap_servers_set_attribute_map(@$attributes[$ldap_server->mail_attr]);
         $attributes[$ldap_server->picture_attr] = ldap_servers_set_attribute_map(@$attributes[$ldap_server->picture_attr]);
-- 
2.9.2