[X2Go-Commits] [x2goserver] 20/33: x2goserver/bin/x2gostartagent: fix hostname detection.

[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 c59ec73b573c0cc1677c7257060716654c5a2d7f
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Jan 7 02:35:38 2018 +0100

    x2goserver/bin/x2gostartagent: fix hostname detection.
    
    Only error out if the hostname call actually failed, not the other way
    around.
    
    Cherry-picked from release/4.0.1.x branch.
---
 debian/changelog              | 2 ++
 x2goserver/bin/x2gostartagent | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 55854d1..47d8724 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -315,6 +315,8 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium
       rely on it returning a valid value and try at most 10 times to fetch a
       usable port value, then error out and make the session startup or
       resumption fail.
+    - x2goserver/bin/x2gostartagent: fix hostname detection. Only error out if
+      the hostname call actually failed, not the other way around.
   * 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 c209044..5263fb7 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -71,7 +71,7 @@ fi
 # Workaround: use hostname.
 typeset current_host_name=""
 
-if current_host_name="$(hostname)"; then
+if ! current_host_name="$(hostname)"; then
 	typeset msg="Unable to retrieve machine's hostname. This is required. Aborting session startup."
 	"${X2GO_LIB_PATH}/x2gosyslog" "${0}" "err" "${msg}"
 

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