x2gobroker.git - master (branch) updated: 0.0.2.3-49-g8fdd01b - x2go-commits

2 Oct 2013

The branch, master has been updated
       via  8fdd01bba121b8947da6dd2da8208bc7e9804026 (commit)
      from  84eb4bbf57ac2221c05a1c8284c7490e9231ad81 (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 -----------------------------------------------------------------
commit 8fdd01bba121b8947da6dd2da8208bc7e9804026
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date:   Wed Oct 2 16:46:08 2013 +0200

    Fix the ping task in x2gobroker-agent.pl, process it without checking the given username.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog        |    2 ++
 lib/x2gobroker-agent.pl |   10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

The diff of changes is:

diff --git a/debian/changelog b/debian/changelog
index 1e9ddfb..fb7a240 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,8 @@ x2gobroker (0.0.3.0-0~x2go1) UNRELEASED; urgency=low
     - Report stderr results to the broker log channel (broker.log). This
       allows debugging of X2Go Session Broker Agent via the X2Go Session
       Broker logging instance. (Fixes: #217).
+    - Fix the ping task in x2gobroker-agent.pl, process it without checking the
+      given username.
   * /debian/control:
     + Replace LDAP support with session brokerage support in LONG_DESCRIPTION.
   * /debian/x2gobroker-agent.dirs:
diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl
index 7c80ae4..8c06f96 100755
--- a/lib/x2gobroker-agent.pl
+++ b/lib/x2gobroker-agent.pl
@@ -98,6 +98,12 @@ $ENV{'PATH'} = '/bin:/usr/bin';
 my $username=shift or die;
 my $mode=shift or die;
 
+if($mode eq 'ping')
+{
+	print "OK\n";
+	exit;
+}
+
 my  ($uid, $passwd, $uidNumber, $gidNumber, $quota, $comment, $gcos, $home, $shell, $expire) = getpwnam($username);
 
 if($uidNumber < 1000)
@@ -198,7 +204,3 @@ if($mode eq 'terminatesession')
 	exec ("/bin/su - $uid -c \"\$(x2gopath lib)/x2gochangestatus T $sid\"");
 }
 
-if($mode eq 'ping')
-{
-	print "OK\n";
-}


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).

    