This is an automated email from the ASF dual-hosted git repository.
rob pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git
commit 95a6afc73ce58a18f20d8b7168919a53d2da0cba
Author: Dylan Volz <dylan_v...@comcast.com>
AuthorDate: Wed May 23 09:24:04 2018 -0600
fix ldap path to load ldap.conf instead of cdn.conf
---
traffic_ops/traffic_ops_golang/config/config.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/traffic_ops/traffic_ops_golang/config/config.go
b/traffic_ops/traffic_ops_golang/config/config.go
index 17248cf..25f2188 100644
--- a/traffic_ops/traffic_ops_golang/config/config.go
+++ b/traffic_ops/traffic_ops_golang/config/config.go
@@ -171,7 +171,7 @@ func LoadConfig(cdnConfPath string, dbConfPath string,
riakConfPath string, appV
}
} else { // ldap config location not specified in cdn.conf, check in
directory with cdn.conf for backwards compatibility with perl.
confDir := filepath.Dir(cdnConfPath)
- genericLDAPConfPath := filepath.Join(confDir, "cdn.conf")
+ genericLDAPConfPath := filepath.Join(confDir, "ldap.conf")
if _, err := os.Stat(genericLDAPConfPath); !os.IsNotExist(err)
{ // ldap.conf exists and we should error if it is not readable/parseable.
cfg.LDAPEnabled, cfg.ConfigLDAP, err =
GetLDAPConfig(genericLDAPConfPath)
if err != nil { // no config or unparseable, do not
enable LDAP
--
To stop receiving notification emails like this one, please contact
r...@apache.org.
