From 23a4340a1981dd7e56c4a3e0f98027362294ddd3 Mon Sep 17 00:00:00 2001 From: hc-github-team-secure-vault-core <82990506+hc-github-team-secure-vault-core@users.noreply.github.com> Date: Tue, 15 Aug 2023 11:39:50 -0400 Subject: [PATCH] backport of commit a5b3b3d6b5ed9b912f8b837822e94155e161e0f8 (#22339) Co-authored-by: Ellie --- changelog/22330.txt | 3 +++ go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 changelog/22330.txt diff --git a/changelog/22330.txt b/changelog/22330.txt new file mode 100644 index 000000000..427fe398a --- /dev/null +++ b/changelog/22330.txt @@ -0,0 +1,3 @@ +```release-note:bug +secrets/ldap: Fix bug causing schema and password_policy to be overwritten in config. +``` \ No newline at end of file diff --git a/go.mod b/go.mod index 1998245c9..98a7d593b 100644 --- a/go.mod +++ b/go.mod @@ -146,7 +146,7 @@ require ( github.com/hashicorp/vault-plugin-secrets-kubernetes v0.5.0 github.com/hashicorp/vault-plugin-secrets-kv v0.15.0 github.com/hashicorp/vault-plugin-secrets-mongodbatlas v0.10.0 - github.com/hashicorp/vault-plugin-secrets-openldap v0.11.0 + github.com/hashicorp/vault-plugin-secrets-openldap v0.11.1 github.com/hashicorp/vault-plugin-secrets-terraform v0.7.1 github.com/hashicorp/vault-testing-stepwise v0.1.3 github.com/hashicorp/vault/api v1.9.2 diff --git a/go.sum b/go.sum index 290cf6cbf..b0448fe6e 100644 --- a/go.sum +++ b/go.sum @@ -1913,8 +1913,8 @@ github.com/hashicorp/vault-plugin-secrets-kv v0.15.0 h1:S2d1t4m4ilDNJRdMUzNUimvy github.com/hashicorp/vault-plugin-secrets-kv v0.15.0/go.mod h1:xu/eiT+BB2b2Gh/AZFJ1xCS8E7S29gOQcuh9VMxros8= github.com/hashicorp/vault-plugin-secrets-mongodbatlas v0.10.0 h1:FB860wKclwLBvBHkQb5nq8bGMUAsuw0khrYT1RM0NR0= github.com/hashicorp/vault-plugin-secrets-mongodbatlas v0.10.0/go.mod h1:6YPhFm57C3DvPueHEGdTLK94g3gZI/gdiRrSwO5Fym8= -github.com/hashicorp/vault-plugin-secrets-openldap v0.11.0 h1:8J8u7uWLifj3uF5tot9Qj74H8vEwPMNKN+XTLLgSmDw= -github.com/hashicorp/vault-plugin-secrets-openldap v0.11.0/go.mod h1:JVulYJNiG7s3pjwo9HAnq07ViWtGWkz2WAw8ytle+0w= +github.com/hashicorp/vault-plugin-secrets-openldap v0.11.1 h1:8TI1l3Dt1pdkPPDG/1SyoKbWB/PBc1kHJ/nSD+2jTR4= +github.com/hashicorp/vault-plugin-secrets-openldap v0.11.1/go.mod h1:aeTnHAsh580Kml5O+kyn9g0ywE5f7EQXkXFeraMF08A= github.com/hashicorp/vault-plugin-secrets-terraform v0.7.1 h1:Icb3EDpNvb4ltnGff2Zrm3JVNDDdbbL2wdA2LouD2KQ= github.com/hashicorp/vault-plugin-secrets-terraform v0.7.1/go.mod h1:JHHo1nWOgYPsbTqE/PVwkTKRkLSlPSqo9RBqZ7NLKB8= github.com/hashicorp/vault-testing-stepwise v0.1.3 h1:GYvm98EB4nUKUntkBcLicnKsebeV89KPHmAGJUCPU/c=