Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Remove lookup check during alias removal #5524

Merged
merged 3 commits into from
Oct 18, 2018
Merged

Remove lookup check during alias removal #5524

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b85e637
Possible fix for 5348
vishalnayak Oct 16, 2018
d8cc759
Fix compilation
vishalnayak Oct 16, 2018
f71717f
Merge branch 'master' into fix-5348
vishalnayak Oct 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions vault/identity_store_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1072,14 +1072,7 @@ func (i *IdentityStore) deleteAliasesInEntityInTxn(txn *memdb.Txn, entity *ident
// Remove identity indices from aliases table for those that needs to
// be removed
for _, alias := range removeList {
aliasToBeRemoved, err := i.MemDBAliasByIDInTxn(txn, alias.ID, false, false)
if err != nil {
return err
}
if aliasToBeRemoved == nil {
return fmt.Errorf("alias was not indexed")
}
err = i.MemDBDeleteAliasByIDInTxn(txn, aliasToBeRemoved.ID, false)
err := i.MemDBDeleteAliasByIDInTxn(txn, alias.ID, false)
if err != nil {
return err
}
Expand Down