diff options
| author | Sandro Santilli <strk@kbt.io> | 2016-11-07 21:58:22 +0100 |
|---|---|---|
| committer | Andrey Nering <andrey.nering@gmail.com> | 2016-11-07 18:58:22 -0200 |
| commit | 864d1b1f9f6a72589d77ec0f08b21c476b8e13d4 (patch) | |
| tree | ce425602ac6e31e6b7d4bc65e9591849e9ec96f9 /modules/auth/ldap | |
| parent | c8c748aea6a864c5cf8a2235d15f413188c0a22d (diff) | |
| download | gitea-864d1b1f9f6a72589d77ec0f08b21c476b8e13d4.tar.gz gitea-864d1b1f9f6a72589d77ec0f08b21c476b8e13d4.zip | |
Fix type in unused constant name (#111)
* Write LDAP, SMTP, PAM, DLDAP back to all uppercase
* Fix type in unused constant name
* Other MixCased fixes
* Complete MixerCasing of template constants
* Re uppercase LTS and LDAPS suffixes
* Uppercase JSON suffix in constant names
* Proper case LoginNoType
* Prefix unexported template path constants with "tpl"
Diffstat (limited to 'modules/auth/ldap')
| -rw-r--r-- | modules/auth/ldap/ldap.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modules/auth/ldap/ldap.go b/modules/auth/ldap/ldap.go index 361ca5817f..116feecc8b 100644 --- a/modules/auth/ldap/ldap.go +++ b/modules/auth/ldap/ldap.go @@ -21,8 +21,8 @@ type SecurityProtocol int // Note: new type must be added at the end of list to maintain compatibility. const ( SecurityProtocolUnencrypted SecurityProtocol = iota - SecurityProtocolLdaps - SecurityProtocolStartTls + SecurityProtocolLDAPS + SecurityProtocolStartTLS ) // Basic LDAP authentication service @@ -118,7 +118,7 @@ func dial(ls *Source) (*ldap.Conn, error) { ServerName: ls.Host, InsecureSkipVerify: ls.SkipVerify, } - if ls.SecurityProtocol == SecurityProtocolLdaps { + if ls.SecurityProtocol == SecurityProtocolLDAPS { return ldap.DialTLS("tcp", fmt.Sprintf("%s:%d", ls.Host, ls.Port), tlsCfg) } @@ -127,7 +127,7 @@ func dial(ls *Source) (*ldap.Conn, error) { return nil, fmt.Errorf("Dial: %v", err) } - if ls.SecurityProtocol == SecurityProtocolStartTls { + if ls.SecurityProtocol == SecurityProtocolStartTLS { if err = conn.StartTLS(tlsCfg); err != nil { conn.Close() return nil, fmt.Errorf("StartTLS: %v", err) |