Reserve all keytypes starting with "ssh-" in an accounts file, rather than only ...

Signed-off-by: Daira Hopwood <daira@jacaranda.org>

diff --git a/src/allmydata/frontends/auth.py b/src/allmydata/frontends/auth.py
index 4a874d8d719dedef772714613f04b66ec171c3b4..fa7fd379405bada9ad376623674f905c8b39792c 100644 (file)
--- a/src/allmydata/frontends/auth.py
+++ b/src/allmydata/frontends/auth.py
@@ -33,7 +33,7 @@ class AccountFileChecker:
             if line.startswith("#") or not line:
                 continue
             name, passwd, rest = line.split(None, 2)
-            if passwd in ("ssh-dss", "ssh-rsa"):
+            if passwd.startswith("ssh-"):
                 bits = rest.split()
                 keystring = " ".join([passwd] + bits[:-1])
                 rootcap = bits[-1]