summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Jerome <solj@ices.utexas.edu>2009-12-02 15:20:21 +0000
committerSol Jerome <solj@ices.utexas.edu>2009-12-02 15:20:21 +0000
commitc4d22d73ab13d138af2c8ef80d45fc07c26ab7bb (patch)
treedade068f25725c19f69cdbd31afebd305a280a62
parent2f66846dfa5dcd6f3aaeb79ae50ddce3a357d87b (diff)
downloadbcfg2-c4d22d73ab13d138af2c8ef80d45fc07c26ab7bb.tar.gz
bcfg2-c4d22d73ab13d138af2c8ef80d45fc07c26ab7bb.tar.bz2
bcfg2-c4d22d73ab13d138af2c8ef80d45fc07c26ab7bb.zip
Revert "Metadata: cache session information for all clients that aren't address resolved"
This reverts commit [5592]. This broke Metadata resolution by causing tracebacks which resulted in communication failure. git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5605 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--src/lib/Server/Plugins/Metadata.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/Server/Plugins/Metadata.py b/src/lib/Server/Plugins/Metadata.py
index 9f851275f..e5b21e3fd 100644
--- a/src/lib/Server/Plugins/Metadata.py
+++ b/src/lib/Server/Plugins/Metadata.py
@@ -686,9 +686,8 @@ class Metadata(Bcfg2.Server.Plugin.Plugin,
self.logger.error("Client %s failed to use client password in secure mode" % \
(address[0]))
return False
-
- if id_method != 'address':
- # populate the session cache
+ # populate the session cache
+ if user != 'root':
self.session_cache[address] = (time.time(), user)
return True