LDAP authentication with Active Directory using both e-mail and username maps to same user in 4.7

pablobm,
In this thread - http://drupal.org/node/55361 - I added to someones request about email addresses and usernames to both be able to login with 4.7 as well as 4.6. After a lot of work, I now have a patch file that allows NTLM\username or NTLM/username or username@domain.tld to all map to username in the drupal database. External Drupal authentication still seems to work, it still creates accounts as it should upon first use, maps the user to the correct group roles, etc. I also made a change allowing only the "mapped roles" in conf.php to be imported into the drupal database, as we have 57 billion groups in our LDAP and only 3 that drupal needs to know about (less taxing on the access page). All these features are checkbox selectable from the settings menu (which I modified fairly heavily).
I also made a change that breaks things as you currently have them, but I think is worthwhile. In the first three lines in ldap_integration.module (the only file I changed) I check where the module is located with a drupal_get_path() then use that to import the LDAPInterface.php and conf.php files. I have it set so that all the files are in the same directory. This means that I had to re-package the files in your tarball (attached) to all be in the ldap_integration directory, and gives a good place to put the documentation files you include. Obviously that change can easily be reversed if you don't like it, but I think it helps to keep things organized better - you could even put the ldap files in (drupal base directory)/modules/contrib/ldap_integration as the guys on lullabot.com suggest on podcast 9. Having said all this, I don't know if I did this all "correctly", but it works for me. I am only able to test against a Microsoft Active Directory, so I am not sure what would happen with others. Since I clean up the input right in the form validation part, and almost all of my changes can put stepped around by unchecking the options, I think it should work fine, but I haven't tested.... Hope it helps! - liveoutloud2day