From be954bc9b9bcb0c4b4abba091217c62623665b27 Mon Sep 17 00:00:00 2001
From: gojomo <gojomo@daa5b2f2-a927-0410-8b2d-f5f262fa301a>
Date: Thu, 22 Jul 2010 22:55:56 +0000
Subject: [PATCH] [HER-1804] H3: avoid echoing admin credentials to (possibly
 world-readable) _out log * Heritrix.java     replace echo of exact login/pw
 with note about whether it came from cmd-line or @file

---
 engine/src/main/java/org/archive/crawler/Heritrix.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/engine/src/main/java/org/archive/crawler/Heritrix.java b/engine/src/main/java/org/archive/crawler/Heritrix.java
index 0c863460..54341129 100644
--- a/engine/src/main/java/org/archive/crawler/Heritrix.java
+++ b/engine/src/main/java/org/archive/crawler/Heritrix.java
@@ -240,8 +240,8 @@ public class Heritrix {
         String keyPassword;
         File properties = getDefaultPropertiesFile();
 
+        String aOption = cl.getOptionValue('a');
         if (cl.hasOption('a')) {
-            String aOption = cl.getOptionValue('a');
             String usernameColonPassword = aOption; 
             try {
                 if(aOption.startsWith("@")) {
@@ -345,8 +345,8 @@ public class Heritrix {
             guard.setNext(new EngineApplication(engine));
             component.start();
             startupOut.println("engine listening at port "+port);
-            startupOut.println("operator login is '"+authLogin
-                               +"' password '"+authPassword+"'");
+            startupOut.println("operator login set per " +
+                    ((aOption.startsWith("@")) ? "file "+aOption : "command-line"));
             if(authPassword.length()<8 || authPassword.matches("[a-zA-Z]{0,10}")
                     ||authPassword.matches("\\d{0,10}")) {
                 startupOut.println(