X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=netbank;h=5e7c4742fe87b1bb0154504e2385fd0700aabf2d;hb=a094b3b5d20430beee75635ada3be6b04ae5fb74;hp=4215a3c651670b9ada3ac447b4a3606ac0e21e07;hpb=6532632da3d43e35caabbfb3d925d6a2d8e65fd2;p=fulbank.git

diff --git a/netbank b/netbank
index 4215a3c..5e7c474 100755
--- a/netbank
+++ b/netbank
@@ -59,14 +59,21 @@ def cmd_login(cmd, args):
         sys.exit(1)
     sess = sesstype.create()
     if args[0] == "bankid":
-        if len(args) < 2:
-            sys.stderr.write("usage: login bankid USER-ID\n")
-            sys.exit(1)
-        with auth.ttyconv() as conv:
-            sess.auth_bankid(args[1], conv)
+        authfun = sess.auth_bankid
+    elif args[0] == "token":
+        authfun = sess.auth_token
     else:
         sys.stderr.write("netbank: %s: unknown authentication type\n" % (args[0]))
         sys.exit(1)
+    if len(args) < 2:
+        sys.stderr.write("usage: login bankid USER-ID\n")
+        sys.exit(1)
+    with auth.ttyconv() as conv:
+        try:
+            authfun(args[1], conv)
+        except auth.autherror as err:
+            sys.stderr.write("netbank: authentication failed: %s\n" % err)
+            sys.exit(1)
 commands["login"] = cmd_login
 
 @requiresess