commit d1b56733f521a33eb44d0ba86001d8fd40e242af Author: Damian Johnson atagar@torproject.org Date: Thu Apr 5 08:14:09 2012 -0700

Logging rather than raising on unrecognized auth method

Part of the code that I copied from TorCtl raises an IOError when we get an unrecognized auth method (my bad, I wrote it). Changing that in our copy to log a warning instead. Caught by "E" (email subject: SAFECOOKIE) --- src/util/torTools.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/util/torTools.py b/src/util/torTools.py index a4ab70c..d132e28 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -430,7 +430,7 @@ class FixedConnection(TorCtl.Connection): # not of a recognized authentication type (new addition to the # control-spec?)

- raise IOError("Unrecognized authentication type: %s" % authEntry) + log.log(log.WARN, "Unrecognized authentication type: %s" % authEntry) elif entry.startswith("COOKIEFILE="") and entry.endswith("""): # Quoted path of the authentication cookie. This only exists if we're # using cookie auth and, of course, doesn't account for chroot.