[X2Go-Commits] [x2goclient] 57/94: explicit logon failure after 3 attempts

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to annotated tag 0.1.4.0
in repository x2goclient.

commit 004f5fcb3c8a29815e55daec1db204bedfaa0d25
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue May 17 10:22:34 2011 +0200

    explicit logon failure after 3 attempts
---
 pyhoca/cli/frontend.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py
index 564f7872..f1b87ec5 100644
--- a/pyhoca/cli/frontend.py
+++ b/pyhoca/cli/frontend.py
@@ -253,7 +253,6 @@ class PyHocaCLI(x2go.X2goClient):
 
             _auth_count = 4
             while not connected and _auth_count:
-                _auth_count -= 1
                 try:
                     self._X2goClient__connect_session(self.x2go_session_hash, username=_username, password=self.args.password, force_password_auth=force_password_auth)
                     connected = True
@@ -278,6 +277,11 @@ class PyHocaCLI(x2go.X2goClient):
                 except KeyboardInterrupt:
                     self._runtime_error('Authentication cancelled by user by hitting Ctrl-C at password prompt.', exitcode=-200)
 
+                _auth_count -= 1
+
+                if not _auth_count:
+                    self._runtime_error('Authentication failed, too many failures during interactive login.', exitcode=-200)
+
         except socket.error, e:
             self._runtime_error('a socket error occured while establishing the connection: %s' % str(e), exitcode=-245)
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git