diff options
| author | George Goldberg <george@gberg.me> | 2018-03-19 10:53:37 +0000 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-03-19 10:53:37 +0000 |
| commit | 37f0e5e0ebc0595efe2c65ffb84fa096dc8c5493 (patch) | |
| tree | 4b791b279109a10a66b62aaeeeae3d5243d2961b /cmd | |
| parent | fadcdd271a68b38571b75d1d38ab023f940ac83a (diff) | |
| parent | 4b675b347b5241def7807fab5e01ce9b98531815 (diff) | |
| download | chat-37f0e5e0ebc0595efe2c65ffb84fa096dc8c5493.tar.gz chat-37f0e5e0ebc0595efe2c65ffb84fa096dc8c5493.tar.bz2 chat-37f0e5e0ebc0595efe2c65ffb84fa096dc8c5493.zip | |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/commands/user.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/commands/user.go b/cmd/commands/user.go index a8b7341b2..fe4d34a48 100644 --- a/cmd/commands/user.go +++ b/cmd/commands/user.go @@ -553,7 +553,7 @@ func migrateAuthToLdapCmdF(command *cobra.Command, args []string) error { } fromAuth := args[0] - matchField := args[1] + matchField := args[2] if len(fromAuth) == 0 || (fromAuth != "email" && fromAuth != "gitlab" && fromAuth != "saml") { return errors.New("Invalid from_auth argument") @@ -594,7 +594,7 @@ func migrateAuthToSamlCmdF(command *cobra.Command, args []string) error { matchesFile := "" matches := map[string]string{} if !autoFlag { - matchesFile = args[1] + matchesFile = args[2] file, e := ioutil.ReadFile(matchesFile) if e != nil { |