SF.net SVN: safekeep:[736] safekeep/trunk/safekeep

[<di...@us...>]

Revision: 736
          http://safekeep.svn.sourceforge.net/safekeep/?rev=736&view=rev
Author:   dimi
Date:     2011-03-03 15:56:16 +0000 (Thu, 03 Mar 2011)

Log Message:
-----------
Oliver Henshaw <oli...@gm...>
Only check the caller that could be null.

Modified Paths:
--------------
    safekeep/trunk/safekeep

Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep	2010-11-29 05:52:35 UTC (rev 735)
+++ safekeep/trunk/safekeep	2011-03-03 15:56:16 UTC (rev 736)
@@ -1226,6 +1226,7 @@
             authtext = call(cmd)
             if authtext is None:
                 warn('%s: Failed to read the authorized_keys file.' % id)
+                authtext = ''
             auth_keys = parse_authorized_keys(authtext)
             this_keys = parse_authorized_keys(output)
             new_keys = []
@@ -1251,7 +1252,6 @@
 
 # parses authozied_keys, see sshd(8) man page for details
 def parse_authorized_keys(keystext):
-    if not keystext: keystext = ''
     keys = []
     for line in keystext.splitlines():
         line = line.strip()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.