[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.0.5-16-g82844d7

[X2Go dev team]

The branch, build-main has been updated
       via  82844d78ad379d8d3e90cdcb1c0808dd7995a045 (commit)
      from  0d33c73d2733c7e7d11d1aa262caa25014a1d523 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 x2gobroker/web/plain.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/x2gobroker/web/plain.py b/x2gobroker/web/plain.py
index aae3ffe..001f4b5 100644
--- a/x2gobroker/web/plain.py
+++ b/x2gobroker/web/plain.py
@@ -80,8 +80,8 @@ class X2GoBrokerWeb:
         except AttributeError: username = ''
         try: password = data.password
         except AttributeError: password = ''
-        try: authid = data.authid
-        except AttributeError: authid = ''
+        try: cookie = data.cookie
+        except AttributeError: cookie = ''
         try: task = data.task
         except AttributeError: task = ''
         try: profile_id = data.sid
@@ -93,13 +93,13 @@ class X2GoBrokerWeb:
         self._gen_http_header()
 
         logger_broker.debug ('username: {username}, password: {password}, task: {task}, profile_id: {profile_id}'.format(username=username, password='XXXXX', task=task, profile_id=profile_id))
-        if broker_backend.check_access(username=username, password=password, authid=authid):
+        if broker_backend.check_access(username=username, password=password, cookie=cookie):
 
             ###
             ### CONFIRM SUCCESSFUL AUTHENTICATION FIRST
             ###
 
-            if global_config['use-authid']:
+            if global_config['use-cookie-auth']:
 
                 ### FIXME: make up a nice protocol for this, disabled for now
                 #output += "AUTHID: {authid}<br />".format(authid=broker_backend.get_next_authid(username=data.user))


hooks/post-receive
-- 
x2gobroker.git (HTTP(S) Session broker for X2Go)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).