diff options
| author | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-03-12 16:47:55 -0400 |
|---|---|---|
| committer | Derrick Anderson <derrick@andersonwebstudio.com> | 2018-03-12 16:47:55 -0400 |
| commit | 0d1177cdf9058a033ae7c714162245f696df1b4d (patch) | |
| tree | 2cae0ded6b25e9942372a42ab83a0d41cdc23112 /cmd | |
| parent | f2d26801b9647715fb43af873354d8def753868b (diff) | |
| parent | 2b460da1d54944c5c16ef15e966843b00f06aa63 (diff) | |
| download | chat-0d1177cdf9058a033ae7c714162245f696df1b4d.tar.gz chat-0d1177cdf9058a033ae7c714162245f696df1b4d.tar.bz2 chat-0d1177cdf9058a033ae7c714162245f696df1b4d.zip | |
Merge remote-tracking branch 'origin/release-4.8' into t3mergetomaster
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 { |