mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2025-08-17 12:07:02 +02:00
Code Issues Projects Releases Wiki Activity

Don't reset the deprecated value yet

Browse Source
This commit is contained in:
vishalnayak 2016-09-28 15:24:19 -04:00
parent 2964c925d3
commit 5c5871ee5a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/credential/approle/path_role.go
View File

@ -906,7 +906,7 @@ func (b *backend) secretIDCommon(s logical.Storage, entryIndex, secretIDHMAC str
} }
if _, ok := d["SecretIDNumUses"]; ok { if _, ok := d["SecretIDNumUses"]; ok {
resp.AddWarning("The field SecretIDNumUses is deprecated and will be removed in a future release") resp.AddWarning("The field SecretIDNumUses is deprecated and will be removed in a future release; refer to secret_id_num_uses instead")
} }
return resp, nil return resp, nil

7
builtin/credential/approle/validation.go
View File

@ -368,10 +368,13 @@ func (b *backend) nonLockedSecretIDStorageEntry(s logical.Storage, roleNameHMAC,
if result.SecretIDNumUses == 0 || if result.SecretIDNumUses == 0 ||
result.SecretIDNumUsesDeprecated < result.SecretIDNumUses { result.SecretIDNumUsesDeprecated < result.SecretIDNumUses {
result.SecretIDNumUses = result.SecretIDNumUsesDeprecated result.SecretIDNumUses = result.SecretIDNumUsesDeprecated
}
result.SecretIDNumUsesDeprecated = 0
persistNeeded = true persistNeeded = true
} }
if result.SecretIDNumUses < result.SecretIDNumUsesDeprecated {
result.SecretIDNumUsesDeprecated = result.SecretIDNumUses
persistNeeded = true
}
}
if persistNeeded { if persistNeeded {
if err := b.nonLockedSetSecretIDStorageEntry(s, roleNameHMAC, secretIDHMAC, &result); err != nil { if err := b.nonLockedSetSecretIDStorageEntry(s, roleNameHMAC, secretIDHMAC, &result); err != nil {