[X2Go-Commits] x2goserver.git - build-baikal (branch) updated: 3.1.1.3-4-ga35b196
X2Go dev team
git-admin at x2go.org
Wed Dec 4 06:22:12 CET 2013
The branch, build-baikal has been updated
via a35b196a82b523f24430b6977c61bc8d702f9d93 (commit)
from ead0462ea08a768e361aad48ebc0fb913c5c826d (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:
x2goserver/bin/x2gosessionlimit | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/bin/x2gosessionlimit
index 7167d5a..91f747b 100755
--- a/x2goserver/bin/x2gosessionlimit
+++ b/x2goserver/bin/x2gosessionlimit
@@ -33,7 +33,7 @@ setlogmask( LOG_UPTO(x2gologlevel()) );
syslog('info', "x2gosessionlimit has been called");
-my $maxlimit=0;
+my $maxlimit=-1;
my $Config = new Config::Simple(syntax=>'ini');
$Config->read('/etc/x2go/x2goserver.conf' );
@@ -69,11 +69,13 @@ if($strlimit ne "")
if ($strlimit == 0)
{
print "0\n";
+ closelog;
exit 0;
}
if ($scount < $strlimit)
{
print "$strlimit\n";
+ closelog;
exit 0;
}
print "LIMIT\n";
@@ -99,12 +101,20 @@ while (my ($name, $passwd, $gid, $members) = getgrent())
}
}
+
if ($scount < $maxlimit)
{
print "$maxlimit\n";
+ closelog;
+ exit 0;
+}
+
+if ($maxlimit != -1) {
+ print "LIMIT\n";
+ closelog;
exit 0;
}
-print "LIMIT\n";
# closing syslog
closelog;
+
hooks/post-receive
--
x2goserver.git (X2Go Server)
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 "x2goserver.git" (X2Go Server).
More information about the x2go-commits
mailing list