[or-cvs] [torflow/master 43/92] Honor default_search_mode even for SSL, just issue a warning if yahoo is used

[mikeperry at torproject.org]

Author: John M. Schanck <john at anomos.info>
Date: Wed, 28 Jul 2010 16:31:39 -0400
Subject: Honor default_search_mode even for SSL, just issue a warning if yahoo is used
Commit: ad826962a6db17bba18a8268b031bb9aa8c251ec

---
 NetworkScanners/ExitAuthority/soat.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/NetworkScanners/ExitAuthority/soat.py b/NetworkScanners/ExitAuthority/soat.py
index 3ca76d1..7f30267 100755
--- a/NetworkScanners/ExitAuthority/soat.py
+++ b/NetworkScanners/ExitAuthority/soat.py
@@ -2125,7 +2125,9 @@ class SearchBasedSSLTest(SearchBasedTest, BaseSSLTest):
     SearchBasedTest.__init__(self, wordlist)
     self.host_only = True
     self.result_protocol = 'https'
-    self.search_mode=google_search_mode
+    if default_search_mode == yahoo_search_mode:
+      plog('WARNING', 'Yahoo search mode is not suitable for SSLTests. Continuing anyway.')
+    self.search_mode=default_search_mode
 
   def depickle_upgrade(self):
     if self._pickle_revision < 7:
-- 
1.7.1