diff options
author | Narayan Desai <desai@mcs.anl.gov> | 2008-06-27 17:14:54 +0000 |
---|---|---|
committer | Narayan Desai <desai@mcs.anl.gov> | 2008-06-27 17:14:54 +0000 |
commit | 477603f8f0680f40781559ec1cee8f85c2d76913 (patch) | |
tree | a2ec974f0d81a398395ff5eeff282ef07fd31365 /src/lib/Server | |
parent | 70e36603fae55888a30e2d5b9176e4b13d987ae3 (diff) | |
download | bcfg2-477603f8f0680f40781559ec1cee8f85c2d76913.tar.gz bcfg2-477603f8f0680f40781559ec1cee8f85c2d76913.tar.bz2 bcfg2-477603f8f0680f40781559ec1cee8f85c2d76913.zip |
Fixup combination of XINclude and Alias fixes
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4727 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server')
-rw-r--r-- | src/lib/Server/Plugins/Metadata.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/lib/Server/Plugins/Metadata.py b/src/lib/Server/Plugins/Metadata.py index a5084e0d3..084873471 100644 --- a/src/lib/Server/Plugins/Metadata.py +++ b/src/lib/Server/Plugins/Metadata.py @@ -246,14 +246,9 @@ class Metadata(Bcfg2.Server.Plugin.MetadataPlugin, if profile not in self.public: self.logger.error("Failed to set client %s to private group %s" % (client, profile)) raise MetadataConsistencyError - # resolve aliases - for node in self.clients: - for child in node: - if child.tag == "Alias" and child.attrib["name"] == client: - client = node.attrib["name"] if self.clients.has_key(client): self.logger.info("Changing %s group from %s to %s" % (client, self.clients[client], profile)) - cli = self.clientdata.xpath('.//Clients/Client[@name="%s"]' % (client)) + cli = self.clientdata.xpath('.//Client[@name="%s"]' % (client)) cli[0].set('profile', profile) else: if self.session_cache.has_key(addresspair): @@ -341,7 +336,10 @@ class Metadata(Bcfg2.Server.Plugin.MetadataPlugin, raise MetadataConsistencyError return self.addresses[address][0] try: - return socket.gethostbyaddr(address)[0].lower() + cname = socket.gethostbyaddr(address)[0].lower() + if cname in self.aliases: + return self.aliases[cname] + return cname except socket.herror: warning = "address resolution error for %s" % (address) self.logger.warning(warning) |