[X2go-Commits] x2goserver.git - backport-lenny (branch) updated: 3.1.1.3-17-g1053d03

[X2Go dev team]

The branch, backport-lenny has been updated
       via  1053d03e9f9b85f30f1fe3e92cc29205844386f5 (commit)
       via  e9f57e21a81a397fa59d4e3d2c26af1dc9c396cc (commit)
       via  7c1f13528d6f6b373e192bbfa411274ac0a75561 (commit)
      from  81fcf0e6d2604e6465222e3305014b7e4377b777 (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 1053d03e9f9b85f30f1fe3e92cc29205844386f5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 19 16:35:47 2012 +0200

    release second lenny backport of 3.1.1.3

commit e9f57e21a81a397fa59d4e3d2c26af1dc9c396cc
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jul 13 17:06:04 2012 +0200

    Fix x2gosessionlimit script.
    
    Conflicts (resolved by Mike Gabriel):
    
    	debian/changelog

commit 7c1f13528d6f6b373e192bbfa411274ac0a75561
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 19 16:32:07 2012 +0200

    /debian/control: Fix x2goagent dependency.
    
    Conflicts (Resolved by Mike Gabriel):
    
    	debian/changelog

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

Summary of changes:
 debian/changelog                |   11 ++++++++++-
 debian/control                  |    2 +-
 x2goserver/bin/x2gosessionlimit |   10 +++++-----
 3 files changed, 16 insertions(+), 7 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 5b60e03..d51f833 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,13 @@
-x2goserver (3.1.1.3-0~x2go+bpo+lenny1) UNRELEASED; urgency=low
+x2goserver (3.1.1.3-0~x2go+bpo+lenny2) unstable; urgency=low
+
+  * Cherry-picks from upcoming version 3.1.1.4:
+    - Fix x2gosessionlimit script.
+  * /debian/control:
+    + Fix x2goagent dependency.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 19 Jul 2012 16:35:22 +0200
+
+x2goserver (3.1.1.3-0~x2go+bpo+lenny1) unstable; urgency=low
 
   * Backport current status of x2goserver (unreleased 3.1.1.3) to
     Debian lenny.
diff --git a/debian/control b/debian/control
index 48958a5..6d75646 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Architecture: any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
- x2goagent (>= 2:3.5.0.12),
+ x2goagent (>= 2:3.5.0.12-0~),
  lsof,
  openssh-client,
  openssh-server,
diff --git a/x2goserver/bin/x2gosessionlimit b/x2goserver/bin/x2gosessionlimit
index 0287fc4..7167d5a 100755
--- a/x2goserver/bin/x2gosessionlimit
+++ b/x2goserver/bin/x2gosessionlimit
@@ -71,12 +71,12 @@ if($strlimit ne "")
 		print "0\n";
 		exit 0;
 	}
-	if ($strlimit <= $scount)
+	if ($scount < $strlimit)
 	{
 		print "$strlimit\n";
 		exit 0;
 	}
-	print "$strlimit\n";
+	print "LIMIT\n";
 	exit 0;
 }
 
@@ -99,12 +99,12 @@ while (my ($name, $passwd, $gid, $members)  = getgrent())
 	}
 }
 
-if ($maxlimit <= $scount)
+if ($scount < $maxlimit)
 {
 	print "$maxlimit\n";
 	exit 0;
 }
-print "$maxlimit\n";
+print "LIMIT\n";
 
 # closing syslog 
-closelog;
\ No newline at end of file
+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).