From 862a9fc80cbc64dac7658c77623dbface304fc81 Mon Sep 17 00:00:00 2001
From: YuleiLan <yllan@aibee.com>
Date: Wed, 26 Aug 2020 14:30:21 +0800
Subject: [PATCH] fix bug.

---
 config/settings.dev.yml | 3 +--
 config/settings.yml     | 3 +--
 pkg/ldap/search.go      | 8 +-------
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/config/settings.dev.yml b/config/settings.dev.yml
index 58fa2dc..dbeeaf3 100644
--- a/config/settings.dev.yml
+++ b/config/settings.dev.yml
@@ -37,8 +37,7 @@ settings:
     anonymousquery: 0
     basedn: dc=fdevops,dc=com
     bindpwd: 123456
-    binduser: admin
-    bindbasedn:
+    binduserdn: admin
     host: localhost
     port: 389
     tls: 0
diff --git a/config/settings.yml b/config/settings.yml
index a3a941b..9004d6e 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -41,8 +41,7 @@ settings:
     anonymousquery: 0
     basedn: dc=fdevops,dc=com
     bindpwd: 123456
-    binduser: admin
-    bindbasedn:
+    binduserdn: admin
     host: localhost
     port: 389
     tls: 0
diff --git a/pkg/ldap/search.go b/pkg/ldap/search.go
index 2d26985..368c56c 100644
--- a/pkg/ldap/search.go
+++ b/pkg/ldap/search.go
@@ -54,14 +54,8 @@ func searchRequest(username string) (userInfo *ldap.Entry, err error) {
 	}
 	// 用来获取查询权限的用户。如果 ldap 禁止了匿名查询，那我们就需要先用这个帐户 bind 以下才能开始查询
 	if !viper.GetBool("settings.ldap.anonymousQuery") {
-		dn := viper.GetString("settings.ldap.baseDn")
-		if viper.GetString("settings.ldap.bindBaseDn") != "" {
-			dn = viper.GetString("settings.ldap.bindBaseDn")
-		}
 		err = conn.Bind(
-			fmt.Sprintf("cn=%v,%v",
-				viper.GetString("settings.ldap.bindUser"),
-				dn),
+			viper.GetString("settings.ldap.bindUserDn"),
 			viper.GetString("settings.ldap.bindPwd"))
 		if err != nil {
 			logger.Error("用户或密码错误。", err)