fix 2016.3.7 release notes merge conflict

This commit is contained in:
Ch3LL 2017-10-10 10:55:18 -04:00
parent 63da1214db
commit 9a00302cd8
No known key found for this signature in database
GPG key ID: 132B55A7C13EFA73

View file

@ -13,4 +13,3 @@ Security Fix
CVE-2017-12791 Maliciously crafted minion IDs can cause unwanted directory traversals on the Salt-master
Correct a flaw in minion id validation which could allow certain minions to authenticate to a master despite not having the correct credentials. To exploit the vulnerability, an attacker must create a salt-minion with an ID containing characters that will cause a directory traversal. Credit for discovering the security flaw goes to: Vernhk@qq.com