From 7eba962c381746f5d97199c5d092a2f0e3634e64 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Tue, 1 Apr 2008 23:36:06 +0000 Subject: Fix and simplify fingerprint verification code git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4468 ce84e21b-d406-0410-9b95-82705330c041 --- src/sbin/bcfg2 | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/sbin') diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2 index 2ca7ef92f..472eab795 100755 --- a/src/sbin/bcfg2 +++ b/src/sbin/bcfg2 @@ -39,14 +39,12 @@ class FPProxyCall(object): self.method = getattr(self.proxy.proxy, method) def __call__(self, *args): - while self.proxy.no_fingerprint or self.proxy.fingerprints: - try: - return self.method(*args) - except Bcfg2.tlslite.errors.TLSFingerprintError: - self.proxy.proxy = self.proxy.get_proxy() - self.method = getattr(self.proxy.proxy, self.method_name) - logger.error("Ran out of valid fingerprints; shutting down") - raise SystemExit(1) + try: + return self.method(*args) + except Bcfg2.tlslite.errors.TLSFingerprintError: + self.proxy.proxy = self.proxy.get_proxy() + self.method = getattr(self.proxy.proxy, self.method_name) + return self.__call__(*args) class FPProxy(object): def __init__(self, url, user, password, fingerprints): -- cgit v1.2.3-1-g7c22