Merge branch 'pending/FixGetUsername' into next

2011-09-19 09:30:05 +02:00 · 2011-09-19 09:30:05 +02:00 · 42c9e04966
commit 42c9e04966
parent f5366343b9 82e47896cf
1 changed files with 1 additions and 1 deletions
--- a/offlineimap/imapserver.py
+++ b/offlineimap/imapserver.py
@ -56,7 +56,7 @@ class IMAPServer:
        self.config = repos.getconfig()
        self.tunnel = repos.getpreauthtunnel()
        self.usessl = repos.getssl()
-        self.username = repos.getuser()
+        self.username = None if self.tunnel else repos.getuser()
        self.password = None
        self.passworderror = None
        self.goodpassword = None