Merge pull request #4926 from akallabeth/primary_order_checks
authorMartin Fleisz <martin.fleisz@thincast.com>
Wed, 17 Oct 2018 14:02:28 +0000 (16:02 +0200)
committerGitHub <noreply@github.com>
Wed, 17 Oct 2018 14:02:28 +0000 (16:02 +0200)
Order data validation and correction

1  2 
client/X11/xf_client.c
client/common/cmdline.c

Simple merge
@@@ -1754,12 -1742,16 +1754,16 @@@ int freerdp_client_settings_parse_comma
                }
                CommandLineSwitchCase(arg, "admin")
                {
 -                      settings->ConsoleSession = TRUE;
 +                      settings->ConsoleSession = enable;
                }
+               CommandLineSwitchCase(arg, "relax-order-checks")
+               {
+                       settings->AllowUnanouncedOrdersFromServer = arg->Value;
+               }
                CommandLineSwitchCase(arg, "restricted-admin")
                {
 -                      settings->ConsoleSession = TRUE;
 -                      settings->RestrictedAdminModeRequired = TRUE;
 +                      settings->ConsoleSession = enable;
 +                      settings->RestrictedAdminModeRequired = enable;
                }
                CommandLineSwitchCase(arg, "pth")
                {