@@ -172,0 +176,4 @@
+dependencies = [
+ "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",

@@ -243,0 +268,4 @@
+            user_name_attr,
+            mail_attr,
+        })
+    } else if addr.is_some() && base_dn.is_some() {

@@ -243,0 +269,4 @@
+            mail_attr,
+        })
+    } else if addr.is_some() && base_dn.is_some() {
+        panic!("Invalid LDAP configuration : both LDAP_ADDR and LDAP_BASE_DN must be set")

@@ -300,0 +300,4 @@
+            let bind = ldap_conn
+                .simple_bind(&ldap_name, password)
+                .map_err(|_| Error::NotFound)?;
+            if bind.success().is_ok() {

@@ -300,0 +333,4 @@
+                Err(Error::NotFound)
+            }
+        } else {
+            Err(Error::NotFound)

@@ -300,0 +358,4 @@
+        }
+    }
+
+    pub fn login(conn: &Connection, ident: &str, password: &str) -> Result<User> {

@@ -300,0 +361,4 @@
+    pub fn login(conn: &Connection, ident: &str, password: &str) -> Result<User> {
+        let local_id = Instance::get_local()?.id;
+        let user = User::find_by_email(conn, ident)
+            .or_else(|_| User::find_by_name(conn, ident, local_id))

@@ -300,0 +362,4 @@
+        let local_id = Instance::get_local()?.id;
+        let user = User::find_by_email(conn, ident)
+            .or_else(|_| User::find_by_name(conn, ident, local_id))
+            .and_then(|u| {