diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-04-25 08:10:37 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-04-25 08:10:37 -0400 |
| commit | 1ed010e2af5df7544dc316984736159de0c8a8ec (patch) | |
| tree | 3461deeb3911fccd6b72ddb5dfbffa668faaa29f | |
| parent | d510e918e41b7b2b7b0b9351a40eab2794b49c83 (diff) | |
| parent | 772255701d76f3f0865386b2ae1e9ae2cf14d2a9 (diff) | |
| download | bcfg2-1ed010e2af5df7544dc316984736159de0c8a8ec.tar.gz bcfg2-1ed010e2af5df7544dc316984736159de0c8a8ec.tar.bz2 bcfg2-1ed010e2af5df7544dc316984736159de0c8a8ec.zip | |
Merge pull request #166 from cbrinker/master
Default to only (En|De)crypt vars that need it
| -rwxr-xr-x | src/lib/Bcfg2/Server/Encryption.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Encryption.py b/src/lib/Bcfg2/Server/Encryption.py index f7f636659..b60302871 100755 --- a/src/lib/Bcfg2/Server/Encryption.py +++ b/src/lib/Bcfg2/Server/Encryption.py @@ -372,7 +372,7 @@ class CfgDecryptor(Decryptor): class PropertiesCryptoMixin(object): """ Mixin to provide some common methods for Properties crypto """ - default_xpath = '//*' + default_xpath = '//*[@encrypted]' def _get_elements(self, xdata): """ Get the list of elements to encrypt or decrypt """ @@ -460,7 +460,6 @@ class PropertiesEncryptor(Encryptor, PropertiesCryptoMixin): class PropertiesDecryptor(Decryptor, PropertiesCryptoMixin): """ decryptor class for Properties files """ - default_xpath = '//*[@encrypted]' def decrypt(self): decrypted_any = False |