diff options
author | Narayan Desai <desai@mcs.anl.gov> | 2005-06-28 21:17:47 +0000 |
---|---|---|
committer | Narayan Desai <desai@mcs.anl.gov> | 2005-06-28 21:17:47 +0000 |
commit | 59489cd85721d264021a8fb4ec5a3b777d2d8b04 (patch) | |
tree | a87f13103ebe70854f8baf3eb357cf6bf5802df1 /src/lib/Server/Generators/SSHbase.py | |
parent | a904025f793203e0931d7c6a9fe8e80fd7c4be3c (diff) | |
download | bcfg2-59489cd85721d264021a8fb4ec5a3b777d2d8b04.tar.gz bcfg2-59489cd85721d264021a8fb4ec5a3b777d2d8b04.tar.bz2 bcfg2-59489cd85721d264021a8fb4ec5a3b777d2d8b04.zip |
fix for tg broken dns.
don't use reverse lookups anymore.
(Logical change 1.241)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1002 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Generators/SSHbase.py')
-rw-r--r-- | src/lib/Server/Generators/SSHbase.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/Server/Generators/SSHbase.py b/src/lib/Server/Generators/SSHbase.py index 7777009a5..6d5374645 100644 --- a/src/lib/Server/Generators/SSHbase.py +++ b/src/lib/Server/Generators/SSHbase.py @@ -3,7 +3,7 @@ __revision__ = '$Revision$' from binascii import b2a_base64 from os import rename, system -from socket import gethostbyname, gethostbyaddr, gaierror +from socket import gethostbyname, gaierror from syslog import syslog, LOG_ERR from Bcfg2.Server.Generator import Generator, DirectoryBacked @@ -47,7 +47,7 @@ class SSHbase(Generator): '/etc/ssh/ssh_host_key':self.build_hk, '/etc/ssh/ssh_host_key.pub':self.build_hk}} self.ipcache = {} - self.domains = ['mcs.anl.gov', 'bgl.mcs.anl.gov', 'globus.org'] + self.domains = ['mcs.anl.gov', 'bgl.mcs.anl.gov', 'globus.org', 'uc.teragrid.org'] def get_ipcache_entry(self, client): '''build a cache of dns results''' @@ -57,8 +57,9 @@ class SSHbase(Generator): # need to add entry for domain in self.domains: try: + fqdn = "%s.%s" % (client, domain) ipaddr = gethostbyname("%s.%s" % (client, domain)) - fqdn = gethostbyaddr(ipaddr)[0] + self.ipcache[client] = (ipaddr, fqdn) return (ipaddr, fqdn) except gaierror: continue |