Received: (at submit) by bugs.x2go.org; 10 Jun 2013 15:31:01 +0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on ymir.das-netzwerkteam.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=ham version=3.3.2 X-Greylist: delayed 321 seconds by postgrey-1.34 at ymir; Mon, 10 Jun 2013 17:31:00 CEST Received: from smtp.sara.nl (sara-exch-fe1.ka.sara.nl [145.100.8.49]) by ymir (Postfix) with ESMTPS id 7B3F15DB0A for ; Mon, 10 Jun 2013 17:31:00 +0200 (CEST) Received: from SARA-EXCH-02.ka.sara.nl ([fe80::e5a6:6139:c5f3:8d72]) by sara-exch-fe1.ka.sara.nl ([::1]) with mapi id 14.02.0342.003; Mon, 10 Jun 2013 17:25:39 +0200 From: Lykle Voort To: "submit@bugs.x2go.org" Subject: x2goumount-session syntax errors, code cleanup Thread-Topic: x2goumount-session syntax errors, code cleanup Thread-Index: AQHOZe7C2IXsVOVFs0ShAKh7jzgf2Q== Date: Mon, 10 Jun 2013 15:25:38 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: x-originating-ip: [145.100.6.221] Content-Type: multipart/mixed; boundary="_002_CDDBBC911C91Alyklevoortsurfsaranl_" MIME-Version: 1.0 --_002_CDDBBC911C91Alyklevoortsurfsaranl_ Content-Type: text/plain; charset="us-ascii" Content-ID: <7E263B498889334CA09A1CF8D33F6D19@sara.nl> Content-Transfer-Encoding: quoted-printable Package: x2goserver Version: release 4.0.1.0 The x2go server produces syntax errors when x2goumount-session is run; these errors are visible in the clients. Attached to this bug report is a patch, which solves the problem and is also a code cleanup. --_002_CDDBBC911C91Alyklevoortsurfsaranl_ Content-Type: application/octet-stream; name="x2goumount-session.patch" Content-Description: x2goumount-session.patch Content-Disposition: attachment; filename="x2goumount-session.patch"; size=2229; creation-date="Mon, 10 Jun 2013 15:25:38 GMT"; modification-date="Mon, 10 Jun 2013 15:25:38 GMT" Content-ID: <0DDC85686525D943A50E3EBCD6D910DD@sara.nl> Content-Transfer-Encoding: base64 MTIxYzEyMQ0KPCAJbXkgJHBhdGg9IkBsaW5lWzBdOkBsaW5lWzFdIjsNCi0tLQ0KPiAJbXkgJHBh dGg9IiRsaW5lWzBdOiRsaW5lWzFdIjsNCjEyNGMxMjQNCjwgCQlpZiAoQGxpbmVbMV0gbmUgJG9u bHlfcGF0aCkNCi0tLQ0KPiAJCWlmICgkbGluZVsxXSBuZSAkb25seV9wYXRoKQ0KMTMyYzEzMiwx MzMNCjwgCQkJaWYgKChAbGluZVsxXSBuZSAkb25seV9wYXRoX3dpbmRyaXZlKSAmJiAoQGxpbmVb MV0gbmUgJG9ubHlfcGF0aF91bmNwYXRoKSkNCi0tLQ0KPiAJCQlpZiAoKCRsaW5lWzFdIG5lICRv bmx5X3BhdGhfd2luZHJpdmUpICYmIA0KPiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKCRs aW5lWzFdIG5lICRvbmx5X3BhdGhfdW5jcGF0aCkpDQoxMzdjMTM4DQo8IAkJCWlmIChAbGluZVsx XSBlICRvbmx5X3BhdGhfd2luZHJpdmUpDQotLS0NCj4gCQkJaWYgKCRsaW5lWzFdIGVxICRvbmx5 X3BhdGhfd2luZHJpdmUpDQoxNDFjMTQyDQo8IAkJCWlmIChAbGluZVsxXSBlICRvbmx5X3BhdGhf dW5jcGF0aCkNCi0tLQ0KPiAJCQlpZiAoJGxpbmVbMV0gZXEgJG9ubHlfcGF0aF91bmNwYXRoKQ0K MTUwYzE1MQ0KPCAJZm9yICgkajskajxAbW91bnRzOyRqKyspDQotLS0NCj4gCWZvciAoJGo9MDsk ajxAbW91bnRzOyRqKyspDQoxNTJjMTUzLDE1NQ0KPCAJCWlmIChAbW91bnRzWyRqXT1+bS9zc2hm cy8gJiYgQG1vdW50c1skal09fm0vQGxpbmVbMF0vICYmIEBtb3VudHNbJGpdPX5tL0BsaW5lWzFd LyApDQotLS0NCj4gCQlpZiAoJG1vdW50c1skal09fm0vc3NoZnMvICYmDQo+ICAgICAgICAgICAg ICAgICAgICAgJG1vdW50c1skal09fm0vJGxpbmVbMF0vICYmDQo+ICAgICAgICAgICAgICAgICAg ICAgJG1vdW50c1skal09fm0vJGxpbmVbMV0vICkNCjE1NSwxNTdjMTU4LDE2MA0KPCAJCQlzeXNs b2coJ2RlYnVnJywgImZvdW5kIG1vdW50ZWQgc2hhcmUgQG1vdW50c1skal0iKTsNCjwgCQkJJHJl bW90ZT0oc3BsaXQoIiAiLEBtb3VudHNbJGpdKSlbMF07DQo8IAkJCWdvdG8gYnJlYWs7DQotLS0N Cj4gCQkJc3lzbG9nKCdkZWJ1ZycsICJmb3VuZCBtb3VudGVkIHNoYXJlICRtb3VudHNbJGpdIik7 DQo+IAkJCSRyZW1vdGU9KHNwbGl0KCIgIiwkbW91bnRzWyRqXSkpWzBdOw0KPiAJCQlsYXN0Ow0K MTYwZDE2Mg0KPCBicmVhazoNCjE2M2MxNjUNCjwgCQlpZiAoc3lzdGVtKCAiY2QgJHRtcF9kaXIg JiYgZnVzZXJtb3VudCAtdSBAbGluZVsxXSAmJiBjZCAtID4vZGV2L251bGwiICkgPT0gMCkNCi0t LQ0KPiAJCWlmIChzeXN0ZW0oICJjZCAkdG1wX2RpciAmJiBmdXNlcm1vdW50IC11ICRsaW5lWzFd ICYmIGNkIC0gPi9kZXYvbnVsbCIgKSA9PSAwKQ0KMTY1YzE2Nw0KPCAJCQlzeXNsb2coJ25vdGlj ZScsICJzdWNjZXNzZnVsbHkgdW5tb3VudGVkIEBsaW5lWzFdIik7DQotLS0NCj4gCQkJc3lzbG9n KCdub3RpY2UnLCAic3VjY2Vzc2Z1bGx5IHVubW91bnRlZCAkbGluZVsxXSIpOw0KMTcxYzE3Mw0K PCAJCQlzeXNsb2coJ2VycicsICJFUlJPUjogZmFpbGVkIHRvIHVubW91bnQgQGxpbmVbMV0iKTsN Ci0tLQ0KPiAJCQlzeXNsb2coJ2VycicsICJFUlJPUjogZmFpbGVkIHRvIHVubW91bnQgJGxpbmVb MV0iKTsNCjE3NGMxNzYNCjwgCQkJCXN5c3RlbSgid2hpY2gga2RpYWxvZyAmPi9kZXYvbnVsbCAm JiBrZGlhbG9nIC0tZXJyb3IgXCJFUlJPUiAoWDJHbyk6IEZhaWxlZCB0byB1bm1vdW50IEBsaW5l WzFdXCImIik7DQotLS0NCj4gCQkJCXN5c3RlbSgid2hpY2gga2RpYWxvZyAmPi9kZXYvbnVsbCAm JiBrZGlhbG9nIC0tZXJyb3IgXCJFUlJPUiAoWDJHbyk6IEZhaWxlZCB0byB1bm1vdW50ICRsaW5l WzFdXCImIik7DQoxNzhjMTgwDQo8IAkJCQlzeXN0ZW0oIndoaWNoIHplbml0eSAmPi9kZXYvbnVs bCAmJiB6ZW5pdHkgLS1lcnJvciAtLXRleHQgXCJFUlJPUiAoWDJHbyk6IEZhaWxlZCB0byB1bm1v dW50IEBsaW5lWzFdXCImIik7DQotLS0NCj4gCQkJCXN5c3RlbSgid2hpY2ggemVuaXR5ICY+L2Rl di9udWxsICYmIHplbml0eSAtLWVycm9yIC0tdGV4dCBcIkVSUk9SIChYMkdvKTogRmFpbGVkIHRv IHVubW91bnQgJGxpbmVbMV1cIiYiKTsNCjIzNCwyMzVjMjM2LDIzNw0KPCAJCWRiX2RlbGV0ZW1v dW50ICgkc2Vzc2lvbiwgQGxpbmVbMV0pOw0KPCAJCXJtZGlyIChAbGluZVsxXSk7DQotLS0NCj4g CQlkYl9kZWxldGVtb3VudCAoJHNlc3Npb24sICRsaW5lWzFdKTsNCj4gCQlybWRpciAoJGxpbmVb MV0pOw0K --_002_CDDBBC911C91Alyklevoortsurfsaranl_--