diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2014-05-15 20:58:20 +0800 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2014-05-15 20:58:20 +0800 |
| commit | 4f042d12bd0cd45a47b3d7347112e685801d3bef (patch) | |
| tree | 556d84b5860efc1e4ea77573e11422bb4f2c413f /modules/base/conf.go | |
| parent | 839a9bb054618c7f3b04dae0b4f5b5b0fbcf1ee2 (diff) | |
| parent | 7869cfccb9ddf08069312c1e456908055d863e96 (diff) | |
Merge branch 'dev' of github.com:gogits/gogs into dev
Diffstat (limited to 'modules/base/conf.go')
| -rw-r--r-- | modules/base/conf.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/base/conf.go b/modules/base/conf.go index c38d3357..03e453e6 100644 --- a/modules/base/conf.go +++ b/modules/base/conf.go @@ -200,11 +200,12 @@ func newLdapService() { ldapname := Cfg.MustValue(v, "name", v) ldaphost := Cfg.MustValue(v, "host") ldapport := Cfg.MustInt(v, "port", 389) + ldapusessl := Cfg.MustBool(v, "usessl", false) ldapbasedn := Cfg.MustValue(v, "basedn", "dc=*,dc=*") ldapattribute := Cfg.MustValue(v, "attribute", "mail") ldapfilter := Cfg.MustValue(v, "filter", "(*)") ldapmsadsaformat := Cfg.MustValue(v, "MSADSAFORMAT", "%s") - ldap.AddSource(ldapname, ldaphost, ldapport, ldapbasedn, ldapattribute, ldapfilter, ldapmsadsaformat) + ldap.AddSource(ldapname, ldaphost, ldapport, ldapusessl, ldapbasedn, ldapattribute, ldapfilter, ldapmsadsaformat) nbsrc++ log.Debug("%s added as LDAP source", ldapname) } |