add_ldap_logic 02
Merge branch 'add_ldap_logic' into login