Better control logic for keyfile warning.

Author: delbonis

lnutil/keyfile.go

@@ -61,11 +61,12 @@ func LoadKeyFromFileArg(filename string, pass []byte) (*[32]byte, error) {
 
 	if len(enckey) == 32 { // UNencrypted key, length 32
 		v, p := os.LookupEnv("LIT_KEYFILE_WARN")
-		if !p || v != "0" {
+		if !p || (p && v != "0") {
 			logging.Warnf("WARNING!! Key file not encrypted!!\n")
 			logging.Warnf("Anyone who can read the key file can take everything!\n")
 			logging.Warnf("You should start over and use a good passphrase!\n")
 		}
+
 		copy(priv32[:], enckey[:])
 		return priv32, nil
 	}

test/testlib.py

@@ -97,7 +97,9 @@ def start(self):
             "--noautolisten"
         ]
         penv = os.environ.copy()
-        penv['LIT_KEYFILE_WARN'] = '0'
+        lkw = 'LIT_KEYFILE_WARN'
+        if lkw not in penv:
+            penv[lkw] = '0'
         self.proc = subprocess.Popen(args,
             stdin=subprocess.DEVNULL,
             stdout=outputredir,