diff -u -p httpauth/httpauth.module httpauth.new/httpauth.module --- httpauth/httpauth.module 2008-10-23 00:54:38.000000000 -0700 +++ httpauth.new/httpauth.module 2009-09-25 23:26:18.000000000 -0700 @@ -138,6 +138,18 @@ function httpauth_boot() { return; } + // Allow authentication via LDAP + drupal_load('module', 'ldapauth'); + if (function_exists('ldapauth_authenticate')) { + require_once('includes/common.inc'); + require_once('includes/unicode.inc'); + require_once('includes/form.inc'); + drupal_load('module', 'user'); + require_once(drupal_get_path('module', 'ldapauth') .'/includes/LDAPInterface.inc'); + $form_state = array('values' => array('name' => $name, 'pass' => $pass)); + ldapauth_authenticate($form_state['values']); + } + require_once('includes/form.inc'); drupal_load('module', 'user'); if (user_is_blocked($name) || drupal_is_denied('user', $name)) {