[X2Go-Commits] [x2goserver] 20/99: X2Go/Server/Agent/NX/Options.pm: make sure that intermediates never include undef entries.

[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 f71c26442ac4699f7062848688a4e62942175d50
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Nov 7 07:48:42 2020 +0100

    X2Go/Server/Agent/NX/Options.pm: make sure that intermediates never include undef entries.
---
 X2Go/Server/Agent/NX/Options.pm | 4 ++--
 debian/changelog                | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/X2Go/Server/Agent/NX/Options.pm b/X2Go/Server/Agent/NX/Options.pm
index 9af66113..67cbb343 100644
--- a/X2Go/Server/Agent/NX/Options.pm
+++ b/X2Go/Server/Agent/NX/Options.pm
@@ -207,7 +207,7 @@ sub intermediate_to_string {
   }
 
   if (!($error_detected)) {
-    if (1 == scalar (@{$options})) {
+    if (0 < scalar (@{$options})) {
       foreach my $entry (@{$options}) {
         if (!defined ($entry)) {
           print {*STDERR} "Invalid options array passed, returning undef.\n";
@@ -534,7 +534,7 @@ sub transform_intermediate {
   }
 
   if (!($error_detected)) {
-    if (1 == scalar (@{$intermediate})) {
+    if (0 < scalar (@{$intermediate})) {
       foreach my $entry (@{$intermediate}) {
         if (!defined ($entry)) {
           print {*STDERR} "Invalid options array passed, erroring out.\n";
diff --git a/debian/changelog b/debian/changelog
index 67120a4b..909ceb86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -218,6 +218,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium
       transform_intermediate to intermediate.
     - X2Go/Server/Agent/NX/Options.pm: document key-value pairs with either
       empty keys or empty (!= non-existent) values.
+    - X2Go/Server/Agent/NX/Options.pm: make sure that intermediates never
+      include undef entries.
   * debian/control:
     + Build-depend upon lsb-release for distro version detection.
   * debian/x2goserver.manpages:

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