[X2Go-Commits] [x2goserver] 31/33: x2goserver/bin/x2gostartagent: check and adapt exit codes.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2goserver.

commit c72c70412d8e362f94e773a1f756e078319b3dfb
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Jan 9 05:56:51 2018 +0100

    x2goserver/bin/x2gostartagent: check and adapt exit codes.
    
    Cherry-picked from release/4.0.1.x branch.
---
 debian/changelog              | 1 +
 x2goserver/bin/x2gostartagent | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1d3ab00..3ecc274 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -339,6 +339,7 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium
     - x2goserver/bin/x2goresume-session: actually check if the old port values
       have been refurbished within the system and reassign them.
     - x2goserver/bin/x2goresume-ression: whitespace fix only.
+    - x2goserver/bin/x2gostartagent: check and adapt exit codes.
   * x2goserver.spec:
     - RPMify x2goserver-xsession description.
     - Remove qt4 stuff, we're not using the framework here.
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index bcf38be..9e659a1 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -190,7 +190,7 @@ LWORD="$(awk '{print $1}' <<< "${LIMIT}")"
 if [[ "${LWORD}" = 'LIMIT' ]]; then
 	echo "${LIMIT}" >&2
 	"${X2GO_LIB_PATH}/x2gosyslog" "${0}" 'err' "session limit has been reached for user "'"'"${USER}"'"'", cannot start new session"
-	exit '10'
+	exit '9'
 fi
 
 export NX_CLIENT="${X2GO_LIB_PATH}/x2gosuspend-agent"
@@ -261,7 +261,7 @@ if [[ "${output}" != 'inserted' ]]; then
 
 	# Make x2goclient fail.
 	echo "${msg}" >&2
-	exit '11'
+	exit '10'
 fi
 
 if [[ "${X2GO_TELEKINESIS_ENABLED}" = '0' ]] || [[ "${X2GO_STYPE}" = 'S' ]] || ! type -p 'telekinesis-server' 1>'/dev/null'; then
@@ -295,7 +295,7 @@ while [[ -z "${GR_PORT}" ]] || [[ -z "${SOUND_PORT}" ]] || [[ -z "${FS_PORT}" ]]
 
 		# Make x2goclient fail.
 		echo "${msg}" >&2
-		exit '12'
+		exit '11'
 	fi
 
 	if [[ -z "${GR_PORT}" ]]; then
@@ -482,7 +482,7 @@ else
 	# run x2goserver-extensions for fail-start
 	x2gofeature 'X2GO_RUN_EXTENSIONS' &>'/dev/null' && x2goserver-run-extensions "${SESSION_NAME}" 'fail-start' || true
 
-	exit '13'
+	exit '12'
 fi
 
 echo "${X2GO_PORT}"

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