6068 2010-10-25 13:50:00 -0700 User interests controlled vocab entries check assoc_id without specifying assoc_type 2010-10-29 17:46:40 -0700 1 1 1 Unclassified OJS General 2.3.3 PC Linux RESOLVED FIXED P5 enhancement --- 1 alec pkp-support vlilloh 21668 alec 2010-10-25 13:50:31 -0700 User interests controlled vocab entries check assoc_id without specifying assoc_type. This may lead to collisions between controlled vocab entries used for different purposes and also prevents the database from using the related indexes. 21669 3296 alec 2010-10-25 14:06:18 -0700 Created attachment 3296 Patch against OJS 2.3.3-2 21670 3297 alec 2010-10-25 14:06:46 -0700 Created attachment 3297 Patch against PKP pre-release 21671 3298 alec 2010-10-25 14:13:06 -0700 Created attachment 3298 Patch against OCS pre-2.3.4 21672 3299 alec 2010-10-25 14:15:24 -0700 Created attachment 3299 Patch against OMP pre-release 21673 alec 2010-10-25 14:16:25 -0700 Corrected for all apps. To fix this for OJS 2.3.3-2, for example, both attachment #3297 (in lib/pkp) and attachment #3296 (in the install directory) need to be applied. 21774 alec 2010-10-29 17:46:40 -0700 Committed to OJS 2.3.3-3 3296 2010-10-25 14:06:00 -0700 2010-10-25 14:06:18 -0700 Patch against OJS 2.3.3-2 6068.diff text/plain 6754 alec ZGlmZiAtLWdpdCBhL2NsYXNzZXMvc2VjdXJpdHkvUm9sZURBTy5pbmMucGhwIGIvY2xhc3Nlcy9z ZWN1cml0eS9Sb2xlREFPLmluYy5waHAKaW5kZXggZDAwZDRjYi4uODliNmM3NyAxMDA2NDQKLS0t IGEvY2xhc3Nlcy9zZWN1cml0eS9Sb2xlREFPLmluYy5waHAKKysrIGIvY2xhc3Nlcy9zZWN1cml0 eS9Sb2xlREFPLmluYy5waHAKQEAgLTE0Niw3ICsxNDYsNyBAQCBjbGFzcyBSb2xlREFPIGV4dGVu ZHMgREFPIHsKIAlmdW5jdGlvbiAmZ2V0VXNlcnNCeVJvbGVJZCgkcm9sZUlkID0gbnVsbCwgJGpv dXJuYWxJZCA9IG51bGwsICRzZWFyY2hUeXBlID0gbnVsbCwgJHNlYXJjaCA9IG51bGwsICRzZWFy Y2hNYXRjaCA9IG51bGwsICRkYlJlc3VsdFJhbmdlID0gbnVsbCwgJHNvcnRCeSA9IG51bGwsICRz b3J0RGlyZWN0aW9uID0gU09SVF9ESVJFQ1RJT05fQVNDKSB7CiAJCSR1c2VycyA9IGFycmF5KCk7 CiAKLQkJJHBhcmFtQXJyYXkgPSBhcnJheSgnaW50ZXJlc3QnKTsKKwkJJHBhcmFtQXJyYXkgPSBh cnJheShBU1NPQ19UWVBFX1VTRVIsICdpbnRlcmVzdCcpOwogCQlpZiAoaXNzZXQoJHJvbGVJZCkp ICRwYXJhbUFycmF5W10gPSAoaW50KSAkcm9sZUlkOwogCQlpZiAoaXNzZXQoJGpvdXJuYWxJZCkp ICRwYXJhbUFycmF5W10gPSAoaW50KSAkam91cm5hbElkOwogCkBAIC0xOTQsNyArMTk0LDcgQEAg Y2xhc3MgUm9sZURBTyBleHRlbmRzIERBTyB7CiAJCSRzZWFyY2hTcWwgLj0gKCRzb3J0Qnk/KCcg T1JERVIgQlkgJyAuICR0aGlzLT5nZXRTb3J0TWFwcGluZygkc29ydEJ5KSAuICcgJyAuICR0aGlz LT5nZXREaXJlY3Rpb25NYXBwaW5nKCRzb3J0RGlyZWN0aW9uKSkgOiAnJyk7CiAKIAkJJHJlc3Vs dCA9JiAkdGhpcy0+cmV0cmlldmVSYW5nZSgKLQkJCSdTRUxFQ1QgRElTVElOQ1QgdS4qIEZST00g dXNlcnMgQVMgdSBMRUZUIEpPSU4gY29udHJvbGxlZF92b2NhYnMgY3YgT04gKGN2LmFzc29jX2lk ID0gdS51c2VyX2lkIEFORCBjdi5zeW1ib2xpYyA9ID8pCisJCQknU0VMRUNUIERJU1RJTkNUIHUu KiBGUk9NIHVzZXJzIEFTIHUgTEVGVCBKT0lOIGNvbnRyb2xsZWRfdm9jYWJzIGN2IE9OIChjdi5h c3NvY190eXBlID0gPyBBTkQgY3YuYXNzb2NfaWQgPSB1LnVzZXJfaWQgQU5EIGN2LnN5bWJvbGlj ID0gPykKIAkJCQlMRUZUIEpPSU4gY29udHJvbGxlZF92b2NhYl9lbnRyaWVzIGN2ZSBPTiAoY3Zl LmNvbnRyb2xsZWRfdm9jYWJfaWQgPSBjdi5jb250cm9sbGVkX3ZvY2FiX2lkKQogCQkJCUxFRlQg Sk9JTiBjb250cm9sbGVkX3ZvY2FiX2VudHJ5X3NldHRpbmdzIGN2ZXMgT04gKGN2ZXMuY29udHJv bGxlZF92b2NhYl9lbnRyeV9pZCA9IGN2ZS5jb250cm9sbGVkX3ZvY2FiX2VudHJ5X2lkKSwKIAkJ CQlyb2xlcyBBUyByIFdIRVJFIHUudXNlcl9pZCA9IHIudXNlcl9pZCAnIC4gKGlzc2V0KCRyb2xl SWQpPydBTkQgci5yb2xlX2lkID0gPyc6JycpIC4gKGlzc2V0KCRqb3VybmFsSWQpID8gJyBBTkQg ci5qb3VybmFsX2lkID0gPycgOiAnJykgLiAnICcgLiAkc2VhcmNoU3FsLApAQCAtMjE4LDcgKzIx OCw3IEBAIGNsYXNzIFJvbGVEQU8gZXh0ZW5kcyBEQU8gewogCWZ1bmN0aW9uICZnZXRVc2Vyc0J5 Sm91cm5hbElkKCRqb3VybmFsSWQsICRzZWFyY2hUeXBlID0gbnVsbCwgJHNlYXJjaCA9IG51bGws ICRzZWFyY2hNYXRjaCA9IG51bGwsICRkYlJlc3VsdFJhbmdlID0gbnVsbCwgJHNvcnRCeSA9IG51 bGwsICRzb3J0RGlyZWN0aW9uID0gU09SVF9ESVJFQ1RJT05fQVNDKSB7CiAJCSR1c2VycyA9IGFy cmF5KCk7CiAKLQkJJHBhcmFtQXJyYXkgPSBhcnJheSgnaW50ZXJlc3QnLCAoaW50KSAkam91cm5h bElkKTsKKwkJJHBhcmFtQXJyYXkgPSBhcnJheShBU1NPQ19UWVBFX1VTRVIsICdpbnRlcmVzdCcs IChpbnQpICRqb3VybmFsSWQpOwogCQkkc2VhcmNoU3FsID0gJyc7CiAKIAkJJHNlYXJjaFR5cGVN YXAgPSBhcnJheSgKQEAgLTI2MCw3ICsyNjAsNyBAQCBjbGFzcyBSb2xlREFPIGV4dGVuZHMgREFP IHsKIAogCQkkcmVzdWx0ID0mICR0aGlzLT5yZXRyaWV2ZVJhbmdlKAogCi0JCQknU0VMRUNUIERJ U1RJTkNUIHUuKiBGUk9NIHVzZXJzIEFTIHUgTEVGVCBKT0lOIGNvbnRyb2xsZWRfdm9jYWJzIGN2 IE9OIChjdi5hc3NvY19pZCA9IHUudXNlcl9pZCBBTkQgY3Yuc3ltYm9saWMgPSA/KQorCQkJJ1NF TEVDVCBESVNUSU5DVCB1LiogRlJPTSB1c2VycyBBUyB1IExFRlQgSk9JTiBjb250cm9sbGVkX3Zv Y2FicyBjdiBPTiAoY3YuYXNzb2NfdHlwZSA9ID8gQU5EIGN2LmFzc29jX2lkID0gdS51c2VyX2lk IEFORCBjdi5zeW1ib2xpYyA9ID8pCiAJCQkJTEVGVCBKT0lOIGNvbnRyb2xsZWRfdm9jYWJfZW50 cmllcyBjdmUgT04gKGN2ZS5jb250cm9sbGVkX3ZvY2FiX2lkID0gY3YuY29udHJvbGxlZF92b2Nh Yl9pZCkKIAkJCQlMRUZUIEpPSU4gY29udHJvbGxlZF92b2NhYl9lbnRyeV9zZXR0aW5ncyBjdmVz IE9OIChjdmVzLmNvbnRyb2xsZWRfdm9jYWJfZW50cnlfaWQgPSBjdmUuY29udHJvbGxlZF92b2Nh Yl9lbnRyeV9pZCksCiAJCQkJcm9sZXMgQVMgciBXSEVSRSB1LnVzZXJfaWQgPSByLnVzZXJfaWQg QU5EIHIuam91cm5hbF9pZCA9ID8gJyAuICRzZWFyY2hTcWwsCmRpZmYgLS1naXQgYS9jbGFzc2Vz L3N1Ym1pc3Npb24vZWRpdG9yL0VkaXRvclN1Ym1pc3Npb25EQU8uaW5jLnBocCBiL2NsYXNzZXMv c3VibWlzc2lvbi9lZGl0b3IvRWRpdG9yU3VibWlzc2lvbkRBTy5pbmMucGhwCmluZGV4IGUxZGQy YmYuLjFjNjI3ZDYgMTAwNjQ0Ci0tLSBhL2NsYXNzZXMvc3VibWlzc2lvbi9lZGl0b3IvRWRpdG9y U3VibWlzc2lvbkRBTy5pbmMucGhwCisrKyBiL2NsYXNzZXMvc3VibWlzc2lvbi9lZGl0b3IvRWRp dG9yU3VibWlzc2lvbkRBTy5pbmMucGhwCkBAIC02MTAsNyArNjEwLDcgQEAgY2xhc3MgRWRpdG9y U3VibWlzc2lvbkRBTyBleHRlbmRzIERBTyB7CiAJZnVuY3Rpb24gJmdldFVzZXJzTm90QXNzaWdu ZWRUb0FydGljbGUoJGpvdXJuYWxJZCwgJGFydGljbGVJZCwgJHJvbGVJZCwgJHNlYXJjaFR5cGU9 bnVsbCwgJHNlYXJjaD1udWxsLCAkc2VhcmNoTWF0Y2g9bnVsbCwgJHJhbmdlSW5mbyA9IG51bGwp IHsKIAkJJHVzZXJzID0gYXJyYXkoKTsKIAotCQkkcGFyYW1BcnJheSA9IGFycmF5KCdpbnRlcmVz dCcsICRhcnRpY2xlSWQsICRqb3VybmFsSWQsICRyb2xlSWQpOworCQkkcGFyYW1BcnJheSA9IGFy cmF5KEFTU09DX1RZUEVfVVNFUiwgJ2ludGVyZXN0JywgJGFydGljbGVJZCwgJGpvdXJuYWxJZCwg JHJvbGVJZCk7CiAJCSRzZWFyY2hTcWwgPSAnJzsKIAogCQkkc2VhcmNoVHlwZU1hcCA9IGFycmF5 KApAQCAtNjUzLDcgKzY1Myw3IEBAIGNsYXNzIEVkaXRvclN1Ym1pc3Npb25EQU8gZXh0ZW5kcyBE QU8gewogCQkJJ1NFTEVDVCBESVNUSU5DVAogCQkJCXUuKgogCQkJRlJPTQl1c2VycyB1Ci0JCQkJ TEVGVCBKT0lOIGNvbnRyb2xsZWRfdm9jYWJzIGN2IE9OIChjdi5hc3NvY19pZCA9IHUudXNlcl9p ZCBBTkQgY3Yuc3ltYm9saWMgPSA/KQorCQkJCUxFRlQgSk9JTiBjb250cm9sbGVkX3ZvY2FicyBj diBPTiAoY3YuYXNzb2NfdHlwZSA9ID8gQU5EIGN2LmFzc29jX2lkID0gdS51c2VyX2lkIEFORCBj di5zeW1ib2xpYyA9ID8pCiAJCQkJTEVGVCBKT0lOIGNvbnRyb2xsZWRfdm9jYWJfZW50cmllcyBj dmUgT04gKGN2ZS5jb250cm9sbGVkX3ZvY2FiX2lkID0gY3YuY29udHJvbGxlZF92b2NhYl9pZCkK IAkJCQlMRUZUIEpPSU4gY29udHJvbGxlZF92b2NhYl9lbnRyeV9zZXR0aW5ncyBjdmVzIE9OIChj dmVzLmNvbnRyb2xsZWRfdm9jYWJfZW50cnlfaWQgPSBjdmUuY29udHJvbGxlZF92b2NhYl9lbnRy eV9pZCkKIAkJCQlMRUZUIEpPSU4gcm9sZXMgciBPTiAoci51c2VyX2lkID0gdS51c2VyX2lkKQpk aWZmIC0tZ2l0IGEvY2xhc3Nlcy9zdWJtaXNzaW9uL3NlY3Rpb25FZGl0b3IvU2VjdGlvbkVkaXRv clN1Ym1pc3Npb25EQU8uaW5jLnBocCBiL2NsYXNzZXMvc3VibWlzc2lvbi9zZWN0aW9uRWRpdG9y L1NlY3Rpb25FZGl0b3JTdWJtaXNzaW9uREFPLmluYy5waHAKaW5kZXggMzdlMDdjZS4uNWExNmFi NSAxMDA2NDQKLS0tIGEvY2xhc3Nlcy9zdWJtaXNzaW9uL3NlY3Rpb25FZGl0b3IvU2VjdGlvbkVk aXRvclN1Ym1pc3Npb25EQU8uaW5jLnBocAorKysgYi9jbGFzc2VzL3N1Ym1pc3Npb24vc2VjdGlv bkVkaXRvci9TZWN0aW9uRWRpdG9yU3VibWlzc2lvbkRBTy5pbmMucGhwCkBAIC03MzgsNyArNzM4 LDcgQEAgY2xhc3MgU2VjdGlvbkVkaXRvclN1Ym1pc3Npb25EQU8gZXh0ZW5kcyBEQU8gewogCSAq IEByZXR1cm4gREFPUmVzdWx0RmFjdG9yeSBjb250YWluaW5nIG1hdGNoaW5nIFVzZXJzCiAJICov CiAJZnVuY3Rpb24gJmdldFJldmlld2Vyc0ZvckFydGljbGUoJGpvdXJuYWxJZCwgJGFydGljbGVJ ZCwgJHJvdW5kLCAkc2VhcmNoVHlwZSA9IG51bGwsICRzZWFyY2ggPSBudWxsLCAkc2VhcmNoTWF0 Y2ggPSBudWxsLCAkcmFuZ2VJbmZvID0gbnVsbCwgJHNvcnRCeSA9IG51bGwsICRzb3J0RGlyZWN0 aW9uID0gU09SVF9ESVJFQ1RJT05fQVNDKSB7Ci0JCSRwYXJhbUFycmF5ID0gYXJyYXkoJGFydGlj bGVJZCwgJHJvdW5kLCAnaW50ZXJlc3QnLCAkam91cm5hbElkLCBSb2xlREFPOjpnZXRSb2xlSWRG cm9tUGF0aCgncmV2aWV3ZXInKSk7CisJCSRwYXJhbUFycmF5ID0gYXJyYXkoJGFydGljbGVJZCwg JHJvdW5kLCBBU1NPQ19UWVBFX1VTRVIsICdpbnRlcmVzdCcsICRqb3VybmFsSWQsIFJvbGVEQU86 OmdldFJvbGVJZEZyb21QYXRoKCdyZXZpZXdlcicpKTsKIAkJJHNlYXJjaFNxbCA9ICcnOwogCiAJ CSRzZWFyY2hUeXBlTWFwID0gYXJyYXkoCkBAIC03OTQsNyArNzk0LDcgQEAgY2xhc3MgU2VjdGlv bkVkaXRvclN1Ym1pc3Npb25EQU8gZXh0ZW5kcyBEQU8gewogCQkJCUxFRlQgSk9JTiByZXZpZXdf YXNzaWdubWVudHMgYXIgT04gKGFyLnJldmlld2VyX2lkID0gdS51c2VyX2lkIEFORCBhci5jYW5j ZWxsZWQgPSAwIEFORCBhci5zdWJtaXNzaW9uX2lkID0gPyBBTkQgYXIucm91bmQgPSA/KQogCQkJ CUxFRlQgSk9JTiByb2xlcyByIE9OIChyLnVzZXJfaWQgPSB1LnVzZXJfaWQpCiAJCQkJTEVGVCBK T0lOIGFydGljbGVzIGEgT04gKHJhLnN1Ym1pc3Npb25faWQgPSBhLmFydGljbGVfaWQpCi0JCQkJ TEVGVCBKT0lOIGNvbnRyb2xsZWRfdm9jYWJzIGN2IE9OIChjdi5hc3NvY19pZCA9IHUudXNlcl9p ZCBBTkQgY3Yuc3ltYm9saWMgPSA/KQorCQkJCUxFRlQgSk9JTiBjb250cm9sbGVkX3ZvY2FicyBj diBPTiAoY3YuYXNzb2NfdHlwZSA9ID8gQU5EIGN2LmFzc29jX2lkID0gdS51c2VyX2lkIEFORCBj di5zeW1ib2xpYyA9ID8pCiAJCQkJTEVGVCBKT0lOIGNvbnRyb2xsZWRfdm9jYWJfZW50cmllcyBj dmUgT04gKGN2ZS5jb250cm9sbGVkX3ZvY2FiX2lkID0gY3YuY29udHJvbGxlZF92b2NhYl9pZCkK IAkJCQlMRUZUIEpPSU4gY29udHJvbGxlZF92b2NhYl9lbnRyeV9zZXR0aW5ncyBjdmVzIE9OIChj dmVzLmNvbnRyb2xsZWRfdm9jYWJfZW50cnlfaWQgPSBjdmUuY29udHJvbGxlZF92b2NhYl9lbnRy eV9pZCkKIAkJCVdIRVJFIHUudXNlcl9pZCA9IHIudXNlcl9pZCBBTkQKQEAgLTg3MSw3ICs4NzEs NyBAQCBjbGFzcyBTZWN0aW9uRWRpdG9yU3VibWlzc2lvbkRBTyBleHRlbmRzIERBTyB7CiAJZnVu Y3Rpb24gJmdldENvcHllZGl0b3JzTm90QXNzaWduZWRUb0FydGljbGUoJGpvdXJuYWxJZCwgJGFy dGljbGVJZCwgJHNlYXJjaFR5cGUgPSBudWxsLCAkc2VhcmNoID0gbnVsbCwgJHNlYXJjaE1hdGNo ID0gbnVsbCkgewogCQkkdXNlcnMgPSBhcnJheSgpOwogCi0JCSRwYXJhbUFycmF5ID0gYXJyYXko J2ludGVyZXN0JywgJGFydGljbGVJZCwgQVNTT0NfVFlQRV9BUlRJQ0xFLCAnU0lHTk9GRl9DT1BZ RURJVElOR19JTklUSUFMJywgJGpvdXJuYWxJZCwgUm9sZURBTzo6Z2V0Um9sZUlkRnJvbVBhdGgo J2NvcHllZGl0b3InKSk7CisJCSRwYXJhbUFycmF5ID0gYXJyYXkoQVNTT0NfVFlQRV9VU0VSLCAn aW50ZXJlc3QnLCAkYXJ0aWNsZUlkLCBBU1NPQ19UWVBFX0FSVElDTEUsICdTSUdOT0ZGX0NPUFlF RElUSU5HX0lOSVRJQUwnLCAkam91cm5hbElkLCBSb2xlREFPOjpnZXRSb2xlSWRGcm9tUGF0aCgn Y29weWVkaXRvcicpKTsKIAkJJHNlYXJjaFNxbCA9ICcnOwogCiAJCSRzZWFyY2hUeXBlTWFwID0g YXJyYXkoCkBAIC05MTMsNyArOTEzLDcgQEAgY2xhc3MgU2VjdGlvbkVkaXRvclN1Ym1pc3Npb25E QU8gZXh0ZW5kcyBEQU8gewogCQkkcmVzdWx0ID0mICR0aGlzLT5yZXRyaWV2ZSgKIAkJCSdTRUxF Q1QJdS4qCiAJCQlGUk9NCXVzZXJzIHUKLQkJCQlMRUZUIEpPSU4gY29udHJvbGxlZF92b2NhYnMg Y3YgT04gKGN2LmFzc29jX2lkID0gdS51c2VyX2lkIEFORCBjdi5zeW1ib2xpYyA9ID8pCisJCQkJ TEVGVCBKT0lOIGNvbnRyb2xsZWRfdm9jYWJzIGN2IE9OIChjdi5hc3NvY190eXBlID0gPyBBTkQg Y3YuYXNzb2NfaWQgPSB1LnVzZXJfaWQgQU5EIGN2LnN5bWJvbGljID0gPykKIAkJCQlMRUZUIEpP SU4gY29udHJvbGxlZF92b2NhYl9lbnRyaWVzIGN2ZSBPTiAoY3ZlLmNvbnRyb2xsZWRfdm9jYWJf aWQgPSBjdi5jb250cm9sbGVkX3ZvY2FiX2lkKQogCQkJCUxFRlQgSk9JTiBjb250cm9sbGVkX3Zv Y2FiX2VudHJ5X3NldHRpbmdzIGN2ZXMgT04gKGN2ZXMuY29udHJvbGxlZF92b2NhYl9lbnRyeV9p ZCA9IGN2ZS5jb250cm9sbGVkX3ZvY2FiX2VudHJ5X2lkKQogCQkJCUxFRlQgSk9JTiByb2xlcyBy IE9OIChyLnVzZXJfaWQgPSB1LnVzZXJfaWQpCg== 3297 2010-10-25 14:06:00 -0700 2010-10-25 14:06:46 -0700 Patch against PKP pre-release 6068-pkp.diff text/plain 3452 alec ZGlmZiAtLWdpdCBhL2NsYXNzZXMvY29yZS9QS1BBcHBsaWNhdGlvbi5pbmMucGhwIGIvY2xhc3Nl cy9jb3JlL1BLUEFwcGxpY2F0aW9uLmluYy5waHAKaW5kZXggOGQ2MmNlYi4uMThkYzJjZCAxMDA2 NDQKLS0tIGEvY2xhc3Nlcy9jb3JlL1BLUEFwcGxpY2F0aW9uLmluYy5waHAKKysrIGIvY2xhc3Nl cy9jb3JlL1BLUEFwcGxpY2F0aW9uLmluYy5waHAKQEAgLTE5LDcgKzE5LDcgQEAgZGVmaW5lKCdS RUFMTFlfQklHX05VTUJFUicsIDEwMDAwKTsKIGRlZmluZSgnUk9VVEVfQ09NUE9ORU5UJywgJ2Nv bXBvbmVudCcpOwogZGVmaW5lKCdST1VURV9QQUdFJywgJ3BhZ2UnKTsKIAotZGVmaW5lKCdBU1NP Q19UWVBFX1JPTEUnLCAweDAxMDAwMDEpOworZGVmaW5lKCdBU1NPQ19UWVBFX1VTRVInLAkweDAw MDAxMDAwKTsgLy8gVGhpcyB2YWx1ZSB1c2VkIGJlY2F1c2Ugb2YgYnVnICM2MDY4CiBkZWZpbmUo J0FTU09DX1RZUEVfVVNFUl9HUk9VUCcsIDB4MDEwMDAwMik7CiAKIGRlZmluZSgnQVNTT0NfVFlQ RV9DSVRBVElPTicsIDB4MDEwMDAwMyk7CmRpZmYgLS1naXQgYS9jbGFzc2VzL3NlY3VyaXR5L1Vz ZXJHcm91cERBTy5pbmMucGhwIGIvY2xhc3Nlcy9zZWN1cml0eS9Vc2VyR3JvdXBEQU8uaW5jLnBo cAppbmRleCAzYmMyYTQyLi42ZmQ4YzFlIDEwMDc1NQotLS0gYS9jbGFzc2VzL3NlY3VyaXR5L1Vz ZXJHcm91cERBTy5pbmMucGhwCisrKyBiL2NsYXNzZXMvc2VjdXJpdHkvVXNlckdyb3VwREFPLmlu Yy5waHAKQEAgLTM1Miw3ICszNTIsNyBAQCBjbGFzcyBVc2VyR3JvdXBEQU8gZXh0ZW5kcyBEQU8g ewogCWZ1bmN0aW9uICZnZXRVc2Vyc0J5SWQoJHVzZXJHcm91cElkID0gbnVsbCwgJHByZXNzSWQg PSBudWxsLCAkc2VhcmNoVHlwZSA9IG51bGwsICRzZWFyY2ggPSBudWxsLCAkc2VhcmNoTWF0Y2gg PSBudWxsLCAkZGJSZXN1bHRSYW5nZSA9IG51bGwpIHsKIAkJJHVzZXJzID0gYXJyYXkoKTsKIAot CQkkcGFyYW1BcnJheSA9IGFycmF5KCdpbnRlcmVzdCcpOworCQkkcGFyYW1BcnJheSA9IGFycmF5 KEFTU09DX1RZUEVfVVNFUiwgJ2ludGVyZXN0Jyk7CiAJCWlmIChpc3NldCgkdXNlckdyb3VwSWQp KSAkcGFyYW1BcnJheVtdID0gKGludCkgJHVzZXJHcm91cElkOwogCQlpZiAoaXNzZXQoJHByZXNz SWQpKSAkcGFyYW1BcnJheVtdID0gKGludCkgJHByZXNzSWQ7CiAJCS8vIEZvciBzZWN1cml0eSAv IHJlc291cmNlIHVzYWdlIHJlYXNvbnMsIGEgdXNlciBncm91cCBvciBwcmVzcyBJRApAQCAtNDAw LDcgKzQwMCw3IEBAIGNsYXNzIFVzZXJHcm91cERBTyBleHRlbmRzIERBTyB7CiAKIAkJJHJlc3Vs dCA9JiAkdGhpcy0+cmV0cmlldmVSYW5nZSgKIAkJCSdTRUxFQ1QgRElTVElOQ1QgdS4qIEZST00g dXNlcnMgQVMgdQotCQkJTEVGVCBKT0lOIGNvbnRyb2xsZWRfdm9jYWJzIGN2IE9OIChjdi5hc3Nv Y19pZCA9IHUudXNlcl9pZCBBTkQgY3Yuc3ltYm9saWMgPSA/KQorCQkJTEVGVCBKT0lOIGNvbnRy b2xsZWRfdm9jYWJzIGN2IE9OIChjdi5hc3NvY190eXBlID0gPyBBTkQgY3YuYXNzb2NfaWQgPSB1 LnVzZXJfaWQgQU5EIGN2LnN5bWJvbGljID0gPykKIAkJCQlMRUZUIEpPSU4gY29udHJvbGxlZF92 b2NhYl9lbnRyaWVzIGN2ZSBPTiAoY3ZlLmNvbnRyb2xsZWRfdm9jYWJfaWQgPSBjdi5jb250cm9s bGVkX3ZvY2FiX2lkKQogCQkJCUxFRlQgSk9JTiBjb250cm9sbGVkX3ZvY2FiX2VudHJ5X3NldHRp bmdzIGN2ZXMgT04gKGN2ZXMuY29udHJvbGxlZF92b2NhYl9lbnRyeV9pZCA9IGN2ZS5jb250cm9s bGVkX3ZvY2FiX2VudHJ5X2lkKSwgdXNlcl9ncm91cHMgQVMgdWcsIHVzZXJfdXNlcl9ncm91cHMg QVMgdXVnCiAJCQkJV0hFUkUgdWcudXNlcl9ncm91cF9pZCA9IHV1Zy51c2VyX2dyb3VwX2lkIEFO RCB1LnVzZXJfaWQgPSB1dWcudXNlcl9pZCcgLiAoaXNzZXQoJHVzZXJHcm91cElkKSA/ICcgQU5E IHVnLnVzZXJfZ3JvdXBfaWQgPSA/JyA6ICcnKSAuIChpc3NldCgkcHJlc3NJZCkgPyAnIEFORCB1 Zy5wcmVzc19pZCA9ID8nIDogJycpIC4gJyAnIC4gJHNlYXJjaFNxbCwKZGlmZiAtLWdpdCBhL2Ns YXNzZXMvdXNlci9JbnRlcmVzdERBTy5pbmMucGhwIGIvY2xhc3Nlcy91c2VyL0ludGVyZXN0REFP LmluYy5waHAKaW5kZXggYzhlYTc2MS4uOGRlNjU3OCAxMDA2NDQKLS0tIGEvY2xhc3Nlcy91c2Vy L0ludGVyZXN0REFPLmluYy5waHAKKysrIGIvY2xhc3Nlcy91c2VyL0ludGVyZXN0REFPLmluYy5w aHAKQEAgLTIyLDcgKzIyLDcgQEAgZGVmaW5lKCdDT05UUk9MTEVEX1ZPQ0FCX0lOVEVSRVNUJywg J2ludGVyZXN0Jyk7CiBjbGFzcyBJbnRlcmVzdERBTyBleHRlbmRzIENvbnRyb2xsZWRWb2NhYkRB TyB7CiAKIAlmdW5jdGlvbiBidWlsZCgkdXNlcklkKSB7Ci0JCXJldHVybiBwYXJlbnQ6OmJ1aWxk KENPTlRST0xMRURfVk9DQUJfSU5URVJFU1QsIFJPTEVfSURfUkVWSUVXRVIsICR1c2VySWQpOwor CQlyZXR1cm4gcGFyZW50OjpidWlsZChDT05UUk9MTEVEX1ZPQ0FCX0lOVEVSRVNULCBBU1NPQ19U WVBFX1VTRVIsICR1c2VySWQpOwogCX0KIAogCWZ1bmN0aW9uIGdldEludGVyZXN0cygkdXNlcklk KSB7CmRpZmYgLS1naXQgYS9jbGFzc2VzL3VzZXIvUEtQVXNlckRBTy5pbmMucGhwIGIvY2xhc3Nl cy91c2VyL1BLUFVzZXJEQU8uaW5jLnBocAppbmRleCAwYjUxZDRiLi40ZGU3ZjQyIDEwMDY0NAot LS0gYS9jbGFzc2VzL3VzZXIvUEtQVXNlckRBTy5pbmMucGhwCisrKyBiL2NsYXNzZXMvdXNlci9Q S1BVc2VyREFPLmluYy5waHAKQEAgLTQwNCw3ICs0MDQsNyBAQCBjbGFzcyBQS1BVc2VyREFPIGV4 dGVuZHMgREFPIHsKIAkJCQlicmVhazsKIAkJCWNhc2UgVVNFUl9GSUVMRF9JTlRFUkVTVFM6CiAJ CQkJJHNxbCAuPScsIGNvbnRyb2xsZWRfdm9jYWJzIGN2LCBjb250cm9sbGVkX3ZvY2FiX2VudHJp ZXMgY3ZlLCBjb250cm9sbGVkX3ZvY2FiX2VudHJ5X3NldHRpbmdzIGN2ZXMKLQkJCQkJV0hFUkUg Y3Yuc3ltYm9saWMgPSBcJ2ludGVyZXN0XCcgQU5EIGN2LmFzc29jX2lkID0gdS51c2VyX2lkIEFO RCBjdmUuY29udHJvbGxlZF92b2NhYl9pZCA9IGN2LmNvbnRyb2xsZWRfdm9jYWJfaWQKKwkJCQkJ V0hFUkUgY3YuYXNzb2NfdHlwZSA9ICcgLiBBU1NPQ19UWVBFX1VTRVIgLiAnIEFORCBjdi5zeW1i b2xpYyA9IFwnaW50ZXJlc3RcJyBBTkQgY3YuYXNzb2NfaWQgPSB1LnVzZXJfaWQgQU5EIGN2ZS5j b250cm9sbGVkX3ZvY2FiX2lkID0gY3YuY29udHJvbGxlZF92b2NhYl9pZAogCQkJCQlBTkQgY3Zl cy5jb250cm9sbGVkX3ZvY2FiX2VudHJ5X2lkID0gY3ZlLmNvbnRyb2xsZWRfdm9jYWJfZW50cnlf aWQgQU5EIExPV0VSKGN2ZXMuc2V0dGluZ192YWx1ZSkgJyAuICgkbWF0Y2ggPT0gJ2lzJyA/ICc9 JyA6ICdMSUtFJykgLiAnIExPV0VSKD8pJzsKIAkJCQkkdmFyID0gJG1hdGNoID09ICdpcycgPyAk dmFsdWUgOiAiJSR2YWx1ZSUiOwogCQkJCWJyZWFrOwo= 3298 2010-10-25 14:13:00 -0700 2010-10-25 14:13:06 -0700 Patch against OCS pre-2.3.4 6068.diff text/plain 6270 alec ZGlmZiAtLWdpdCBhL2NsYXNzZXMvc2VjdXJpdHkvUm9sZURBTy5pbmMucGhwIGIvY2xhc3Nlcy9z ZWN1cml0eS9Sb2xlREFPLmluYy5waHAKaW5kZXggODZhOTBhMS4uZjExZjQ0ZSAxMDA2NDQKLS0t IGEvY2xhc3Nlcy9zZWN1cml0eS9Sb2xlREFPLmluYy5waHAKKysrIGIvY2xhc3Nlcy9zZWN1cml0 eS9Sb2xlREFPLmluYy5waHAKQEAgLTE1OCw3ICsxNTgsNyBAQCBjbGFzcyBSb2xlREFPIGV4dGVu ZHMgREFPIHsKIAogCQkkdXNlcnMgPSBhcnJheSgpOwogCi0JCSRwYXJhbUFycmF5ID0gYXJyYXko J2ludGVyZXN0Jyk7CisJCSRwYXJhbUFycmF5ID0gYXJyYXkoQVNTT0NfVFlQRV9VU0VSLCAnaW50 ZXJlc3QnKTsKIAkJaWYgKGlzc2V0KCRyb2xlSWQpKSAkcGFyYW1BcnJheVtdID0gKGludCkgJHJv bGVJZDsKIAkJaWYgKGlzc2V0KCRjb25mZXJlbmNlSWQpKSAkcGFyYW1BcnJheVtdID0gKGludCkg JGNvbmZlcmVuY2VJZDsKIAkJaWYgKGlzc2V0KCRzY2hlZENvbmZJZCkpICRwYXJhbUFycmF5W10g PSAoaW50KSAkc2NoZWRDb25mSWQ7CkBAIC0yMDcsNyArMjA3LDcgQEAgY2xhc3MgUm9sZURBTyBl eHRlbmRzIERBTyB7CiAJCSRzZWFyY2hTcWwgLj0gKCRzb3J0Qnk/KCcgT1JERVIgQlkgJyAuICR0 aGlzLT5nZXRTb3J0TWFwcGluZygkc29ydEJ5KSAuICcgJyAuICR0aGlzLT5nZXREaXJlY3Rpb25N YXBwaW5nKCRzb3J0RGlyZWN0aW9uKSkgOiAnJyk7CiAKIAkJJHJlc3VsdCA9JiAkdGhpcy0+cmV0 cmlldmVSYW5nZSgKLQkJCSdTRUxFQ1QgRElTVElOQ1QgdS4qIEZST00gdXNlcnMgQVMgdSBMRUZU IEpPSU4gY29udHJvbGxlZF92b2NhYnMgY3YgT04gKGN2LmFzc29jX2lkID0gdS51c2VyX2lkIEFO RCBjdi5zeW1ib2xpYyA9ID8pCisJCQknU0VMRUNUIERJU1RJTkNUIHUuKiBGUk9NIHVzZXJzIEFT IHUgTEVGVCBKT0lOIGNvbnRyb2xsZWRfdm9jYWJzIGN2IE9OIChjdi5hc3NvY190eXBlID0gPyBB TkQgY3YuYXNzb2NfaWQgPSB1LnVzZXJfaWQgQU5EIGN2LnN5bWJvbGljID0gPykKIAkJCQlMRUZU IEpPSU4gY29udHJvbGxlZF92b2NhYl9lbnRyaWVzIGN2ZSBPTiAoY3ZlLmNvbnRyb2xsZWRfdm9j YWJfaWQgPSBjdi5jb250cm9sbGVkX3ZvY2FiX2lkKQogCQkJCUxFRlQgSk9JTiBjb250cm9sbGVk X3ZvY2FiX2VudHJ5X3NldHRpbmdzIGN2ZXMgT04gKGN2ZXMuY29udHJvbGxlZF92b2NhYl9lbnRy eV9pZCA9IGN2ZS5jb250cm9sbGVkX3ZvY2FiX2VudHJ5X2lkKSwKIAkJCQlyb2xlcyBBUyByIFdI RVJFIHUudXNlcl9pZCA9IHIudXNlcl9pZCAnIC4KQEAgLTIzNSw3ICsyMzUsNyBAQCBjbGFzcyBS b2xlREFPIGV4dGVuZHMgREFPIHsKIAlmdW5jdGlvbiAmZ2V0VXNlcnNCeUNvbmZlcmVuY2VJZCgk Y29uZmVyZW5jZUlkLCAkc2VhcmNoVHlwZSA9IG51bGwsICRzZWFyY2ggPSBudWxsLCAkc2VhcmNo TWF0Y2ggPSBudWxsLCAkZGJSZXN1bHRSYW5nZSA9IG51bGwsICRzb3J0QnkgPSBudWxsLCAkc29y dERpcmVjdGlvbiA9IFNPUlRfRElSRUNUSU9OX0FTQykgewogCQkkdXNlcnMgPSBhcnJheSgpOwog Ci0JCSRwYXJhbUFycmF5ID0gYXJyYXkoJ2ludGVyZXN0JywgKGludCkgJGNvbmZlcmVuY2VJZCk7 CisJCSRwYXJhbUFycmF5ID0gYXJyYXkoQVNTT0NfVFlQRV9VU0VSLCAnaW50ZXJlc3QnLCAoaW50 KSAkY29uZmVyZW5jZUlkKTsKIAkJJHNlYXJjaFNxbCA9ICcnOwogCiAJCSRzZWFyY2hUeXBlTWFw ID0gYXJyYXkoCkBAIC0yNzcsNyArMjc3LDcgQEAgY2xhc3MgUm9sZURBTyBleHRlbmRzIERBTyB7 CiAKIAkJJHJlc3VsdCA9JiAkdGhpcy0+cmV0cmlldmVSYW5nZSgKIAotCQkJJ1NFTEVDVCBESVNU SU5DVCB1LiogRlJPTSB1c2VycyBBUyB1IExFRlQgSk9JTiBjb250cm9sbGVkX3ZvY2FicyBjdiBP TiAoY3YuYXNzb2NfaWQgPSB1LnVzZXJfaWQgQU5EIGN2LnN5bWJvbGljID0gPykKKwkJCSdTRUxF Q1QgRElTVElOQ1QgdS4qIEZST00gdXNlcnMgQVMgdSBMRUZUIEpPSU4gY29udHJvbGxlZF92b2Nh YnMgY3YgT04gKGN2LmFzc29jX3R5cGUgPSA/IEFORCBjdi5hc3NvY19pZCA9IHUudXNlcl9pZCBB TkQgY3Yuc3ltYm9saWMgPSA/KQogCQkJCUxFRlQgSk9JTiBjb250cm9sbGVkX3ZvY2FiX2VudHJp ZXMgY3ZlIE9OIChjdmUuY29udHJvbGxlZF92b2NhYl9pZCA9IGN2LmNvbnRyb2xsZWRfdm9jYWJf aWQpCiAJCQkJTEVGVCBKT0lOIGNvbnRyb2xsZWRfdm9jYWJfZW50cnlfc2V0dGluZ3MgY3ZlcyBP TiAoY3Zlcy5jb250cm9sbGVkX3ZvY2FiX2VudHJ5X2lkID0gY3ZlLmNvbnRyb2xsZWRfdm9jYWJf ZW50cnlfaWQpLAogCQkJCXJvbGVzIEFTIHIgV0hFUkUgdS51c2VyX2lkID0gci51c2VyX2lkIEFO RCByLmNvbmZlcmVuY2VfaWQgPSA/ICcgLiAkc2VhcmNoU3FsLApAQCAtMzAxLDcgKzMwMSw3IEBA IGNsYXNzIFJvbGVEQU8gZXh0ZW5kcyBEQU8gewogCWZ1bmN0aW9uICZnZXRVc2Vyc0J5U2NoZWRD b25mSWQoJHNjaGVkQ29uZklkLCAkc2VhcmNoVHlwZSA9IG51bGwsICRzZWFyY2ggPSBudWxsLCAk c2VhcmNoTWF0Y2ggPSBudWxsLCAkZGJSZXN1bHRSYW5nZSA9IG51bGwsICRzb3J0QnkgPSBudWxs LCAkc29ydERpcmVjdGlvbiA9IFNPUlRfRElSRUNUSU9OX0FTQykgewogCQkkdXNlcnMgPSBhcnJh eSgpOwogCi0JCSRwYXJhbUFycmF5ID0gYXJyYXkoJ2ludGVyZXN0JywgKGludCkgJHNjaGVkQ29u ZklkKTsKKwkJJHBhcmFtQXJyYXkgPSBhcnJheShBU1NPQ19UWVBFX1VTRVIsICdpbnRlcmVzdCcs IChpbnQpICRzY2hlZENvbmZJZCk7CiAJCSRzZWFyY2hTcWwgPSAnJzsKIAogCQlpZiAoIWVtcHR5 KCRzZWFyY2gpKSBzd2l0Y2ggKCRzZWFyY2hUeXBlKSB7CkBAIC0zMzksNyArMzM5LDcgQEAgY2xh c3MgUm9sZURBTyBleHRlbmRzIERBTyB7CiAKIAkJJHJlc3VsdCA9JiAkdGhpcy0+cmV0cmlldmVS YW5nZSgKIAotCQkJJ1NFTEVDVCBESVNUSU5DVCB1LiogRlJPTSB1c2VycyBBUyB1IExFRlQgSk9J TiBjb250cm9sbGVkX3ZvY2FicyBjdiBPTiAoY3YuYXNzb2NfaWQgPSB1LnVzZXJfaWQgQU5EIGN2 LnN5bWJvbGljID0gPykKKwkJCSdTRUxFQ1QgRElTVElOQ1QgdS4qIEZST00gdXNlcnMgQVMgdSBM RUZUIEpPSU4gY29udHJvbGxlZF92b2NhYnMgY3YgT04gKGN2LmFzc29jX3R5cGUgPSA/IEFORCBj di5hc3NvY19pZCA9IHUudXNlcl9pZCBBTkQgY3Yuc3ltYm9saWMgPSA/KQogCQkJCUxFRlQgSk9J TiBjb250cm9sbGVkX3ZvY2FiX2VudHJpZXMgY3ZlIE9OIChjdmUuY29udHJvbGxlZF92b2NhYl9p ZCA9IGN2LmNvbnRyb2xsZWRfdm9jYWJfaWQpCiAJCQkJTEVGVCBKT0lOIGNvbnRyb2xsZWRfdm9j YWJfZW50cnlfc2V0dGluZ3MgY3ZlcyBPTiAoY3Zlcy5jb250cm9sbGVkX3ZvY2FiX2VudHJ5X2lk ID0gY3ZlLmNvbnRyb2xsZWRfdm9jYWJfZW50cnlfaWQpLAogCQkJCXJvbGVzIEFTIHIgV0hFUkUg dS51c2VyX2lkID0gci51c2VyX2lkIEFORCByLnNjaGVkX2NvbmZfaWQgPSA/ICcgLiAkc2VhcmNo U3FsLApkaWZmIC0tZ2l0IGEvY2xhc3Nlcy9zdWJtaXNzaW9uL2RpcmVjdG9yL0RpcmVjdG9yU3Vi bWlzc2lvbkRBTy5pbmMucGhwIGIvY2xhc3Nlcy9zdWJtaXNzaW9uL2RpcmVjdG9yL0RpcmVjdG9y U3VibWlzc2lvbkRBTy5pbmMucGhwCmluZGV4IDU3OWJiZWYuLjc3OTUwODAgMTAwNjQ0Ci0tLSBh L2NsYXNzZXMvc3VibWlzc2lvbi9kaXJlY3Rvci9EaXJlY3RvclN1Ym1pc3Npb25EQU8uaW5jLnBo cAorKysgYi9jbGFzc2VzL3N1Ym1pc3Npb24vZGlyZWN0b3IvRGlyZWN0b3JTdWJtaXNzaW9uREFP LmluYy5waHAKQEAgLTUxOCw2ICs1MTgsNyBAQCBjbGFzcyBEaXJlY3RvclN1Ym1pc3Npb25EQU8g ZXh0ZW5kcyBEQU8gewogCQkkdXNlcnMgPSBhcnJheSgpOwogCiAJCSRwYXJhbUFycmF5ID0gYXJy YXkoCisJCQlBU1NPQ19UWVBFX1VTRVIsCiAJCQknaW50ZXJlc3QnLAogCQkJJHBhcGVySWQsCiAJ CQkkc2NoZWRDb25mSWQsCkBAIC01NjcsNyArNTY4LDcgQEAgY2xhc3MgRGlyZWN0b3JTdWJtaXNz aW9uREFPIGV4dGVuZHMgREFPIHsKIAkJCQl1LioKIAkJCUZST00JdXNlcnMgdQogCQkJCUxFRlQg Sk9JTiByb2xlcyByIE9OIChyLnVzZXJfaWQgPSB1LnVzZXJfaWQpCi0JCQkJTEVGVCBKT0lOIGNv bnRyb2xsZWRfdm9jYWJzIGN2IE9OIChjdi5hc3NvY19pZCA9IHUudXNlcl9pZCBBTkQgY3Yuc3lt Ym9saWMgPSA/KQorCQkJCUxFRlQgSk9JTiBjb250cm9sbGVkX3ZvY2FicyBjdiBPTiAoY3YuYXNz b2NfdHlwZSA9ID8gQU5EIGN2LmFzc29jX2lkID0gdS51c2VyX2lkIEFORCBjdi5zeW1ib2xpYyA9 ID8pCiAJCQkJTEVGVCBKT0lOIGNvbnRyb2xsZWRfdm9jYWJfZW50cmllcyBjdmUgT04gKGN2ZS5j b250cm9sbGVkX3ZvY2FiX2lkID0gY3YuY29udHJvbGxlZF92b2NhYl9pZCkKIAkJCQlMRUZUIEpP SU4gY29udHJvbGxlZF92b2NhYl9lbnRyeV9zZXR0aW5ncyBjdmVzIE9OIChjdmVzLmNvbnRyb2xs ZWRfdm9jYWJfZW50cnlfaWQgPSBjdmUuY29udHJvbGxlZF92b2NhYl9lbnRyeV9pZCkKIAkJCQlM RUZUIEpPSU4gZWRpdF9hc3NpZ25tZW50cyBlIE9OIChlLmRpcmVjdG9yX2lkID0gdS51c2VyX2lk IEFORCBlLnBhcGVyX2lkID0gPykKZGlmZiAtLWdpdCBhL2NsYXNzZXMvc3VibWlzc2lvbi90cmFj a0RpcmVjdG9yL1RyYWNrRGlyZWN0b3JTdWJtaXNzaW9uREFPLmluYy5waHAgYi9jbGFzc2VzL3N1 Ym1pc3Npb24vdHJhY2tEaXJlY3Rvci9UcmFja0RpcmVjdG9yU3VibWlzc2lvbkRBTy5pbmMucGhw CmluZGV4IDVhYTFiMzAuLjNhNjllZWEgMTAwNjQ0Ci0tLSBhL2NsYXNzZXMvc3VibWlzc2lvbi90 cmFja0RpcmVjdG9yL1RyYWNrRGlyZWN0b3JTdWJtaXNzaW9uREFPLmluYy5waHAKKysrIGIvY2xh c3Nlcy9zdWJtaXNzaW9uL3RyYWNrRGlyZWN0b3IvVHJhY2tEaXJlY3RvclN1Ym1pc3Npb25EQU8u aW5jLnBocApAQCAtNjU3LDcgKzY1Nyw3IEBAIGNsYXNzIFRyYWNrRGlyZWN0b3JTdWJtaXNzaW9u REFPIGV4dGVuZHMgREFPIHsKIAkgKiBAcmV0dXJuIERBT1Jlc3VsdEZhY3RvcnkgY29udGFpbmlu ZyBtYXRjaGluZyBVc2VycwogCSAqLwogCWZ1bmN0aW9uICZnZXRSZXZpZXdlcnNGb3JQYXBlcigk c2NoZWRDb25mSWQsICRwYXBlcklkLCAkcm91bmQsICRzZWFyY2hUeXBlID0gbnVsbCwgJHNlYXJj aCA9IG51bGwsICRzZWFyY2hNYXRjaCA9IG51bGwsICRyYW5nZUluZm8gPSBudWxsLCAkc29ydEJ5 ID0gbnVsbCwgJHNvcnREaXJlY3Rpb24gPSBTT1JUX0RJUkVDVElPTl9BU0MpIHsKLQkJJHBhcmFt QXJyYXkgPSBhcnJheSgkcGFwZXJJZCwgJHJvdW5kLCAnaW50ZXJlc3QnLCAkc2NoZWRDb25mSWQs IFJvbGVEQU86OmdldFJvbGVJZEZyb21QYXRoKCdyZXZpZXdlcicpKTsKKwkJJHBhcmFtQXJyYXkg PSBhcnJheSgkcGFwZXJJZCwgJHJvdW5kLCBBU1NPQ19UWVBFX1VTRVIsICdpbnRlcmVzdCcsICRz Y2hlZENvbmZJZCwgUm9sZURBTzo6Z2V0Um9sZUlkRnJvbVBhdGgoJ3Jldmlld2VyJykpOwogCQkk c2VhcmNoU3FsID0gJyc7CiAKIAkJJHNlYXJjaFR5cGVNYXAgPSBhcnJheSgKQEAgLTcxMyw3ICs3 MTMsNyBAQCBjbGFzcyBUcmFja0RpcmVjdG9yU3VibWlzc2lvbkRBTyBleHRlbmRzIERBTyB7CiAJ CQkJTEVGVCBKT0lOIHJldmlld19hc3NpZ25tZW50cyBhciBPTiAoYXIucmV2aWV3ZXJfaWQgPSB1 LnVzZXJfaWQgQU5EIGFyLmNhbmNlbGxlZCA9IDAgQU5EIGFyLnN1Ym1pc3Npb25faWQgPSA/IEFO RCBhci5yb3VuZCA9ID8pCiAJCQkJTEVGVCBKT0lOIHJvbGVzIHIgT04gKHIudXNlcl9pZCA9IHUu dXNlcl9pZCkKIAkJCQlMRUZUIEpPSU4gcGFwZXJzIHAgT04gKGEuc3VibWlzc2lvbl9pZCA9IHAu cGFwZXJfaWQpCi0JCQkJTEVGVCBKT0lOIGNvbnRyb2xsZWRfdm9jYWJzIGN2IE9OIChjdi5hc3Nv Y19pZCA9IHUudXNlcl9pZCBBTkQgY3Yuc3ltYm9saWMgPSA/KQorCQkJCUxFRlQgSk9JTiBjb250 cm9sbGVkX3ZvY2FicyBjdiBPTiAoY3YuYXNzb2NfdHlwZSA9ID8gQU5EIGN2LmFzc29jX2lkID0g dS51c2VyX2lkIEFORCBjdi5zeW1ib2xpYyA9ID8pCiAJCQkJTEVGVCBKT0lOIGNvbnRyb2xsZWRf dm9jYWJfZW50cmllcyBjdmUgT04gKGN2ZS5jb250cm9sbGVkX3ZvY2FiX2lkID0gY3YuY29udHJv bGxlZF92b2NhYl9pZCkKIAkJCQlMRUZUIEpPSU4gY29udHJvbGxlZF92b2NhYl9lbnRyeV9zZXR0 aW5ncyBjdmVzIE9OIChjdmVzLmNvbnRyb2xsZWRfdm9jYWJfZW50cnlfaWQgPSBjdmUuY29udHJv bGxlZF92b2NhYl9lbnRyeV9pZCkKIAkJCVdIRVJFCXUudXNlcl9pZCA9IHIudXNlcl9pZCBBTkQK 3299 2010-10-25 14:15:00 -0700 2010-10-25 14:15:24 -0700 Patch against OMP pre-release 6068.diff text/plain 3892 alec ZGlmZiAtLWdpdCBhL2NsYXNzZXMvc2VjdXJpdHkvUm9sZURBTy5pbmMucGhwIGIvY2xhc3Nlcy9z ZWN1cml0eS9Sb2xlREFPLmluYy5waHAKaW5kZXggOGRhOTM5Ny4uYTVlYTA0MSAxMDA3NTUKLS0t IGEvY2xhc3Nlcy9zZWN1cml0eS9Sb2xlREFPLmluYy5waHAKKysrIGIvY2xhc3Nlcy9zZWN1cml0 eS9Sb2xlREFPLmluYy5waHAKQEAgLTQxLDcgKzQxLDcgQEAgY2xhc3MgUm9sZURBTyBleHRlbmRz IERBTyB7CiAJZnVuY3Rpb24gJmdldFVzZXJzQnlSb2xlSWQoJHJvbGVJZCA9IG51bGwsICRwcmVz c0lkID0gbnVsbCwgJHNlYXJjaFR5cGUgPSBudWxsLCAkc2VhcmNoID0gbnVsbCwgJHNlYXJjaE1h dGNoID0gbnVsbCwgJGRiUmVzdWx0UmFuZ2UgPSBudWxsKSB7CiAJCSR1c2VycyA9IGFycmF5KCk7 CiAKLQkJJHBhcmFtQXJyYXkgPSBhcnJheSgnaW50ZXJlc3QnKTsKKwkJJHBhcmFtQXJyYXkgPSBh cnJheShBU1NPQ19UWVBFX1VTRVIsICdpbnRlcmVzdCcpOwogCQlpZiAoaXNzZXQoJHJvbGVJZCkp ICRwYXJhbUFycmF5W10gPSAoaW50KSAkcm9sZUlkOwogCQlpZiAoaXNzZXQoJHByZXNzSWQpKSAk cGFyYW1BcnJheVtdID0gKGludCkgJHByZXNzSWQ7CiAJCS8vIEZvciBzZWN1cml0eSAvIHJlc291 cmNlIHVzYWdlIHJlYXNvbnMsIGEgcm9sZSBvciBwcmVzcyBJRApAQCAtODgsNyArODgsNyBAQCBj bGFzcyBSb2xlREFPIGV4dGVuZHMgREFPIHsKIAkJJHNlYXJjaFNxbCAuPSAnIE9SREVSIEJZIHUu bGFzdF9uYW1lLCB1LmZpcnN0X25hbWUnOyAvLyBGSVhNRSBBZGQgInNvcnQgZmllbGQiIHBhcmFt ZXRlcj8KIAogCQkkcmVzdWx0ID0mICR0aGlzLT5yZXRyaWV2ZVJhbmdlKAotCQkJJ1NFTEVDVCBE SVNUSU5DVCB1LiogRlJPTSB1c2VycyBBUyB1IExFRlQgSk9JTiBjb250cm9sbGVkX3ZvY2FicyBj diBPTiAoY3YuYXNzb2NfaWQgPSB1LnVzZXJfaWQgQU5EIGN2LnN5bWJvbGljID0gPykKKwkJCSdT RUxFQ1QgRElTVElOQ1QgdS4qIEZST00gdXNlcnMgQVMgdSBMRUZUIEpPSU4gY29udHJvbGxlZF92 b2NhYnMgY3YgT04gKGN2LmFzc29jX3R5cGUgPSA/IEFORCBjdi5hc3NvY19pZCA9IHUudXNlcl9p ZCBBTkQgY3Yuc3ltYm9saWMgPSA/KQogCQkJTEVGVCBKT0lOIGNvbnRyb2xsZWRfdm9jYWJfZW50 cmllcyBjdmUgT04gKGN2ZS5jb250cm9sbGVkX3ZvY2FiX2lkID0gY3YuY29udHJvbGxlZF92b2Nh Yl9pZCkKIAkJCUxFRlQgSk9JTiBjb250cm9sbGVkX3ZvY2FiX2VudHJ5X3NldHRpbmdzIGN2ZXMg T04gKGN2ZXMuY29udHJvbGxlZF92b2NhYl9lbnRyeV9pZCA9IGN2ZS5jb250cm9sbGVkX3ZvY2Fi X2VudHJ5X2lkKSwKIAkJCXVzZXJfZ3JvdXBzIEFTIHVnLCB1c2VyX3VzZXJfZ3JvdXBzIEFTIHV1 ZwpkaWZmIC0tZ2l0IGEvY2xhc3Nlcy9zdWJtaXNzaW9uL2VkaXRvci9FZGl0b3JTdWJtaXNzaW9u REFPLmluYy5waHAgYi9jbGFzc2VzL3N1Ym1pc3Npb24vZWRpdG9yL0VkaXRvclN1Ym1pc3Npb25E QU8uaW5jLnBocAppbmRleCBkNjI0MDJmLi5iZGQ2OWZhIDEwMDY0NAotLS0gYS9jbGFzc2VzL3N1 Ym1pc3Npb24vZWRpdG9yL0VkaXRvclN1Ym1pc3Npb25EQU8uaW5jLnBocAorKysgYi9jbGFzc2Vz L3N1Ym1pc3Npb24vZWRpdG9yL0VkaXRvclN1Ym1pc3Npb25EQU8uaW5jLnBocApAQCAtNjA3LDcg KzYwNyw3IEBAIGNsYXNzIEVkaXRvclN1Ym1pc3Npb25EQU8gZXh0ZW5kcyBEQU8gewogCWZ1bmN0 aW9uICZnZXRVc2Vyc05vdEFzc2lnbmVkVG9Nb25vZ3JhcGgoJHByZXNzSWQsICRtb25vZ3JhcGhJ ZCwgJHJvbGVJZCwgJHNlYXJjaFR5cGU9bnVsbCwgJHNlYXJjaD1udWxsLCAkc2VhcmNoTWF0Y2g9 bnVsbCwgJHJhbmdlSW5mbyA9IG51bGwpIHsKIAkJJHVzZXJzID0gYXJyYXkoKTsKIAotCQkkcGFy YW1BcnJheSA9IGFycmF5KCdpbnRlcmVzdCcsICRtb25vZ3JhcGhJZCwgJHByZXNzSWQsICRyb2xl SWQpOworCQkkcGFyYW1BcnJheSA9IGFycmF5KEFTU09DX1RZUEVfVVNFUiwgJ2ludGVyZXN0Jywg JG1vbm9ncmFwaElkLCAkcHJlc3NJZCwgJHJvbGVJZCk7CiAJCSRzZWFyY2hTcWwgPSAnJzsKIAog CQkkc2VhcmNoVHlwZU1hcCA9IGFycmF5KApAQCAtNjcwLDcgKzY3MCw3IEBAIGNsYXNzIEVkaXRv clN1Ym1pc3Npb25EQU8gZXh0ZW5kcyBEQU8gewogCQkJJ1NFTEVDVCBESVNUSU5DVAogCQkJCXUu KgogCQkJRlJPTQl1c2VycyB1Ci0JCQkJTEVGVCBKT0lOIGNvbnRyb2xsZWRfdm9jYWJzIGN2IE9O IChjdi5hc3NvY19pZCA9IHUudXNlcl9pZCBBTkQgY3Yuc3ltYm9saWMgPSA/KQorCQkJCUxFRlQg Sk9JTiBjb250cm9sbGVkX3ZvY2FicyBjdiBPTiAoY3YuYXNzb2NfdHlwZSA9ID8gQU5EIGN2LmFz c29jX2lkID0gdS51c2VyX2lkIEFORCBjdi5zeW1ib2xpYyA9ID8pCiAJCQkJTEVGVCBKT0lOIGNv bnRyb2xsZWRfdm9jYWJfZW50cmllcyBjdmUgT04gKGN2ZS5jb250cm9sbGVkX3ZvY2FiX2lkID0g Y3YuY29udHJvbGxlZF92b2NhYl9pZCkKIAkJCQlMRUZUIEpPSU4gY29udHJvbGxlZF92b2NhYl9l bnRyeV9zZXR0aW5ncyBjdmVzIE9OIChjdmVzLmNvbnRyb2xsZWRfdm9jYWJfZW50cnlfaWQgPSBj dmUuY29udHJvbGxlZF92b2NhYl9lbnRyeV9pZCkKIAkJCQlMRUZUIEpPSU4gcm9sZXMgciBPTiAo ci51c2VyX2lkID0gdS51c2VyX2lkKQpkaWZmIC0tZ2l0IGEvY2xhc3Nlcy9zdWJtaXNzaW9uL3Nl cmllc0VkaXRvci9TZXJpZXNFZGl0b3JTdWJtaXNzaW9uREFPLmluYy5waHAgYi9jbGFzc2VzL3N1 Ym1pc3Npb24vc2VyaWVzRWRpdG9yL1Nlcmllc0VkaXRvclN1Ym1pc3Npb25EQU8uaW5jLnBocApp bmRleCBmN2NlNzcwLi4yYWVlYWNkIDEwMDY0NAotLS0gYS9jbGFzc2VzL3N1Ym1pc3Npb24vc2Vy aWVzRWRpdG9yL1Nlcmllc0VkaXRvclN1Ym1pc3Npb25EQU8uaW5jLnBocAorKysgYi9jbGFzc2Vz L3N1Ym1pc3Npb24vc2VyaWVzRWRpdG9yL1Nlcmllc0VkaXRvclN1Ym1pc3Npb25EQU8uaW5jLnBo cApAQCAtODIwLDcgKzgyMCw3IEBAIGNsYXNzIFNlcmllc0VkaXRvclN1Ym1pc3Npb25EQU8gZXh0 ZW5kcyBEQU8gewogCQkkdXNlcnMgPSBhcnJheSgpOwogCiAJCSRwYXJhbUFycmF5ID0gYXJyYXko Ci0JCQkJJ2ludGVyZXN0JywgJG1vbm9ncmFwaElkLCBBU1NPQ19UWVBFX01PTk9HUkFQSCwKKwkJ CQlBU1NPQ19UWVBFX1VTRVIsICdpbnRlcmVzdCcsICRtb25vZ3JhcGhJZCwgQVNTT0NfVFlQRV9N T05PR1JBUEgsCiAJCQkJJ1NJR05PRkZfQ09QWUVESVRJTkdfSU5JVElBTCcsCiAJCQkJJHByZXNz SWQsIFJvbGVEQU86OmdldFJvbGVJZEZyb21QYXRoKCdjb3B5ZWRpdG9yJykKIAkJCQkpOwpAQCAt ODY1LDcgKzg2NSw3IEBAIGNsYXNzIFNlcmllc0VkaXRvclN1Ym1pc3Npb25EQU8gZXh0ZW5kcyBE QU8gewogCQkkcmVzdWx0ID0mICR0aGlzLT5yZXRyaWV2ZSgKIAkJCSdTRUxFQ1QJdS4qCiAJCQlG Uk9NCXVzZXJzIHUKLQkJCQlMRUZUIEpPSU4gY29udHJvbGxlZF92b2NhYnMgY3YgT04gKGN2LmFz c29jX2lkID0gdS51c2VyX2lkIEFORCBjdi5zeW1ib2xpYyA9ID8pCisJCQkJTEVGVCBKT0lOIGNv bnRyb2xsZWRfdm9jYWJzIGN2IE9OIChjdi5hc3NvY190eXBlID0gPyBBTkQgY3YuYXNzb2NfaWQg PSB1LnVzZXJfaWQgQU5EIGN2LnN5bWJvbGljID0gPykKIAkJCQlMRUZUIEpPSU4gY29udHJvbGxl ZF92b2NhYl9lbnRyaWVzIGN2ZSBPTiAoY3ZlLmNvbnRyb2xsZWRfdm9jYWJfaWQgPSBjdi5jb250 cm9sbGVkX3ZvY2FiX2lkKQogCQkJCUxFRlQgSk9JTiBjb250cm9sbGVkX3ZvY2FiX2VudHJ5X3Nl dHRpbmdzIGN2ZXMgT04gKGN2ZXMuY29udHJvbGxlZF92b2NhYl9lbnRyeV9pZCA9IGN2ZS5jb250 cm9sbGVkX3ZvY2FiX2VudHJ5X2lkKQogCQkJCUxFRlQgSk9JTiByb2xlcyByIE9OIChyLnVzZXJf aWQgPSB1LnVzZXJfaWQpCg==