Further improvements and fixes.

servers/SMTP.py

@@ -1,3 +1,19 @@
+#!/usr/bin/env python
+# This file is part of Responder
+# Original work by Laurent Gaffie - Trustwave Holdings
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import os
 import settings
 
@@ -27,12 +43,11 @@ class ESMTP(BaseRequestHandler):
 
 					if data:
 						Password = b64decode(data[:len(data)-2])
-						Outfile = os.path.join(settings.Config.ResponderPATH, 'logs', "SMTP-Clear-Text-Password-%s.txt" % self.client_address[0])
-						WriteData(Outfile,Username+":"+Password, Username+":"+Password)
 
 						print text("[SMTP] Address  : %s" % color(self.client_address[0], 3, 0))
 						print text("[SMTP] Username : %s" % color(Username, 3, 0))
 						print text("[SMTP] Password : %s" % color(Password, 3, 0))
+						WriteData(settings.Config.SMTPClearLog % self.client_address[0], Username+":"+Password, Username+":"+Password)
 
 						## FIXME: Close connection properly