| 1 |
commit: c83c31660a642946f55a6c5cc1b998681c28e06c |
| 2 |
Author: Austin English <wizardedit <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 11 21:13:18 2017 +0000 |
| 4 |
Commit: Austin English <wizardedit <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 11 22:22:50 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c83c3166 |
| 7 |
|
| 8 |
app-admin/salt: rebase files/salt-2015.8.13-sanitize-minion-name.patch so it actually applies |
| 9 |
|
| 10 |
app-admin/salt/files/salt-2015.8.13-sanitize-minion-name.patch | 4 ++-- |
| 11 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 12 |
|
| 13 |
diff --git a/app-admin/salt/files/salt-2015.8.13-sanitize-minion-name.patch b/app-admin/salt/files/salt-2015.8.13-sanitize-minion-name.patch |
| 14 |
index 6ede1399072..df9e0f66d00 100644 |
| 15 |
--- a/app-admin/salt/files/salt-2015.8.13-sanitize-minion-name.patch |
| 16 |
+++ b/app-admin/salt/files/salt-2015.8.13-sanitize-minion-name.patch |
| 17 |
@@ -11,7 +11,7 @@ diff --git a/salt/utils/verify.py b/salt/utils/verify.py |
| 18 |
index 5cac0fa651b..a3dc67db336 100644 |
| 19 |
--- a/salt/utils/verify.py |
| 20 |
+++ b/salt/utils/verify.py |
| 21 |
-@@ -480,12 +480,21 @@ def clean_path(root, path, subdir=False): |
| 22 |
+@@ -484,12 +484,21 @@ def clean_path(root, path, subdir=False): |
| 23 |
return '' |
| 24 |
|
| 25 |
|
| 26 |
@@ -31,6 +31,6 @@ index 5cac0fa651b..a3dc67db336 100644 |
| 27 |
try: |
| 28 |
- return bool(clean_path(opts['pki_dir'], id_)) |
| 29 |
+ return bool(clean_path(opts['pki_dir'], id_)) and clean_id(id_) |
| 30 |
- except (AttributeError, KeyError, TypeError) as e: |
| 31 |
+ except (AttributeError, KeyError) as e: |
| 32 |
return False |
Archives