This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 3d3b7566f3c4ccad43c74d9d24be3ab080f5b6bf Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Jan 7 03:54:28 2018 +0100 x2goserver/lib/x2gogetfreeport: use error code 1 for general failure, shift parameter sanitization failure codes up. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 2 ++ x2goserver/lib/x2gogetfreeport | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index d0802ec..8bad925 100644 --- a/debian/changelog +++ b/debian/changelog @@ -325,6 +325,8 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium bash-style checks, more curly braces, terminate options for commands that use outside input (variables), fix copyright notice. - x2goserver/lib/x2gogetfreeport: use single quotes for literal strings. + - x2goserver/lib/x2gogetfreeport: use error code 1 for general failure, + shift parameter sanitization failure codes up. * x2goserver.spec: - RPMify x2goserver-xsession description. - Remove qt4 stuff, we're not using the framework here. diff --git a/x2goserver/lib/x2gogetfreeport b/x2goserver/lib/x2gogetfreeport index bf109e7..705ac61 100755 --- a/x2goserver/lib/x2gogetfreeport +++ b/x2goserver/lib/x2gogetfreeport @@ -36,17 +36,17 @@ typeset end="${4:-'65535'}" # Check parameter sanity. typeset empty_regex='^[[:space:]]*$' if [[ -z "${ss}" ]] || [[ "${ss}" =~ ${empty_regex} ]]; then - exit '1' + exit '2' fi typeset -i start_i="${start}" typeset -i end_i="${end}" if [[ -z "${start}" ]] || [[ "${start}" != "${start_i}" ]] || [[ "${start}" -ne "${start_i}" ]]; then - exit '2' + exit '3' fi if [[ -z "${end}" ]] || [[ "${end}" != "${end_i}" ]] || [[ "${end}" -ne "${end_i}" ]]; then - exit '3' + exit '4' fi -[[ "${type}" != 'lowlevel' ]] && [[ "${type}" != 'display' ]] && exit '4' +[[ "${type}" != 'lowlevel' ]] && [[ "${type}" != 'display' ]] && exit '5' # Skip unnecessary work. -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git