From 59489cd85721d264021a8fb4ec5a3b777d2d8b04 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Tue, 28 Jun 2005 21:17:47 +0000 Subject: 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 --- src/lib/Server/Generators/SSHbase.py | 7 ++++--- 1 file 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 -- cgit v1.2.3-1-g7c22