Fix and simplify fingerprint verification code

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4468 ce84e21b-d406-0410-9b95-82705330c041

1 files changed, 6 insertions, 8 deletions

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):