From 59e6abcc11ed3a3548ffb02d1e455485672d8308 Mon Sep 17 00:00:00 2001 From: Wim Date: Sun, 15 May 2016 23:02:30 +0200 Subject: Sync with mattermost 3.0 --- vendor/github.com/mattermost/platform/einterfaces/LICENSE.txt | 4 ++-- vendor/github.com/mattermost/platform/einterfaces/ldap.go | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'vendor/github.com/mattermost/platform/einterfaces') diff --git a/vendor/github.com/mattermost/platform/einterfaces/LICENSE.txt b/vendor/github.com/mattermost/platform/einterfaces/LICENSE.txt index b05ccb40..e5875711 100644 --- a/vendor/github.com/mattermost/platform/einterfaces/LICENSE.txt +++ b/vendor/github.com/mattermost/platform/einterfaces/LICENSE.txt @@ -11,8 +11,8 @@ You may be licensed to use source code to create compiled versions not produced 1. Under the Free Software Foundation’s GNU AGPL v.3.0, subject to the exceptions outlined in this policy; or 2. Under a commercial license available from Mattermost, Inc. by contacting commercial@mattermost.com -You are licensed to use the source code in Admin Tools and Configuration Files (api/templates/, config/, model/, -web/react/utils/, web/static/, web/templates/ and all subdirectories thereof) under the Apache License v2.0. +You are licensed to use the source code in Admin Tools and Configuration Files (templates/, config/, model/, +webapp/client, webapp/fonts, webapp/i18n, webapp/images and all subdirectories thereof) under the Apache License v2.0. We promise that we will not enforce the copyleft provisions in AGPL v3.0 against you if your application (a) does not link to the Mattermost Platform directly, but exclusively uses the Mattermost Admin Tools and Configuration Files, and diff --git a/vendor/github.com/mattermost/platform/einterfaces/ldap.go b/vendor/github.com/mattermost/platform/einterfaces/ldap.go index 1c593832..25d591ce 100644 --- a/vendor/github.com/mattermost/platform/einterfaces/ldap.go +++ b/vendor/github.com/mattermost/platform/einterfaces/ldap.go @@ -8,9 +8,11 @@ import ( ) type LdapInterface interface { - DoLogin(team *model.Team, id string, password string) (*model.User, *model.AppError) + DoLogin(id string, password string) (*model.User, *model.AppError) GetUser(id string) (*model.User, *model.AppError) CheckPassword(id string, password string) *model.AppError + SwitchToLdap(userId, ldapId, ldapPassword string) *model.AppError + ValidateFilter(filter string) *model.AppError } var theLdapInterface LdapInterface -- cgit v1.2.3