bin/firefox_decrypt.py

diff --git a/bin/firefox_decrypt.py b/bin/firefox_decrypt.py
index f9e9932419ddbd354003a6de734a6e84ec35a9cf..4895d72c00a92a7a803bcdcee1f3acb4231088c8 100755 (executable)
--- a/bin/firefox_decrypt.py
+++ b/bin/firefox_decrypt.py
@@ -334,7 +334,7 @@ class NSSInteraction(object):
                 else:
                     to_export[address.netloc][user] = passw
 
-            else:
+            elif 0:
                 output = (
                     u"\nWebsite:   {0}\n".format(host),
                     u"Username: '{0}'\n".format(user),
@@ -345,6 +345,11 @@ class NSSInteraction(object):
                         sys.stdout.write(line)
                     else:
                         sys.stdout.write(line.encode("utf8"))
+            else:
+                # Other out format - NB 26.07.16
+                if user and password:
+                  user = user+':'
+                sys.stdout.write(host+"\t"+user+password+"\n")
 
         credentials.done()
         self.NSS.NSS_Shutdown()