Merge 59abe5e into 8b37601

choppsv1 · Dec 7, 2017 · ae9313d · ae9313d
2 parents 8b37601 + 59abe5e
commit ae9313d
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/netconf/server.py b/netconf/server.py
@@ -119,14 +119,16 @@ def get_allowed_auths (self, username):
             users = [ username ]
         else:
             users = self.users
-        allowed = []
+        allowed = ""
         if username in users:
             if self.pam:
-                allowed.append("password")
+                allowed += "password"
 
             if self.get_user_auth_keys(username):
+		if allowed != "":
+			allowed += ","
                 allowed.append("publickey")
-        logger.debug("Allowed methods for user %s: %s", str(username), str(allowed))
+        logger.debug("Allowed methods for user %s: %s", str(username), allowed)
         return allowed
 
     def check_auth_none (self, unused_username):
@@ -165,7 +167,7 @@ def __init__ (self, username=None, password=None):
         self.event = threading.Event()
 
     def get_allowed_auths (self, unused_username):
-        return ["password"]
+        return "password"
 
     def check_auth_none (self, unused_username):
         return ssh.AUTH_FAILED