13426 2007-11-14 15:47:29 +0300 netams admintool work with mysql only 2008-07-25 01:16:42 +0400 1 1 4 Development Sisyphus netams unstable all Linux CLOSED FIXED P2 minor --- 1 shader serpiph serpiph qa-sisyphus oldest_to_newest 58174 0 shader 2007-11-14 15:47:29 +0300 Версия 3.4.0rc2-alt2 Admintool позволяет работать только с MySQL Предлагаю патч, позволяющий работать еще и как минимум с PostgreSQL. Исправлены лишь параметры соединения, особенности SQL не правились. Патч следом 58175 1 2267 shader 2007-11-14 15:48:44 +0300 Created attachment 2267 Патч для работы admintool с другими sql db 58196 2 serpiph 2007-11-14 21:40:39 +0300 Хорошо, погляжу что есть что. Спасибо. 58895 3 serpiph 2007-12-02 17:52:54 +0300 Сделал, проверяйте. 58998 4 shader 2007-12-05 09:46:24 +0300 Посмотрел патч, похоже на правду, но пока не проверял 2267 2007-11-14 15:48:44 +0300 2007-11-14 15:48:44 +0300 Патч для работы admintool с другими sql db netams-admin-3.4.0rc2-pg.patch text/plain 13879 shader ZGlmZiAtdU5yIG5ldGFtcy0zLjQuMHJjMi5vcmlnL2NnaS1iaW4vYWN0aXZhdGUuY2dpIG5ldGFt cy0zLjQuMHJjMi9jZ2ktYmluL2FjdGl2YXRlLmNnaQotLS0gbmV0YW1zLTMuNC4wcmMyLm9yaWcv Y2dpLWJpbi9hY3RpdmF0ZS5jZ2kJMjAwNi0wMS0xMyAwMjoxMzoyMyArMDMwMAorKysgbmV0YW1z LTMuNC4wcmMyL2NnaS1iaW4vYWN0aXZhdGUuY2dpCTIwMDctMTEtMTMgMTE6MzI6MDYgKzAzMDAK QEAgLTI0LDcgKzI0LDcgQEAKICgkdGVtMSwkdGVtMik9c3BsaXQgL1hYWFhYWFhYWC8sICR0ZW07 CiAKIGlmICgkY2dpLT5wYXJhbSgnYWN0aW9uJykgZXEgJ2RvJykgewotCSRkYmggPSBEQkktPmNv bm5lY3QoIkRCSTpteXNxbDpkYXRhYmFzZT0kbXlzcWxfZGJuYW1lO2hvc3Q9JG15c3FsX2hvc3Qi LCAkbXlzcWxfbG9naW4sICRteXNxbF9wYXNzd29yZCk7CisJJGRiaCA9IERCSS0+Y29ubmVjdCgi REJJOiRzcWxfdHlwZTpkYXRhYmFzZT0kc3FsX2RibmFtZTtob3N0PSRzcWxfaG9zdCIsICRzcWxf bG9naW4sICRzcWxfcGFzc3dvcmQpOwogCWlmICgkZGJoIGVxICIiKSB7ICRwMS49IjxiPlVuYWJs ZSB0byBjb25uZWN0IHRvIFNRTCBkYXRhYmFzZSE8L2I+PGhyPiI7IH0KIAogCW5ldGFtc19sb2dp bigkc2NfaG9zdCwgJHNjX3BvcnQsICRzY191c2VyLCAkc2NfcGFzc3dkKTsKQEAgLTk5LDcgKzk5 LDcgQEAKIAlpZiAoZGVmaW5lZCAkbG9nX3RvX2V2ZW50cykgewogCQlpZiAoJGxvZ190b19ldmVu dHMgZXEgInllcyIpIHsKIAkJCXVzZSBEQkk7Ci0JCQkkZGJoID0gREJJLT5jb25uZWN0KCJEQkk6 bXlzcWw6ZGF0YWJhc2U9JG15c3FsX2RibmFtZTtob3N0PSRteXNxbF9ob3N0IiwgJG15c3FsX2xv Z2luLCAkbXlzcWxfcGFzc3dvcmQpOworCQkJJGRiaCA9IERCSS0+Y29ubmVjdCgiREJJOiRzcWxf dHlwZTpkYXRhYmFzZT0kc3FsX2RibmFtZTtob3N0PSRzcWxfaG9zdCIsICRzcWxfbG9naW4sICRz cWxfcGFzc3dvcmQpOwogCQkJaWYgKCRkYmggZXEgIiIpIHsgcmV0dXJuOyB9CiAJCQllbHNlIHsg CiAJCQkJJGRiaC0+ZG8oIklOU0VSVCBJTlRPIGV2ZW50cyBWQUxVRVMgKHVuaXhfdGltZXN0YW1w KCksJ0NHSScsICIuaGV4KCRvaWQpLiIsMCwiLmhleCgkb2lkKS4iLFwiJGlwXHQkYWN0aW9uXCIp Iik7IApkaWZmIC11TnIgbmV0YW1zLTMuNC4wcmMyLm9yaWcvY2dpLWJpbi9hZG1pbi9hY2Nlc3Mu Y2dpIG5ldGFtcy0zLjQuMHJjMi9jZ2ktYmluL2FkbWluL2FjY2Vzcy5jZ2kKLS0tIG5ldGFtcy0z LjQuMHJjMi5vcmlnL2NnaS1iaW4vYWRtaW4vYWNjZXNzLmNnaQkyMDA0LTA3LTAyIDE2OjA5OjAx ICswNDAwCisrKyBuZXRhbXMtMy40LjByYzIvY2dpLWJpbi9hZG1pbi9hY2Nlc3MuY2dpCTIwMDct MTEtMTMgMTE6Mzk6NTIgKzAzMDAKQEAgLTEzLDExICsxMywxMSBAQAogCiAJJHRvcHBhbmUgPSAi PGI+QWNjZXNzIFVzZXJzIGFuZCBSaWdodCBNYW5hZ2VtZW50PC9iPiI7CiAKLQkkZGJoID0gREJJ LT5jb25uZWN0KCJEQkk6bXlzcWw6ZGF0YWJhc2U9JG15c3FsX2RibmFtZTtob3N0PSRteXNxbF9o b3N0IiwgJG15c3FsX2xvZ2luLCAkbXlzcWxfcGFzc3dvcmQpOworCSRkYmggPSBEQkktPmNvbm5l Y3QoIkRCSTokc3FsX3R5cGU6ZGF0YWJhc2U9JHNxbF9kYm5hbWU7aG9zdD0kc3FsX2hvc3QiLCAk c3FsX2xvZ2luLCAkc3FsX3Bhc3N3b3JkKTsKICAgICAgICAgaWYgKCRkYmggZXEgIiIpIHsKICAg ICAgICAgICAgICAgICAkcDEuPSI8Yj5VbmFibGUgdG8gY29ubmVjdCB0byBTUUwgcmFkaXVzIGRh dGFiYXNlITwvYj48aHI+IjsgfQogICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgICAgICAkcDEu PSI8Yj5Db25uZWN0ZWQgdG8gZGF0YWJhc2UgJG15c3FsX2RibmFtZTwvYj48aHI+IjsKKyAgICAg ICAgICAgICAgICAkcDEuPSI8Yj5Db25uZWN0ZWQgdG8gZGF0YWJhc2UgJHNxbF9kYm5hbWU8L2I+ PGhyPiI7CiAgICAgICAgIH0KIAogaWYoJGFjdGlvbiBlcSAiZGVsZXRlIikgewpkaWZmIC11TnIg bmV0YW1zLTMuNC4wcmMyLm9yaWcvY2dpLWJpbi9hZG1pbi9jYXJkdG9vbC5jZ2kgbmV0YW1zLTMu NC4wcmMyL2NnaS1iaW4vYWRtaW4vY2FyZHRvb2wuY2dpCi0tLSBuZXRhbXMtMy40LjByYzIub3Jp Zy9jZ2ktYmluL2FkbWluL2NhcmR0b29sLmNnaQkyMDA3LTAyLTE4IDE1OjM5OjIxICswMzAwCisr KyBuZXRhbXMtMy40LjByYzIvY2dpLWJpbi9hZG1pbi9jYXJkdG9vbC5jZ2kJMjAwNy0xMS0xMyAx MTozMzozNyArMDMwMApAQCAtMjYsNyArMjYsNyBAQAogICAgICAgICBOb0FjY2VzcygpOwogfQog Ci0kZGJoID0gREJJLT5jb25uZWN0KCJEQkk6bXlzcWw6ZGF0YWJhc2U9JG15c3FsX2RibmFtZTto b3N0PSRteXNxbF9ob3N0IiwgJG15c3FsX2xvZ2luLCAkbXlzcWxfcGFzc3dvcmQpOworJGRiaCA9 IERCSS0+Y29ubmVjdCgiREJJOiRzcWxfdHlwZTpkYXRhYmFzZT0kc3FsX2RibmFtZTtob3N0PSRz cWxfaG9zdCIsICRzcWxfbG9naW4sICRzcWxfcGFzc3dvcmQpOwogaWYgKCRkYmggZXEgIiIpIHsg JHAxLj0iPGI+VW5hYmxlIHRvIGNvbm5lY3QgdG8gU1FMIGRhdGFiYXNlITwvYj48aHI+IjsgfQog CiAKZGlmZiAtdU5yIG5ldGFtcy0zLjQuMHJjMi5vcmlnL2NnaS1iaW4vYWRtaW4vY29uZmlnLmNn aSBuZXRhbXMtMy40LjByYzIvY2dpLWJpbi9hZG1pbi9jb25maWcuY2dpCi0tLSBuZXRhbXMtMy40 LjByYzIub3JpZy9jZ2ktYmluL2FkbWluL2NvbmZpZy5jZ2kJMjAwNS0xMS0yMiAyMjozNTo1MCAr MDMwMAorKysgbmV0YW1zLTMuNC4wcmMyL2NnaS1iaW4vYWRtaW4vY29uZmlnLmNnaQkyMDA3LTEx LTE0IDE1OjEyOjQ5ICswMzAwCkBAIC03LDcgKzcsMTIgQEAKICRzY19ob3N0PSJsb2NhbGhvc3Qi OyAkc2NfcG9ydD0yMDAwMTsgJHNjX3VzZXI9ImFkbWluIjsgJHNjX3Bhc3N3ZD0iYWFhIjsKIAog I2xvZ2luIHRvIGRhdGFiYXNlCi0kbXlzcWxfaG9zdD0ibG9jYWxob3N0IjsgJG15c3FsX2xvZ2lu PSJyb290IjsgJG15c3FsX3Bhc3N3b3JkPSIiOyAkbXlzcWxfZGJuYW1lPSJuZXRhbXMiOworIyBz cWxfdHlwZSBtYXkgYmUgIm15c3FsIiBhbmQgIlBnIgorJHNxbF90eXBlPSJteXNxbCI7Ciskc3Fs X2hvc3Q9ImxvY2FsaG9zdCI7Ciskc3FsX2xvZ2luPSJyb290IjsKKyRzcWxfcGFzc3dvcmQ9IiI7 Ciskc3FsX2RibmFtZT0ibmV0YW1zIjsKIAogI2VuYWJsZSBvciBkaXNhYmxlIGJpbGxpbmcKICRo YXZlX2JpbGxpbmc9InllcyI7CmRpZmYgLXVOciBuZXRhbXMtMy40LjByYzIub3JpZy9jZ2ktYmlu L2FkbWluL2dyYXBoLmNnaSBuZXRhbXMtMy40LjByYzIvY2dpLWJpbi9hZG1pbi9ncmFwaC5jZ2kK LS0tIG5ldGFtcy0zLjQuMHJjMi5vcmlnL2NnaS1iaW4vYWRtaW4vZ3JhcGguY2dpCTIwMDYtMTAt MTIgMTQ6MjQ6MTUgKzA0MDAKKysrIG5ldGFtcy0zLjQuMHJjMi9jZ2ktYmluL2FkbWluL2dyYXBo LmNnaQkyMDA3LTExLTEzIDExOjM0OjEzICswMzAwCkBAIC00OTYsNyArNDk2LDcgQEAKIAlpZiAo JGhhdmVfYWNjZXNzIG5lICJ5ZXMiKSB7cmV0dXJuIDk7fQogCSR3aGF0ID0gc2hpZnQ7CiAJJHVz ZXIgPSAkRU5We1JFTU9URV9VU0VSfTsKLQkkZGJoID0gREJJLT5jb25uZWN0KCJEQkk6bXlzcWw6 ZGF0YWJhc2U9JG15c3FsX2RibmFtZTtob3N0PSRteXNxbF9ob3N0IiwgJG15c3FsX2xvZ2luLCAk bXlzcWxfcGFzc3dvcmQpOworCSRkYmggPSBEQkktPmNvbm5lY3QoIkRCSTokc3FsX3R5cGU6ZGF0 YWJhc2U9JHNxbF9kYm5hbWU7aG9zdD0kc3FsX2hvc3QiLCAkc3FsX2xvZ2luLCAkc3FsX3Bhc3N3 b3JkKTsKIAkkc3RoID0gJGRiaC0+cHJlcGFyZSgiU0VMRUNUIHJpZ2h0cyBGUk9NICRhY2Nlc3Nk YiBXSEVSRSBsb2dpbj0nJHVzZXInIik7CiAgICAgICAgICRzdGgtPmV4ZWN1dGUoKTsKICAgICAg ICAgQHJpZ2h0cz1zcGxpdCAvLywkc3RoLT5mZXRjaHJvd19hcnJheTsKZGlmZiAtdU5yIG5ldGFt cy0zLjQuMHJjMi5vcmlnL2NnaS1iaW4vYWRtaW4vbW9uaXRvci5jZ2kgbmV0YW1zLTMuNC4wcmMy L2NnaS1iaW4vYWRtaW4vbW9uaXRvci5jZ2kKLS0tIG5ldGFtcy0zLjQuMHJjMi5vcmlnL2NnaS1i aW4vYWRtaW4vbW9uaXRvci5jZ2kJMjAwNi0xMi0yMCAwODo1NTo1OCArMDMwMAorKysgbmV0YW1z LTMuNC4wcmMyL2NnaS1iaW4vYWRtaW4vbW9uaXRvci5jZ2kJMjAwNy0xMS0xMyAxMTozNTowMyAr MDMwMApAQCAtMzI5LDcgKzMyOSw3IEBACiAJJHdoZXJlLj0kd2hlcmUxOwogCSRkZWJ1Zy49JHdo ZXJlMTsKICAgICB9Ci0gICAgJGRiID0gREJJLT5jb25uZWN0KCJEQkk6bXlzcWw6ZGF0YWJhc2U9 Ii4kbXlzcWxfZGJuYW1lLiI7aG9zdD0iLiRteXNxbF9ob3N0LCAkbXlzcWxfbG9naW4sICRteXNx bF9wYXNzd29yZCk7CisgICAgJGRiID0gREJJLT5jb25uZWN0KCJEQkk6JHNxbF90eXBlOmRhdGFi YXNlPSRzcWxfZGJuYW1lO2hvc3Q9JHNxbF9ob3N0IiwgJHNxbF9sb2dpbiwgJHNxbF9wYXNzd29y ZCk7CiAgICAgaWYoJGRiIGVxICIiKSB7IGRpZSAiRXJyb3IgZGF0YWJhc2UgY29ubmVjdGluZy4i OyB9CiAgICAgaWYgKCRhY3Rpb24gZXEgIlJlZnJlc2giIG9yICRhY3Rpb24gZXEgIlJlZnJlc2hf ZGIiKSB7CiAJJHZfcGFyc2VfcHJvdG89MCBpZiAkdl9wYXJzZV9wcm90byBlcSAiIjsKQEAgLTEy NTMsNyArMTI1Myw3IEBACiAJfQogCSR3aGF0ID0gc2hpZnQ7CiAJJHVzZXIgPSAkRU5We1JFTU9U RV9VU0VSfTsKLQkkZGJoID0gREJJLT5jb25uZWN0KCJEQkk6bXlzcWw6ZGF0YWJhc2U9JG15c3Fs X2RibmFtZTtob3N0PSRteXNxbF9ob3N0IiwgJG15c3FsX2xvZ2luLCAkbXlzcWxfcGFzc3dvcmQp OworCSRkYmggPSBEQkktPmNvbm5lY3QoIkRCSTokc3FsX3R5cGU6ZGF0YWJhc2U9JHNxbF9kYm5h bWU7aG9zdD0kc3FsX2hvc3QiLCAkc3FsX2xvZ2luLCAkc3FsX3Bhc3N3b3JkKTsKIAkkc3RoID0g JGRiaC0+cHJlcGFyZSgiU0VMRUNUIHJpZ2h0cyBGUk9NICRhY2Nlc3NkYiBXSEVSRSBsb2dpbj0n JHVzZXInIik7CiAgICAgICAgICRzdGgtPmV4ZWN1dGUoKTsKICAgICAgICAgQHJpZ2h0cz1zcGxp dCAvLywkc3RoLT5mZXRjaHJvd19hcnJheTsKZGlmZiAtdU5yIG5ldGFtcy0zLjQuMHJjMi5vcmln L2NnaS1iaW4vYWRtaW4vbmV0YW1zLmNnaSBuZXRhbXMtMy40LjByYzIvY2dpLWJpbi9hZG1pbi9u ZXRhbXMuY2dpCi0tLSBuZXRhbXMtMy40LjByYzIub3JpZy9jZ2ktYmluL2FkbWluL25ldGFtcy5j Z2kJMjAwNy0wNS0xMyAxNzozMDo1MCArMDQwMAorKysgbmV0YW1zLTMuNC4wcmMyL2NnaS1iaW4v YWRtaW4vbmV0YW1zLmNnaQkyMDA3LTExLTE0IDEwOjU0OjI1ICswMzAwCkBAIC05MSw3ICs5MSw3 IEBACiAJaWYgKGRlZmluZWQgJGxvZ190b19ldmVudHMpIHsKIAkJaWYgKCRsb2dfdG9fZXZlbnRz IGVxICJ5ZXMiKSB7CiAJCQl1c2UgREJJOwotCQkJJGRiaCA9IERCSS0+Y29ubmVjdCgiREJJOm15 c3FsOmRhdGFiYXNlPSRteXNxbF9kYm5hbWU7aG9zdD0kbXlzcWxfaG9zdCIsICRteXNxbF9sb2dp biwgJG15c3FsX3Bhc3N3b3JkKTsKKwkJCSRkYmggPSBEQkktPmNvbm5lY3QoIkRCSTokc3FsX3R5 cGU6ZGF0YWJhc2U9JHNxbF9kYm5hbWU7aG9zdD0kc3FsX2hvc3QiLCAkc3FsX2xvZ2luLCAkc3Fs X3Bhc3N3b3JkKTsKIAkJCWlmICgkZGJoIGVxICIiKSB7IHJldHVybjsgfQogCQkJZWxzZSB7CiAJ CQkJJGRiaC0+ZG8oIklOU0VSVCBJTlRPIGV2ZW50cyBWQUxVRVMgKHVuaXhfdGltZXN0YW1wKCks J0NHSScsICIuaGV4KCRvaWQpLiIsMCwiLmhleCgkb2lkKS4iLFwiJGlwXHQkYWN0aW9uXCIpIik7 CkBAIC0xMjIsNyArMTIyLDcgQEAKIAl1c2UgREJJOwogCSR3aGF0ID0gc2hpZnQ7CiAJJHVzZXIg PSAkRU5We1JFTU9URV9VU0VSfTsKLQkkZGJoID0gREJJLT5jb25uZWN0KCJEQkk6bXlzcWw6ZGF0 YWJhc2U9JG15c3FsX2RibmFtZTtob3N0PSRteXNxbF9ob3N0IiwgJG15c3FsX2xvZ2luLCAkbXlz cWxfcGFzc3dvcmQpOworCSRkYmggPSBEQkktPmNvbm5lY3QoIkRCSTokc3FsX3R5cGU6ZGF0YWJh c2U9JHNxbF9kYm5hbWU7aG9zdD0kc3FsX2hvc3QiLCAkc3FsX2xvZ2luLCAkc3FsX3Bhc3N3b3Jk KTsKIAkkc3RoID0gJGRiaC0+cHJlcGFyZSgiU0VMRUNUIHJpZ2h0cyBGUk9NICRhY2Nlc3NkYiBX SEVSRSBsb2dpbj0nJHVzZXInIik7CiAgICAgICAgICRzdGgtPmV4ZWN1dGUoKTsKICAgICAgICAg QHJpZ2h0cz1zcGxpdCAvLywkc3RoLT5mZXRjaHJvd19hcnJheTsKZGlmZiAtdU5yIG5ldGFtcy0z LjQuMHJjMi5vcmlnL2NnaS1iaW4vYWRtaW4vcmFkaXVzLmNnaSBuZXRhbXMtMy40LjByYzIvY2dp LWJpbi9hZG1pbi9yYWRpdXMuY2dpCi0tLSBuZXRhbXMtMy40LjByYzIub3JpZy9jZ2ktYmluL2Fk bWluL3JhZGl1cy5jZ2kJMjAwNC0wNS0yNiAxNzoxOTozMyArMDQwMAorKysgbmV0YW1zLTMuNC4w cmMyL2NnaS1iaW4vYWRtaW4vcmFkaXVzLmNnaQkyMDA3LTExLTEzIDExOjQyOjM2ICswMzAwCkBA IC0xNywxMSArMTcsMTEgQEAKIAkKIAkkdG9wcGFuZT0iPGI+UmFkaXVzIE1hbmFnZW1lbnQ8L2I+ IjsKIAotCSRkYmggPSBEQkktPmNvbm5lY3QoIkRCSTpteXNxbDpkYXRhYmFzZT0kbXlzcWxfZGJu YW1lO2hvc3Q9JG15c3FsX2hvc3QiLCAkbXlzcWxfbG9naW4sICRteXNxbF9wYXNzd29yZCk7CisJ JGRiaCA9IERCSS0+Y29ubmVjdCgiREJJOiRzcWxfdHlwZTpkYXRhYmFzZT0kc3FsX2RibmFtZTto b3N0PSRzcWxfaG9zdCIsICRzcWxfbG9naW4sICRzcWxfcGFzc3dvcmQpOwogCWlmICgkZGJoIGVx ICIiKSB7CiAJCSRwMS49IjxiPlVuYWJsZSB0byBjb25uZWN0IHRvIFNRTCByYWRpdXMgZGF0YWJh c2UhPC9iPjxocj4iOyB9CiAJZWxzZSB7Ci0JCSRwMS49IjxiPkNvbm5lY3RlZCB0byBkYXRhYmFz ZSAkbXlzcWxfZGJuYW1lPC9iPjxocj4iOworCQkkcDEuPSI8Yj5Db25uZWN0ZWQgdG8gZGF0YWJh c2UgJHNxbF9kYm5hbWU8L2I+PGhyPiI7CiAJfQogCQogCSRwMT0iPGEgaHJlZj0kdXJsPlVzZXJz PC9hPiZuYnNwOzxhIGhyZWY9JHVybD9hY3Rpb249Z3JvdXBsaXN0Pkdyb3VwczwvYT48aHI+IjsK ZGlmZiAtdU5yIG5ldGFtcy0zLjQuMHJjMi5vcmlnL2NnaS1iaW4vYWRtaW4vcnJkZ3JhcGguY2dp IG5ldGFtcy0zLjQuMHJjMi9jZ2ktYmluL2FkbWluL3JyZGdyYXBoLmNnaQotLS0gbmV0YW1zLTMu NC4wcmMyLm9yaWcvY2dpLWJpbi9hZG1pbi9ycmRncmFwaC5jZ2kJMjAwNS0xMS0yMiAyMjozNTo1 MCArMDMwMAorKysgbmV0YW1zLTMuNC4wcmMyL2NnaS1iaW4vYWRtaW4vcnJkZ3JhcGguY2dpCTIw MDctMTEtMTMgMTE6Mzg6MDcgKzAzMDAKQEAgLTcwLDggKzcwLDcgQEAKIAogcHJpbnQgU1RERVJS ICJMYXN0IHVwZGF0ZTogIi5SUkRzOjpsYXN0KCRycmRfZmlsZW5hbWUpLiJcbiI7CiAKLQlEQkkt Pmluc3RhbGxfZHJpdmVyKCJteXNxbCIpOwotCSRkYmggPSBEQkktPmNvbm5lY3QoIkRCSTpteXNx bDpuZXRhbXMiLCJyb290IiwgIiIsIHsgUmFpc2VFcnJvcj0+MCxBdXRvQ29tbWl0PT4xIH0pOwor CSRkYmggPSBEQkktPmNvbm5lY3QoIkRCSTokc3FsX3R5cGU6ZGF0YWJhc2U9JHNxbF9kYm5hbWU7 aG9zdD0kc3FsX2hvc3QiLCRzcWxfbG9naW4sICRzcWxfcGFzc3dvcmQsIHsgUmFpc2VFcnJvcj0+ MCxBdXRvQ29tbWl0PT4xIH0pOwogCWlmIChub3QgZGVmaW5lZCAkZGJoKSB7IHNob3dFcnJvcigi ZGF0YWJhc2UgY29ubmVjdCIpOyB9CiAJCiAJJGRicyA9ICRkYmgtPnByZXBhcmUoIlNFTEVDVCBo ZXgocG9saWN5X29pZCksdF9mcm9tLGJ5dGVzX2luLGJ5dGVzX291dCBmcm9tIHN1bW1hcnkgV0hF UkUgcHJlZml4PSdIJyBBTkQgdW5pdF9vaWQ9MHgwIi4kb2lkLiIgQU5EIHRfZnJvbSA+PSIuJHRp bWVfMS4iIEFORCB0X2Zyb20gPD0iLiR0aW1lXzIuIiBPUkRFUiBCWSB0X2Zyb20scG9saWN5X29p ZCIpOyAKZGlmZiAtdU5yIG5ldGFtcy0zLjQuMHJjMi5vcmlnL2NnaS1iaW4vYWRtaW4vc3RhdGlz dGljLmNnaSBuZXRhbXMtMy40LjByYzIvY2dpLWJpbi9hZG1pbi9zdGF0aXN0aWMuY2dpCi0tLSBu ZXRhbXMtMy40LjByYzIub3JpZy9jZ2ktYmluL2FkbWluL3N0YXRpc3RpYy5jZ2kJMjAwNi0xMi0x NyAyMDo1OToyNSArMDMwMAorKysgbmV0YW1zLTMuNC4wcmMyL2NnaS1iaW4vYWRtaW4vc3RhdGlz dGljLmNnaQkyMDA3LTExLTEzIDExOjM4OjMwICswMzAwCkBAIC02MDgsNyArNjA4LDcgQEAKIAlp ZiAoJGhhdmVfYWNjZXNzIG5lICJ5ZXMiKSB7cmV0dXJuIDk7fQogCSR3aGF0ID0gc2hpZnQ7CiAJ JHVzZXIgPSAkRU5We1JFTU9URV9VU0VSfTsKLQkkZGJoICA9IERCSS0+Y29ubmVjdCgiREJJOm15 c3FsOmRhdGFiYXNlPSRteXNxbF9kYm5hbWU7aG9zdD0kbXlzcWxfaG9zdCIsICRteXNxbF9sb2dp biwgJG15c3FsX3Bhc3N3b3JkKTsKKwkkZGJoICA9IERCSS0+Y29ubmVjdCgiREJJOiRzcWxfdHlw ZTpkYXRhYmFzZT0kc3FsX2RibmFtZTtob3N0PSRzcWxfaG9zdCIsICRzcWxfbG9naW4sICRzcWxf cGFzc3dvcmQpOwogCSRzdGggID0gJGRiaC0+cHJlcGFyZSgiU0VMRUNUIHJpZ2h0cyBGUk9NICRh Y2Nlc3NkYiBXSEVSRSBsb2dpbj0nJHVzZXInIik7CiAJCQkkc3RoLT5leGVjdXRlKCk7CiAJCUBy aWdodHM9c3BsaXQgLy8sJHN0aC0+ZmV0Y2hyb3dfYXJyYXk7CmRpZmYgLXVOciBuZXRhbXMtMy40 LjByYzIub3JpZy9jZ2ktYmluL2FkbWluL3VuaXQuY2dpIG5ldGFtcy0zLjQuMHJjMi9jZ2ktYmlu L2FkbWluL3VuaXQuY2dpCi0tLSBuZXRhbXMtMy40LjByYzIub3JpZy9jZ2ktYmluL2FkbWluL3Vu aXQuY2dpCTIwMDYtMDMtMTYgMTk6MDQ6MzkgKzAzMDAKKysrIG5ldGFtcy0zLjQuMHJjMi9jZ2kt YmluL2FkbWluL3VuaXQuY2dpCTIwMDctMTEtMTQgMTQ6MTY6MjEgKzAzMDAKQEAgLTI4LDcgKzI4 LDcgQEAKIAkJCiAJCQlpZigkaGF2ZV9yYWRpdXMgZXEgInllcyIpIHsKIAkJCQl1c2UgREJJOwot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAkZGJoID0gREJJLT5jb25uZWN0KCJEQkk6 bXlzcWw6ZGF0YWJhc2U9JG15c3FsX2RibmFtZTtob3N0PSRteXNxbF9ob3N0IiwgJG15c3FsX2xv Z2luLCAkbXlzcWxfcGFzc3dvcmQpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAk ZGJoID0gREJJLT5jb25uZWN0KCJEQkk6JHNxbF90eXBlOmRhdGFiYXNlPSRzcWxfZGJuYW1lO2hv c3Q9JHNxbF9ob3N0IiwgJHNxbF9sb2dpbiwgJHNxbF9wYXNzd29yZCk7CiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGlmICgkZGJoIGVxICIiKSB7JHAxLj0iPGI+VW5hYmxlIHRvIGNv bm5lY3QgdG8gU1FMIHJhZGl1cyBkYXRhYmFzZSE8L2I+PGhyPiI7IH0KICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgJGRiaC0+ZG8oIkRFTEVURSBGUk9NICRyYWRjaGVjayBXSEVSRSBpZCA9ICIuaGV4 KCRvaWQpLiIiKTsKQEAgLTE5MSw3ICsxNzYsNyBAQAogICAgICAgICAgICAgICAgIAkJCSRpcD0k aXB7JG9pZH07CiAJCQkJfQogCQkJCXVzZSBEQkk7Ci0JCQkJJGRiaCA9IERCSS0+Y29ubmVjdCgi REJJOm15c3FsOmRhdGFiYXNlPSRteXNxbF9kYm5hbWU7aG9zdD0kbXlzcWxfaG9zdCIsICRteXNx bF9sb2dpbiwgJG15c3FsX3Bhc3N3b3JkKTsKKwkJCQkkZGJoID0gREJJLT5jb25uZWN0KCJEQkk6 JHNxbF90eXBlOmRhdGFiYXNlPSRzcWxfZGJuYW1lO2hvc3Q9JHNxbF9ob3N0IiwgJHNxbF9sb2dp biwgJHNxbF9wYXNzd29yZCk7CiAJCQkJaWYgKCRkYmggZXEgIiIpIHskcDEuPSI8Yj5VbmFibGUg dG8gY29ubmVjdCB0byBTUUwgcmFkaXVzIGRhdGFiYXNlITwvYj48aHI+IjsgfQogCQkJCWVsc2Ug ewogCQkJCQkkZGJoLT5kbygiUkVQTEFDRSAkcmFkY2hlY2sgVkFMVUVTICgiLmhleCgkb2lkKS4i LCckbmFtZScsJ1Bhc3N3b3JkJywnPT0nLCckcGFzc3dvcmQnKSIpOwpkaWZmIC11TnIgbmV0YW1z LTMuNC4wcmMyLm9yaWcvY2dpLWJpbi9hZG1pbi92aWV3LmNnaSBuZXRhbXMtMy40LjByYzIvY2dp LWJpbi9hZG1pbi92aWV3LmNnaQotLS0gbmV0YW1zLTMuNC4wcmMyLm9yaWcvY2dpLWJpbi9hZG1p bi92aWV3LmNnaQkyMDA0LTA1LTA2IDE1OjA5OjQ1ICswNDAwCisrKyBuZXRhbXMtMy40LjByYzIv Y2dpLWJpbi9hZG1pbi92aWV3LmNnaQkyMDA3LTExLTEzIDExOjQyOjQyICswMzAwCkBAIC05LDEx ICs5LDExIEBACiAkdXJsPSJ2aWV3LmNnaSI7CiAKIAkkdG9wcGFuZT0iPGI+VmlldyBMb2c8L2I+ IjsKLQkkZGJoID0gREJJLT5jb25uZWN0KCJEQkk6bXlzcWw6ZGF0YWJhc2U9JG15c3FsX2RibmFt ZTtob3N0PSRteXNxbF9ob3N0IiwgJG15c3FsX2xvZ2luLCAkbXlzcWxfcGFzc3dvcmQpOworCSRk YmggPSBEQkktPmNvbm5lY3QoIkRCSTokc3FsX3R5cGU6ZGF0YWJhc2U9JHNxbF9kYm5hbWU7aG9z dD0kc3FsX2hvc3QiLCAkc3FsX2xvZ2luLCAkc3FsX3Bhc3N3b3JkKTsKICAgICAgICAgaWYgKCRk YmggZXEgIiIpIHsKICAgICAgICAgICAgICAgICAkcDEuPSI8Yj5VbmFibGUgdG8gY29ubmVjdCB0 byBTUUwgcmFkaXVzIGRhdGFiYXNlITwvYj48aHI+IjsgfQogICAgICAgICBlbHNlIHsKLSAgICAg ICAgICAgICAgICAkcDEuPSI8Yj5Db25uZWN0ZWQgdG8gZGF0YWJhc2UgJG15c3FsX2RibmFtZTwv Yj48aHI+IjsKKyAgICAgICAgICAgICAgICAkcDEuPSI8Yj5Db25uZWN0ZWQgdG8gZGF0YWJhc2Ug JHNxbF9kYm5hbWU8L2I+PGhyPiI7CiAgICAgICAgIH0KIAkKIAlpZigoJGFpZD0kY2dpLT5wYXJh bSgiYWlkIikpIG5lICIiKSB7CmRpZmYgLXVOciBuZXRhbXMtMy40LjByYzIub3JpZy9jZ2ktYmlu L2NvbmZpZy5jZ2kgbmV0YW1zLTMuNC4wcmMyL2NnaS1iaW4vY29uZmlnLmNnaQotLS0gbmV0YW1z LTMuNC4wcmMyLm9yaWcvY2dpLWJpbi9jb25maWcuY2dpCTIwMDUtMDQtMDYgMjA6MjE6NDkgKzA0 MDAKKysrIG5ldGFtcy0zLjQuMHJjMi9jZ2ktYmluL2NvbmZpZy5jZ2kJMjAwNy0xMS0xNCAxNTox MjozNCArMDMwMApAQCAtNyw3ICs3LDEyIEBACiAkc2NfaG9zdD0ibG9jYWxob3N0IjsgJHNjX3Bv cnQ9MjAwMDE7ICRzY191c2VyPSJhZG1pbiI7ICRzY19wYXNzd2Q9ImFhYSI7CiAKICNsb2dpbiB0 byBkYXRhYmFzZQotJG15c3FsX2hvc3Q9ImxvY2FsaG9zdCI7ICRteXNxbF9sb2dpbj0icm9vdCI7 ICRteXNxbF9wYXNzd29yZD0iIjsgJG15c3FsX2RibmFtZT0ibmV0YW1zIjsKKyMgc3FsX3R5cGUg bWF5IGJlICJteXNxbCIgYW5kICJQZyIKKyRzcWxfdHlwZT0ibXlzcWwiCiskc3FsX2hvc3Q9Imxv Y2FsaG9zdCI7Ciskc3FsX2xvZ2luPSJyb290IjsKKyRzcWxfcGFzc3dvcmQ9IiI7Ciskc3FsX2Ri bmFtZT0ibmV0YW1zIjsKIAogI2xvZyBldmVudHMKICRsb2dfdG9fZXZlbnRzPSJ5ZXMiOwpkaWZm IC11TnIgbmV0YW1zLTMuNC4wcmMyLm9yaWcvY2dpLWJpbi9zdGF0aXN0aWMucGwgbmV0YW1zLTMu NC4wcmMyL2NnaS1iaW4vc3RhdGlzdGljLnBsCi0tLSBuZXRhbXMtMy40LjByYzIub3JpZy9jZ2kt YmluL3N0YXRpc3RpYy5wbAkyMDA2LTEyLTE3IDIwOjU5OjI2ICswMzAwCisrKyBuZXRhbXMtMy40 LjByYzIvY2dpLWJpbi9zdGF0aXN0aWMucGwJMjAwNy0xMS0xMyAxMTozMjoyOCArMDMwMApAQCAt NjQ5LDcgKzY0OSw3IEBACiAjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMKIHN1YiBiZGNvbm5lY3QgewogCXVzZSBEQkk7Ci0JbXkgICRkYmggPSBEQkktPmNv bm5lY3QoIkRCSTpteXNxbDpkYXRhYmFzZT0kbXlzcWxfZGJuYW1lO2hvc3Q9JG15c3FsX2hvc3Qi LCAkbXlzcWxfbG9naW4sICRteXNxbF9wYXNzd29yZCk7CisJbXkgICRkYmggPSBEQkktPmNvbm5l Y3QoIkRCSTokc3FsX3R5cGU6ZGF0YWJhc2U9JHNxbF9kYm5hbWU7aG9zdD0kc3FsX2hvc3QiLCAk c3FsX2xvZ2luLCAkc3FsX3Bhc3N3b3JkKTsKIAlpZiAoJGRiaCBlcSAiIikgeyBkaWUgIjxBPkVy cm9yIGRhdGFiYXNlIGNvbm5lY3RpbmcuIDwvYT4iOyB9CiAJcmV0dXJuICRkYmg7CiB9CmRpZmYg LXVOciBuZXRhbXMtMy40LjByYzIub3JpZy9jZ2ktYmluL3VzZXJ0b29sLmNnaSBuZXRhbXMtMy40 LjByYzIvY2dpLWJpbi91c2VydG9vbC5jZ2kKLS0tIG5ldGFtcy0zLjQuMHJjMi5vcmlnL2NnaS1i aW4vdXNlcnRvb2wuY2dpCTIwMDUtMTEtMjUgMjM6Mzc6MDggKzAzMDAKKysrIG5ldGFtcy0zLjQu MHJjMi9jZ2ktYmluL3VzZXJ0b29sLmNnaQkyMDA3LTExLTEzIDExOjM5OjQ1ICswMzAwCkBAIC02 OSw3ICs2OSw3IEBACiAJCQkJaWYoJGtbJGldIGVxICR1bml0KSB7CiAJCQkJCXVzZSBEQkk7CiAJ CQkJCQotCQkJCQkkZGJoID0gREJJLT5jb25uZWN0KCJEQkk6bXlzcWw6ZGF0YWJhc2U9JG15c3Fs X2RibmFtZTtob3N0PSRteXNxbF9ob3N0IiwgJG15c3FsX2xvZ2luLCAkbXlzcWxfcGFzc3dvcmQp OworCQkJCQkkZGJoID0gREJJLT5jb25uZWN0KCJEQkk6JHNxbF90eXBlOmRhdGFiYXNlPSRzcWxf ZGJuYW1lO2hvc3Q9JHNxbF9ob3N0IiwgJHNxbF9sb2dpbiwgJHNxbF9wYXNzd29yZCk7CiAJCQkJ CWlmICgkZGJoIGVxICIiKSB7JHAxLj0iPGI+VW5hYmxlIHRvIGNvbm5lY3QgdG8gU1FMIHJhZGl1 cyBkYXRhYmFzZSE8L2I+PGhyPiI7IH0KIAkJCQkJJGRiaC0+ZG8oIlJFUExBQ0UgJHJhZGNoZWNr IFZBTFVFUyAoIi5oZXgoJG9pZCkuIiwnJG5hbWUnLCdQYXNzd29yZCcsJz09JywnJHBhc3N3b3Jk JykiKTsKIAkJCQkJJHA0Lj0iPGI+PGk+QXBwbHlpbmc6PC9pPjwvYj4gU3luY2luZyB0byBSYWRp dXMgc2VydmVyPGJyPiI7CkBAIC0xMjEsMTEgKzEyMSwxMSBAQAogfSBlbHNpZiAoJGNnaS0+cGFy YW0oImFjdGlvbiIpIGVxICJ2aWV3IikgewogCXVzZSBEQkk7CiAJCi0JJGRiaCA9IERCSS0+Y29u bmVjdCgiREJJOm15c3FsOmRhdGFiYXNlPSRteXNxbF9kYm5hbWU7aG9zdD0kbXlzcWxfaG9zdCIs ICRteXNxbF9sb2dpbiwgJG15c3FsX3Bhc3N3b3JkKTsKKwkkZGJoID0gREJJLT5jb25uZWN0KCJE Qkk6JHNxbF90eXBlOmRhdGFiYXNlPSRzcWxfZGJuYW1lO2hvc3Q9JHNxbF9ob3N0IiwgJHNxbF9s b2dpbiwgJHNxbF9wYXNzd29yZCk7CiAgICAgICAgIGlmICgkZGJoIGVxICIiKSB7CiAgICAgICAg ICAgICAgICAgJHA0Lj0iPGI+VW5hYmxlIHRvIGNvbm5lY3QgdG8gU1FMIHJhZGl1cyBkYXRhYmFz ZSE8L2I+PGhyPiI7IH0KICAgICAgICAgZWxzZSB7Ci0gICAgICAgICAgICAgICAgJHA0Lj0iPGI+ Q29ubmVjdGVkIHRvIGRhdGFiYXNlICRteXNxbF9kYm5hbWU8L2I+PGhyPiI7CisgICAgICAgICAg ICAgICAgJHA0Lj0iPGI+Q29ubmVjdGVkIHRvIGRhdGFiYXNlICRzcWxfZGJuYW1lPC9iPjxocj4i OwogICAgICAgICB9CiAKIAkkc3RoID0gJGRiaC0+cHJlcGFyZSgiU0VMRUNUICogRlJPTSBldmVu dHMgV0hFUkUgYWNjb3VudF9vaWQ9JyIuaGV4KCRvaWQpLiInIE9SREVSIEJZIHRpbWUgREVTQyIp OwpAQCAtMjM1LDcgKzIzNSw3IEBACiAgICAgICAgIGlmIChkZWZpbmVkICRsb2dfdG9fZXZlbnRz KSB7CiAgICAgICAgICAgICAgICAgaWYgKCRsb2dfdG9fZXZlbnRzIGVxICJ5ZXMiKSB7CiAgICAg ICAgICAgICAgICAgICAgICAgICB1c2UgREJJOwotICAgICAgICAgICAgICAgICAgICAgICAgJGRi aCA9IERCSS0+Y29ubmVjdCgiREJJOm15c3FsOmRhdGFiYXNlPSRteXNxbF9kYm5hbWU7aG9zdD0k bXlzcWxfaG9zdCIsICRteXNxbF9sb2dpbiwgJG15c3FsX3Bhc3N3b3JkCisgICAgICAgICAgICAg ICAgICAgICAgICAkZGJoID0gREJJLT5jb25uZWN0KCJEQkk6JHNxbF90eXBlOmRhdGFiYXNlPSRz cWxfZGJuYW1lO2hvc3Q9JHNxbF9ob3N0IiwgJHNxbF9sb2dpbiwgJHNxbF9wYXNzd29yZAogKTsK ICAgICAgICAgICAgICAgICAgICAgICAgIGlmICgkZGJoIGVxICIiKSB7IHJldHVybjsgfQogICAg ICAgICAgICAgICAgICAgICAgICAgZWxzZSB7Cg==