Merge branch '0k-fix-clear-passwd-in-log' into next

This commit is contained in:
Nicolas Sebrecht 2015-11-04 08:02:04 +01:00
commit 55a4ecd6cd
1 changed files with 2 additions and 1 deletions

View File

@ -206,7 +206,8 @@ class IMAPServer:
authz = self.user_identity
NULL = u'\x00'
retval = NULL.join((authz, authc, passwd)).encode('utf-8')
self.ui.debug('imap', '__plainhandler: returning %s' % retval)
logsafe_retval = NULL.join((authz, authc, "(passwd hidden for log)")).encode('utf-8')
self.ui.debug('imap', '__plainhandler: returning %s' % logsafe_retval)
return retval