42068 2010-07-12 03:17:44 -0700 Need to be able to configure Geolocation policy regarding user permissions 2010-08-03 08:39:27 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 42641 40373 42027 1 steveblock webkit-unassigned abarth abecsi commit-queue eric hausmann laszlo.gombos maheshk steveblock webkit.review.bot yael oldest_to_newest 249740 0 steveblock 2010-07-12 03:17:44 -0700 When writing the initial Geolocation implementation, a decision was made to start the location acquisition process before prompting the user for permission. Only once a position has been successfully obtained do we prompt the user. This avoids unnecessary prompting in the case when a location is unavailable. Note that this complies with the Geolocation spec (http://dev.w3.org/geo/api/spec-source.html), which requires that a UA must obtain user permission before disclosing location information. See also the discussion in Bug 39434. When the client-based Geolocation implementation was added, the opposite decision was taken. Permission is always obtained before the location acquisition process is started. As a result, the selection of a Geolocation implementation (with ENABLE(CLIENT_BASED_GEOLOCATION) also determines the user permission policy. Instead, the choice of user permission policy should be set independently, probably with a new USE flag. Note that plans are in place to deprecate the non-client-based Geolocation implementation. See Bug 40373. 249775 1 yael 2010-07-12 05:32:12 -0700 After this re-factor, it would be great if Geolocation and Notifications could share the same approach in their API for prompting the client for permission. 253362 2 61985 maheshk 2010-07-19 13:21:04 -0700 Created attachment 61985 attempt to fix Introducing a USE flag and making it enable by default for all CLIENT_BASED_GEOLOCATION ports. Enabling it separately for QtWebkit. Please review. Am I missing something obvious here? 253378 3 61985 steveblock 2010-07-19 13:53:17 -0700 Comment on attachment 61985 attempt to fix Thanks for the patch Mahesh. WebCore/ChangeLog:9 + acquires user permission first before starting instantiating location extra 'instantiating' WebCore/page/Geolocation.cpp:403 + extra blank line WebCore/WebCore.pro:2704 + # if geolocation is enabled, enable pre-request for permission policy Should probably be indented JavaScriptCore/wtf/Platform.h:1121 + #define WTF_USE_PREEMPT_GEOLOCATION_PERMISSION Add a comment that currently, client-based geolocation supports only the preemptive permission policy and that non-client-based Geolocation supports only the non-preemptive policy. WebCore/page/Geolocation.cpp:626 + // FIXME: Pass options to client. Could you move this to the addObserver() line? WebCore/page/Geolocation.cpp:623 + } I think we should close the #if USE(PREEMPT_GEOLOCATION_PERMISSION) here WebCore/page/Geolocation.cpp:640 + #endif // USE(PREEMPT_GEOLOCATION_PERMISSION) This block should just be ifdef'ed on CLIENT_BASED_GEOLOCATION WebCore/page/Geolocation.cpp:417 + #endif I assume that when you add support for the preemptive policy to the non-client based impl, you'll add an 'else' here? If so, you could add the else and a TODO now to make it clear. 253400 4 steveblock 2010-07-19 14:39:05 -0700 > WebCore/ChangeLog Add a line explaining that this change does not introduce any change in behaviour for any platforms currently using Geolocation, so there are no new tests. > JavaScriptCore/wtf/Platform.h:1121 > + #define WTF_USE_PREEMPT_GEOLOCATION_PERMISSION > Add a comment that currently, client-based geolocation supports only the preemptive permission > policy and that non-client-based Geolocation supports only the non-preemptive policy. On second thoughts, I think that with the changes I suggested, the client-based implementation should work with both policies. Can you confirm this? Do you still plan to use the non-client-based implementation? 253619 5 62044 maheshk 2010-07-20 02:13:20 -0700 Created attachment 62044 patch Incorporated changes as per Steve's comments #3 253623 6 maheshk 2010-07-20 02:15:01 -0700 (In reply to comment #4) > > WebCore/ChangeLog > Add a line explaining that this change does not introduce any change in behaviour for any platforms currently using Geolocation, so there are no new tests. > Done > > JavaScriptCore/wtf/Platform.h:1121 > > + #define WTF_USE_PREEMPT_GEOLOCATION_PERMISSION > > Add a comment that currently, client-based geolocation supports only the preemptive permission > > policy and that non-client-based Geolocation supports only the non-preemptive policy. > On second thoughts, I think that with the changes I suggested, the client-based implementation should work with both policies. Can you confirm this? > > Do you still plan to use the non-client-based implementation? Yes. The latest patch changes should enable client-based implementation to utilize both the policies. 253624 7 maheshk 2010-07-20 02:18:56 -0700 (In reply to comment #4) > Do you still plan to use the non-client-based implementation? Steve using preemptive permission policy for qt port is for a intermediate release. Will track the old bug #42027, for implementing client-based solution for qt port. 253626 8 62044 steveblock 2010-07-20 02:29:14 -0700 Comment on attachment 62044 patch WebCore/page/Geolocation.cpp:643 + #endif Trailing whitespace WebCore/page/Geolocation.cpp:421 + m_startRequestPermissionNotifier = 0; This new block wasn't in the first patch and introduces a change in behaviour. This bug was intended to add the new USE flag and not introduce any functional changes. This block should be part of the fix for your original Bug 42027. JavaScriptCore/wtf/Platform.h:1120 + #if ENABLE(CLIENT_BASED_GEOLOCATION) I still think a comment describing the currently supported permutations would be good. It looks like you still plan to use the non-client-based implementation on Qt? It would be great of you could go straight for the client-based approach. 253627 9 maheshk 2010-07-20 02:45:16 -0700 (In reply to comment #8) > (From update of attachment 62044 [details]) > WebCore/page/Geolocation.cpp:421 > + m_startRequestPermissionNotifier = 0; > This new block wasn't in the first patch and introduces a change in behaviour. This bug was intended to add the new USE flag and not introduce any functional changes. This block should be part of the fix for your original Bug 42027. > This new block will not be available for non-preemptive permission policy. No change in behavior for existing implementations (for both client based and non-client based). Because we are introducing preemptive permission policy, startUpdate() call has never instantiated the service, resulting in ignoring the first request received for position. This block implements the functionality of USE() flag. I can move this to bug #42027 if you would like? 253630 10 steveblock 2010-07-20 02:58:38 -0700 > This new block will not be available for non-preemptive permission policy. No > change in behavior for existing implementations (for both client based and non > client based). It's true that currently no platform uses USE(PREEMPT_GEOLOCATION_PERMISSION) && !ENABLE(CLIENT_BASED_GEOLOCATION), but this is still new functionality. The purpose of this bug was just to add the new flag with no functional change. Your intent with Bug 42027 was to implement USE(PREEMPT_GEOLOCATION_PERMISSION) && !ENABLE(CLIENT_BASED_GEOLOCATION), right? This is exactly what this block does, so should be in that bug. You could update the ChangeLog description to drop 'for any platforms currently using geolocation' to make it clear that this patch has no functional change at all. 253631 11 maheshk 2010-07-20 03:01:55 -0700 (In reply to comment #10) > > This new block will not be available for non-preemptive permission policy. No > > change in behavior for existing implementations (for both client based and non > > client based). > It's true that currently no platform uses USE(PREEMPT_GEOLOCATION_PERMISSION) && !ENABLE(CLIENT_BASED_GEOLOCATION), but this is still new functionality. The purpose of this bug was just to add the new flag with no functional change. > > Your intent with Bug 42027 was to implement USE(PREEMPT_GEOLOCATION_PERMISSION) && !ENABLE(CLIENT_BASED_GEOLOCATION), right? This is exactly what this block does, so should be in that bug. > > You could update the ChangeLog description to drop 'for any platforms currently using geolocation' to make it clear that this patch has no functional change at all. Sorry I spoke bit soon. This but not introducing behavior changes is proper solution and we need not update test content. New patch on the way. 253633 12 62049 maheshk 2010-07-20 03:04:19 -0700 Created attachment 62049 patch Incorporate changes from comment #8 bug #4207 will be tracked to implement the preemptive permission policy behavior. I will raise a new bug for qt port to implement client-based solution 253634 13 62050 maheshk 2010-07-20 03:06:24 -0700 Created attachment 62050 patch (In reply to comment #12) > Created an attachment (id=62049) [details] > patch > > Incorporate changes from comment #8 > > bug #4207 will be tracked to implement the preemptive permission policy behavior. I will raise a new bug for qt port to implement client-based solution Sorry missed one change from comment #8 253636 14 webkit.review.bot 2010-07-20 03:08:20 -0700 Attachment 62050 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebCore/page/Geolocation.cpp:417: Should have a space between // and comment [whitespace/comments] [4] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 253640 15 62052 maheshk 2010-07-20 03:12:24 -0700 Created attachment 62052 style issues corrected Fixed style error. Bug #42027 will be tracked for handling startUpdate() incase of pre-emptive permission policy. 253670 16 62052 steveblock 2010-07-20 05:48:34 -0700 Comment on attachment 62052 style issues corrected r=me 253696 17 62052 commit-queue 2010-07-20 06:42:42 -0700 Comment on attachment 62052 style issues corrected Rejecting patch 62052 from commit-queue. Unexpected failure when processing patch! Please file a bug against webkit-patch. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', 'land-attachment', '--force-clean', '--build', '--non-interactive', '--ignore-builders', '--build-style=both', '--quiet', 62052, '--test', '--parent-command=commit-queue', '--no-update']" exit_code: 1 Last 500 characters of output: date_status return NetworkTransaction().run(lambda: self._post_status_to_server(queue_name, status, patch, results_file)) File "/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/webkitpy/common/net/networktransaction.py", line 56, in run self._check_for_timeout() File "/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/webkitpy/common/net/networktransaction.py", line 63, in _check_for_timeout raise NetworkTimeout() webkitpy.common.net.networktransaction.NetworkTimeout 253711 18 abecsi 2010-07-20 07:25:59 -0700 (In reply to comment #16) > (From update of attachment 62052 [details]) > r=me Sending JavaScriptCore/ChangeLog Sending JavaScriptCore/wtf/Platform.h Sending WebCore/ChangeLog Sending WebCore/WebCore.pro Sending WebCore/page/Geolocation.cpp Sending WebCore/page/Geolocation.h Transmitting file data ...... Committed revision 63742. 253713 19 abecsi 2010-07-20 07:26:53 -0700 All reviewed patches landed. Closing bug. 253714 20 62052 abecsi 2010-07-20 07:27:32 -0700 Comment on attachment 62052 style issues corrected Clearing flags. 253716 21 eric 2010-07-20 07:28:38 -0700 You might consider using webkit-patch land. 253722 22 webkit.review.bot 2010-07-20 07:59:54 -0700 http://trac.webkit.org/changeset/63742 might have broken Qt Linux Release 253734 23 steveblock 2010-07-20 08:13:31 -0700 Patch was rolled back for breaking build > JavaScriptCore/wtf/Platform.h:1123 > + #define WTF_USE_PREEMPT_GEOLOCATION_PERMISSION I think this should be ... #define WTF_USE_PREEMPT_GEOLOCATION_PERMISSION 1 253767 24 62084 maheshk 2010-07-20 09:39:39 -0700 Created attachment 62084 build fix (In reply to comment #23) > Patch was rolled back for breaking build > > > JavaScriptCore/wtf/Platform.h:1123 > > + #define WTF_USE_PREEMPT_GEOLOCATION_PERMISSION > I think this should be ... > #define WTF_USE_PREEMPT_GEOLOCATION_PERMISSION 1 Apologies about the build break. Resubmitting the patch. 253775 25 62084 steveblock 2010-07-20 09:47:25 -0700 Comment on attachment 62084 build fix r=me 253845 26 62084 commit-queue 2010-07-20 11:59:22 -0700 Comment on attachment 62084 build fix Clearing flags on attachment: 62084 Committed r63761: <http://trac.webkit.org/changeset/63761> 253846 27 commit-queue 2010-07-20 11:59:29 -0700 All reviewed patches have been landed. Closing bug. 253861 28 webkit.review.bot 2010-07-20 12:33:18 -0700 http://trac.webkit.org/changeset/63761 might have broken Qt Linux Release The following changes are on the blame list: http://trac.webkit.org/changeset/63761 http://trac.webkit.org/changeset/63764 254053 29 steveblock 2010-07-20 16:23:38 -0700 Fixed failing Qt tests by not using PREEMPT_GEOLOCATION_PERMISSION on Qt until Bug 42027 is fixed. See http://trac.webkit.org/changeset/63771 The buildbot is still not happy but I think this is just because it needs to have a clean build forced. 254107 30 maheshk 2010-07-20 19:13:44 -0700 (In reply to comment #29) > Fixed failing Qt tests by not using PREEMPT_GEOLOCATION_PERMISSION on Qt until Bug 42027 is fixed. > See http://trac.webkit.org/changeset/63771 > > The buildbot is still not happy but I think this is just because it needs to have a clean build forced. Thank you Steve! Will take care of those cases in 42027 259475 31 hausmann 2010-08-03 08:39:27 -0700 Revision r63742 cherry-picked into qtwebkit-2.1 with commit c12d7b744af96b4922210be46a2e7b5341cb72b6 Revision r63761 cherry-picked into qtwebkit-2.1 with commit b960aea28ce5cef3742134a7f8501188b4efd8b4 61985 2010-07-19 13:21:04 -0700 2010-07-20 02:13:20 -0700 attempt to fix geo_user_policy.patch text/plain 5599 maheshk SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDYzNjQ0KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDctMTkgIE1haGVzaCBL dWxrYXJuaSAgPG1haGVzaC5rdWxrYXJuaUBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTmVlZCB0byBiZSBhYmxlIHRvIGNvbmZpZ3Vy ZSBHZW9sb2NhdGlvbiBwb2xpY3kgcmVnYXJkaW5nIHVzZXIgcGVybWlzc2lvbnMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyMDY4CisKKyAgICAgICAg SWYgQ0xJRU5UX0JBU0VEX0dFT0xPQ0FUSU9OIGlzIGVuYWJsZWQsIGVuYWJsZSB1c2VyIHBvbGlj eSBvZgorICAgICAgICBhY3F1aXJpbmcgdXNlciBwZXJtaXNzaW9uIGZpcnN0IGJlZm9yZSBnZXR0 aW5nIGxvY2F0aW9uIGluZm9ybWF0aW9uLiAKKworICAgICAgICAqIHd0Zi9QbGF0Zm9ybS5oOgor CiAyMDEwLTA3LTE2ICBMZWFuZHJvIFBlcmVpcmEgIDxsZWFuZHJvQHByb2Z1c2lvbi5tb2JpPgog CiAgICAgICAgIFtFRkxdIFVucmV2aWV3ZWQgYnVpbGQgc3lzdGVtIGNsZWFudXAuCkluZGV4OiBK YXZhU2NyaXB0Q29yZS93dGYvUGxhdGZvcm0uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0Q29y ZS93dGYvUGxhdGZvcm0uaAkocmV2aXNpb24gNjM2NDQpCisrKyBKYXZhU2NyaXB0Q29yZS93dGYv UGxhdGZvcm0uaAkod29ya2luZyBjb3B5KQpAQCAtMTExNiw0ICsxMTE2LDkgQEAgb24gTWluR1cu IFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaAogI2RlZmluZSBXVEZfVVNFX1BMQVRGT1JN X1NUUkFURUdJRVMgMQogI2VuZGlmCiAKKy8qIEdlb2xvY2F0aW9uIHJlcXVlc3QgcG9saWN5ICov CisjaWYgRU5BQkxFKENMSUVOVF9CQVNFRF9HRU9MT0NBVElPTikKKyNkZWZpbmUgV1RGX1VTRV9Q UkVFTVBUX0dFT0xPQ0FUSU9OX1BFUk1JU1NJT04KKyNlbmRpZgorCiAjZW5kaWYgLyogV1RGX1Bs YXRmb3JtX2ggKi8KSW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvQ2hhbmdlTG9nCShyZXZpc2lvbiA2MzY0NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTAtMDctMTkgIE1haGVzaCBLdWxrYXJuaSAg PG1haGVzaC5rdWxrYXJuaUBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTmVlZCB0byBiZSBhYmxlIHRvIGNvbmZpZ3VyZSBHZW9sb2Nh dGlvbiBwb2xpY3kgcmVnYXJkaW5nIHVzZXIgcGVybWlzc2lvbnMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyMDY4CisKKyAgICAgICAgSW50cm9kdWNp bmcgbmV3IFVTRSgpIGZsYWcgUFJFRU1QVF9HRU9MT0NBVElPTl9QUkVNSVNTSU9OIHVzaW5nIHdo aWNoCisgICAgICAgIGFjcXVpcmVzIHVzZXIgcGVybWlzc2lvbiBmaXJzdCBiZWZvcmUgc3RhcnRp bmcgaW5zdGFudGlhdGluZyBsb2NhdGlvbgorICAgICAgICBzZXJ2aWNlCisKKyAgICAgICAgKiBX ZWJDb3JlLnBybzoKKyAgICAgICAgKiBwYWdlL0dlb2xvY2F0aW9uLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6Okdlb2xvY2F0aW9uOjpzdGFydFJlcXVlc3QpOgorICAgICAgICAoV2ViQ29yZTo6R2Vv bG9jYXRpb246OnNldElzQWxsb3dlZCk6CisgICAgICAgIChXZWJDb3JlOjpHZW9sb2NhdGlvbjo6 c3RhcnRVcGRhdGluZyk6CisgICAgICAgICogcGFnZS9HZW9sb2NhdGlvbi5oOgorCiAyMDEwLTA3 LTE4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgRml4 IEJ1aWxkLgpJbmRleDogV2ViQ29yZS9XZWJDb3JlLnBybwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L1dlYkNvcmUucHJvCShyZXZpc2lvbiA2MzY0NCkKKysrIFdlYkNvcmUvV2ViQ29yZS5wcm8JKHdv cmtpbmcgY29weSkKQEAgLTI3MDEsNiArMjcwMSw5IEBAIGNvbnRhaW5zKERFRklORVMsIEVOQUJM RV9RVF9CRUFSRVI9MSkgewogfQogCiBjb250YWlucyhERUZJTkVTLCBFTkFCTEVfR0VPTE9DQVRJ T049MSkgeworIyBpZiBnZW9sb2NhdGlvbiBpcyBlbmFibGVkLCBlbmFibGUgcHJlLXJlcXVlc3Qg Zm9yIHBlcm1pc3Npb24gcG9saWN5CisgICAgREVGSU5FUyArPSBXVEZfVVNFX1BSRUVNUFRfR0VP TE9DQVRJT05fUEVSTUlTU0lPTgorCiAgICAgSEVBREVSUyArPSBcCiAgICAgICAgIHBsYXRmb3Jt L3F0L0dlb2xvY2F0aW9uU2VydmljZVF0LmgKICAgICBTT1VSQ0VTICs9IFwKSW5kZXg6IFdlYkNv cmUvcGFnZS9HZW9sb2NhdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL0dlb2xv Y2F0aW9uLmNwcAkocmV2aXNpb24gNjM2NDQpCisrKyBXZWJDb3JlL3BhZ2UvR2VvbG9jYXRpb24u Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNzksNyArMjc5LDcgQEAgUGFzc1JlZlB0cjxHZW9sb2Nh dGlvbjo6R2VvTm90aWZpZXI+IEdlbwogICAgIGVsc2UgaWYgKGhhdmVTdWl0YWJsZUNhY2hlZFBv c2l0aW9uKG5vdGlmaWVyLT5tX29wdGlvbnMuZ2V0KCkpKQogICAgICAgICBub3RpZmllci0+c2V0 VXNlQ2FjaGVkUG9zaXRpb24oKTsKICAgICBlbHNlIGlmIChub3RpZmllci0+aGFzWmVyb1RpbWVv dXQoKSB8fCBzdGFydFVwZGF0aW5nKG5vdGlmaWVyLmdldCgpKSkgewotI2lmIEVOQUJMRShDTElF TlRfQkFTRURfR0VPTE9DQVRJT04pCisjaWYgVVNFKFBSRUVNUFRfR0VPTE9DQVRJT05fUEVSTUlT U0lPTikKICAgICAgICAgLy8gT25seSBzdGFydCB0aW1lciBpZiB3ZSdyZSBub3Qgd2FpdGluZyBm b3IgdXNlciBwZXJtaXNzaW9uLgogICAgICAgICBpZiAoIW1fc3RhcnRSZXF1ZXN0UGVybWlzc2lv bk5vdGlmaWVyKQogI2VuZGlmICAgICAgICAgICAgCkBAIC00MDAsMTggKzQwMCwyMSBAQCB2b2lk IEdlb2xvY2F0aW9uOjpzZXRJc0FsbG93ZWQoYm9vbCBhbGxvCiAgICAgLy8gcG9zaXRpb24uCiAg ICAgbV9hbGxvd0dlb2xvY2F0aW9uID0gYWxsb3dlZCA/IFllcyA6IE5vOwogICAgIAotI2lmIEVO QUJMRShDTElFTlRfQkFTRURfR0VPTE9DQVRJT04pCisKKyNpZiBVU0UoUFJFRU1QVF9HRU9MT0NB VElPTl9QRVJNSVNTSU9OKQogICAgIGlmIChtX3N0YXJ0UmVxdWVzdFBlcm1pc3Npb25Ob3RpZmll cikgewogICAgICAgICBpZiAoaXNBbGxvd2VkKCkpIHsKICAgICAgICAgICAgIC8vIFBlcm1pc3Np b24gcmVxdWVzdCB3YXMgbWFkZSBkdXJpbmcgdGhlIHN0YXJ0VXBkYXRpbmcgcHJvY2VzcwogICAg ICAgICAgICAgbV9zdGFydFJlcXVlc3RQZXJtaXNzaW9uTm90aWZpZXItPnN0YXJ0VGltZXJJZk5l ZWRlZCgpOwogICAgICAgICAgICAgbV9zdGFydFJlcXVlc3RQZXJtaXNzaW9uTm90aWZpZXIgPSAw OworI2lmIEVOQUJMRShDTElFTlRfQkFTRURfR0VPTE9DQVRJT04pCiAgICAgICAgICAgICBpZiAo IW1fZnJhbWUpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgUGFnZSogcGFn ZSA9IG1fZnJhbWUtPnBhZ2UoKTsKICAgICAgICAgICAgIGlmICghcGFnZSkKICAgICAgICAgICAg ICAgICByZXR1cm47CiAgICAgICAgICAgICBwYWdlLT5nZW9sb2NhdGlvbkNvbnRyb2xsZXIoKS0+ YWRkT2JzZXJ2ZXIodGhpcyk7CisjZW5kaWYKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAg IG1fc3RhcnRSZXF1ZXN0UGVybWlzc2lvbk5vdGlmaWVyLT5zZXRGYXRhbEVycm9yKFBvc2l0aW9u RXJyb3I6OmNyZWF0ZShQb3NpdGlvbkVycm9yOjpQRVJNSVNTSU9OX0RFTklFRCwgcGVybWlzc2lv bkRlbmllZEVycm9yTWVzc2FnZSkpOwogICAgICAgICAgICAgbV9vbmVTaG90cy5hZGQobV9zdGFy dFJlcXVlc3RQZXJtaXNzaW9uTm90aWZpZXIpOwpAQCAtNjEyLDE1ICs2MTUsMTYgQEAgdm9pZCBH ZW9sb2NhdGlvbjo6Z2VvbG9jYXRpb25TZXJ2aWNlRXJybwogCiBib29sIEdlb2xvY2F0aW9uOjpz dGFydFVwZGF0aW5nKEdlb05vdGlmaWVyKiBub3RpZmllcikKIHsKLSNpZiBFTkFCTEUoQ0xJRU5U X0JBU0VEX0dFT0xPQ0FUSU9OKQotICAgIC8vIEZJWE1FOiBQYXNzIG9wdGlvbnMgdG8gY2xpZW50 LgotCisjaWYgVVNFKFBSRUVNUFRfR0VPTE9DQVRJT05fUEVSTUlTU0lPTikKICAgICBpZiAoIWlz QWxsb3dlZCgpKSB7CiAgICAgICAgIG1fc3RhcnRSZXF1ZXN0UGVybWlzc2lvbk5vdGlmaWVyID0g bm90aWZpZXI7CiAgICAgICAgIHJlcXVlc3RQZXJtaXNzaW9uKCk7CiAgICAgICAgIHJldHVybiB0 cnVlOwogICAgIH0KLSAgICAKKworI2lmIEVOQUJMRShDTElFTlRfQkFTRURfR0VPTE9DQVRJT04p CisgICAgLy8gRklYTUU6IFBhc3Mgb3B0aW9ucyB0byBjbGllbnQuCisKICAgICBpZiAoIW1fZnJh bWUpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApAQCAtNjMwLDkgKzYzNCwxMCBAQCBib29sIEdl b2xvY2F0aW9uOjpzdGFydFVwZGF0aW5nKEdlb05vdGlmCiAKICAgICBwYWdlLT5nZW9sb2NhdGlv bkNvbnRyb2xsZXIoKS0+YWRkT2JzZXJ2ZXIodGhpcyk7CiAgICAgcmV0dXJuIHRydWU7CisjZW5k aWYgLy8gRU5BQkxFKENMSUVOVF9CQVNFRF9HRU9MT0NBVElPTikKICNlbHNlCiAgICAgcmV0dXJu IG1fc2VydmljZS0+c3RhcnRVcGRhdGluZyhub3RpZmllci0+bV9vcHRpb25zLmdldCgpKTsKLSNl bmRpZgorI2VuZGlmIC8vIFVTRShQUkVFTVBUX0dFT0xPQ0FUSU9OX1BFUk1JU1NJT04pCiB9CiAK IHZvaWQgR2VvbG9jYXRpb246OnN0b3BVcGRhdGluZygpCkluZGV4OiBXZWJDb3JlL3BhZ2UvR2Vv bG9jYXRpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvR2VvbG9jYXRpb24uaAkocmV2 aXNpb24gNjM2NDQpCisrKyBXZWJDb3JlL3BhZ2UvR2VvbG9jYXRpb24uaAkod29ya2luZyBjb3B5 KQpAQCAtMTY1LDcgKzE2NSw4IEBAIHByaXZhdGU6CiAgICAgRnJhbWUqIG1fZnJhbWU7CiAjaWYg IUVOQUJMRShDTElFTlRfQkFTRURfR0VPTE9DQVRJT04pCiAgICAgT3duUHRyPEdlb2xvY2F0aW9u U2VydmljZT4gbV9zZXJ2aWNlOwotI2Vsc2UKKyNlbmRpZgorI2lmIFVTRShQUkVFTVBUX0dFT0xP Q0FUSU9OX1BFUk1JU1NJT04pCiAgICAgUmVmUHRyPEdlb05vdGlmaWVyPiBtX3N0YXJ0UmVxdWVz dFBlcm1pc3Npb25Ob3RpZmllcjsKICNlbmRpZgogICAgIFJlZlB0cjxHZW9wb3NpdGlvbj4gbV9s YXN0UG9zaXRpb247Cg== 62044 2010-07-20 02:13:20 -0700 2010-07-20 03:04:19 -0700 patch geo_user_policy.patch text/plain 6076 maheshk SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDYzNzIxKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDctMTkgIE1haGVzaCBL dWxrYXJuaSAgPG1haGVzaC5rdWxrYXJuaUBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTmVlZCB0byBiZSBhYmxlIHRvIGNvbmZpZ3Vy ZSBHZW9sb2NhdGlvbiBwb2xpY3kgcmVnYXJkaW5nIHVzZXIgcGVybWlzc2lvbnMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyMDY4CisKKyAgICAgICAg SWYgQ0xJRU5UX0JBU0VEX0dFT0xPQ0FUSU9OIGlzIGVuYWJsZWQsIGVuYWJsZSBwcmVlbXRpdmUg cGVybWlzc2lvbiBwb2xpY3kKKyAgICAgICAgYnkgZGVmYXVsdCAKKworICAgICAgICAqIHd0Zi9Q bGF0Zm9ybS5oOgorICAgICAgICAKIDIwMTAtMDctMTkgIERpcmsgU2NodWx6ZSAgPGtyaXRAd2Vi a2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBOaWtvbGFzIFppbW1lcm1hbm4uCkluZGV4 OiBKYXZhU2NyaXB0Q29yZS93dGYvUGxhdGZvcm0uaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS93dGYvUGxhdGZvcm0uaAkocmV2aXNpb24gNjM3MjEpCisrKyBKYXZhU2NyaXB0Q29yZS93 dGYvUGxhdGZvcm0uaAkod29ya2luZyBjb3B5KQpAQCAtMTExNiw0ICsxMTE2LDkgQEAgb24gTWlu R1cuIFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaAogI2RlZmluZSBXVEZfVVNFX1BMQVRG T1JNX1NUUkFURUdJRVMgMQogI2VuZGlmCiAKKy8qIEdlb2xvY2F0aW9uIHJlcXVlc3QgcG9saWN5 ICovCisjaWYgRU5BQkxFKENMSUVOVF9CQVNFRF9HRU9MT0NBVElPTikKKyNkZWZpbmUgV1RGX1VT RV9QUkVFTVBUX0dFT0xPQ0FUSU9OX1BFUk1JU1NJT04KKyNlbmRpZgorCiAjZW5kaWYgLyogV1RG X1BsYXRmb3JtX2ggKi8KSW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiA2MzcyMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3 b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTAtMDctMTkgIE1haGVzaCBLdWxrYXJu aSAgPG1haGVzaC5rdWxrYXJuaUBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgTmVlZCB0byBiZSBhYmxlIHRvIGNvbmZpZ3VyZSBHZW9s b2NhdGlvbiBwb2xpY3kgcmVnYXJkaW5nIHVzZXIgcGVybWlzc2lvbnMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyMDY4CisKKyAgICAgICAgSW50cm9k dWNpbmcgbmV3IFVTRSgpIGZsYWcgUFJFRU1QVF9HRU9MT0NBVElPTl9QUkVNSVNTSU9OIHVzaW5n IHdoaWNoCisgICAgICAgIGFjcXVpcmVzIHVzZXIgcGVybWlzc2lvbiBmaXJzdCBiZWZvcmUgc3Rh cnRpbmcgbG9jYXRpb24gc2VydmljZQorCisgICAgICAgIFRoaXMgY2hhbmdlIGRvZXMgbm90IGlu dHJvZHVjZSBhbnkgY2hhbmdlIGluIGJlaGF2aW9yIGZvciBhbnkKKyAgICAgICAgcGxhdGZvcm1z IGN1cnJlbnRseSB1c2luZyBnZW9sb2NhdGlvbi4gU28gdGhlcmUgYXJlIG5vIG5ldyB0ZXN0cwor ICAgICAgICBhZGRlZC4KKworICAgICAgICAqIFdlYkNvcmUucHJvOgorICAgICAgICAqIHBhZ2Uv R2VvbG9jYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6R2VvbG9jYXRpb246OnN0YXJ0UmVx dWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpHZW9sb2NhdGlvbjo6c2V0SXNBbGxvd2VkKToKKyAg ICAgICAgKFdlYkNvcmU6Okdlb2xvY2F0aW9uOjpzdGFydFVwZGF0aW5nKToKKyAgICAgICAgKiBw YWdlL0dlb2xvY2F0aW9uLmg6CisKIDIwMTAtMDctMTkgIERpcmsgU2NodWx6ZSAgPGtyaXRAd2Vi a2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBOaWtvbGFzIFppbW1lcm1hbm4uCkluZGV4 OiBXZWJDb3JlL1dlYkNvcmUucHJvCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvV2ViQ29yZS5wcm8J KHJldmlzaW9uIDYzNzIxKQorKysgV2ViQ29yZS9XZWJDb3JlLnBybwkod29ya2luZyBjb3B5KQpA QCAtMjcwNSw2ICsyNzA1LDkgQEAgY29udGFpbnMoREVGSU5FUywgRU5BQkxFX1FUX0JFQVJFUj0x KSB7CiB9CiAKIGNvbnRhaW5zKERFRklORVMsIEVOQUJMRV9HRU9MT0NBVElPTj0xKSB7CisgICAg IyBpZiBnZW9sb2NhdGlvbiBpcyBlbmFibGVkLCBlbmFibGUgcHJlLXJlcXVlc3QgZm9yIHBlcm1p c3Npb24gcG9saWN5CisgICAgREVGSU5FUyArPSBXVEZfVVNFX1BSRUVNUFRfR0VPTE9DQVRJT05f UEVSTUlTU0lPTgorCiAgICAgSEVBREVSUyArPSBcCiAgICAgICAgIHBsYXRmb3JtL3F0L0dlb2xv Y2F0aW9uU2VydmljZVF0LmgKICAgICBTT1VSQ0VTICs9IFwKSW5kZXg6IFdlYkNvcmUvcGFnZS9H ZW9sb2NhdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL0dlb2xvY2F0aW9uLmNw cAkocmV2aXNpb24gNjM3MjEpCisrKyBXZWJDb3JlL3BhZ2UvR2VvbG9jYXRpb24uY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0yNzksNyArMjc5LDcgQEAgUGFzc1JlZlB0cjxHZW9sb2NhdGlvbjo6R2Vv Tm90aWZpZXI+IEdlbwogICAgIGVsc2UgaWYgKGhhdmVTdWl0YWJsZUNhY2hlZFBvc2l0aW9uKG5v dGlmaWVyLT5tX29wdGlvbnMuZ2V0KCkpKQogICAgICAgICBub3RpZmllci0+c2V0VXNlQ2FjaGVk UG9zaXRpb24oKTsKICAgICBlbHNlIGlmIChub3RpZmllci0+aGFzWmVyb1RpbWVvdXQoKSB8fCBz dGFydFVwZGF0aW5nKG5vdGlmaWVyLmdldCgpKSkgewotI2lmIEVOQUJMRShDTElFTlRfQkFTRURf R0VPTE9DQVRJT04pCisjaWYgVVNFKFBSRUVNUFRfR0VPTE9DQVRJT05fUEVSTUlTU0lPTikKICAg ICAgICAgLy8gT25seSBzdGFydCB0aW1lciBpZiB3ZSdyZSBub3Qgd2FpdGluZyBmb3IgdXNlciBw ZXJtaXNzaW9uLgogICAgICAgICBpZiAoIW1fc3RhcnRSZXF1ZXN0UGVybWlzc2lvbk5vdGlmaWVy KQogI2VuZGlmICAgICAgICAgICAgCkBAIC00MDAsMTggKzQwMCwyNSBAQCB2b2lkIEdlb2xvY2F0 aW9uOjpzZXRJc0FsbG93ZWQoYm9vbCBhbGxvCiAgICAgLy8gcG9zaXRpb24uCiAgICAgbV9hbGxv d0dlb2xvY2F0aW9uID0gYWxsb3dlZCA/IFllcyA6IE5vOwogICAgIAotI2lmIEVOQUJMRShDTElF TlRfQkFTRURfR0VPTE9DQVRJT04pCisjaWYgVVNFKFBSRUVNUFRfR0VPTE9DQVRJT05fUEVSTUlT U0lPTikKICAgICBpZiAobV9zdGFydFJlcXVlc3RQZXJtaXNzaW9uTm90aWZpZXIpIHsKICAgICAg ICAgaWYgKGlzQWxsb3dlZCgpKSB7CiAgICAgICAgICAgICAvLyBQZXJtaXNzaW9uIHJlcXVlc3Qg d2FzIG1hZGUgZHVyaW5nIHRoZSBzdGFydFVwZGF0aW5nIHByb2Nlc3MKICAgICAgICAgICAgIG1f c3RhcnRSZXF1ZXN0UGVybWlzc2lvbk5vdGlmaWVyLT5zdGFydFRpbWVySWZOZWVkZWQoKTsKLSAg ICAgICAgICAgIG1fc3RhcnRSZXF1ZXN0UGVybWlzc2lvbk5vdGlmaWVyID0gMDsKKyNpZiBFTkFC TEUoQ0xJRU5UX0JBU0VEX0dFT0xPQ0FUSU9OKQogICAgICAgICAgICAgaWYgKCFtX2ZyYW1lKQog ICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIFBhZ2UqIHBhZ2UgPSBtX2ZyYW1l LT5wYWdlKCk7CiAgICAgICAgICAgICBpZiAoIXBhZ2UpCiAgICAgICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICAgICAgcGFnZS0+Z2VvbG9jYXRpb25Db250cm9sbGVyKCktPmFkZE9ic2VydmVy KHRoaXMpOworI2Vsc2UKKyAgICAgICAgICAgIGlmIChtX3NlcnZpY2UgJiYgIW1fc2VydmljZS0+ c3RhcnRVcGRhdGluZyhtX3N0YXJ0UmVxdWVzdFBlcm1pc3Npb25Ob3RpZmllci0+bV9vcHRpb25z LmdldCgpKSkgeworICAgICAgICAgICAgICAgIG1fc3RhcnRSZXF1ZXN0UGVybWlzc2lvbk5vdGlm aWVyLT5zZXRGYXRhbEVycm9yKFBvc2l0aW9uRXJyb3I6OmNyZWF0ZShQb3NpdGlvbkVycm9yOjpQ T1NJVElPTl9VTkFWQUlMQUJMRSwgZmFpbGVkVG9TdGFydFNlcnZpY2VFcnJvck1lc3NhZ2UpKTsK KyAgICAgICAgICAgICAgICBtX29uZVNob3RzLmFkZChtX3N0YXJ0UmVxdWVzdFBlcm1pc3Npb25O b3RpZmllcik7CisgICAgICAgICAgICB9CisjZW5kaWYKKyAgICAgICAgICAgIG1fc3RhcnRSZXF1 ZXN0UGVybWlzc2lvbk5vdGlmaWVyID0gMDsKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAg IG1fc3RhcnRSZXF1ZXN0UGVybWlzc2lvbk5vdGlmaWVyLT5zZXRGYXRhbEVycm9yKFBvc2l0aW9u RXJyb3I6OmNyZWF0ZShQb3NpdGlvbkVycm9yOjpQRVJNSVNTSU9OX0RFTklFRCwgcGVybWlzc2lv bkRlbmllZEVycm9yTWVzc2FnZSkpOwogICAgICAgICAgICAgbV9vbmVTaG90cy5hZGQobV9zdGFy dFJlcXVlc3RQZXJtaXNzaW9uTm90aWZpZXIpOwpAQCAtNjEyLDE1ICs2MTksMTUgQEAgdm9pZCBH ZW9sb2NhdGlvbjo6Z2VvbG9jYXRpb25TZXJ2aWNlRXJybwogCiBib29sIEdlb2xvY2F0aW9uOjpz dGFydFVwZGF0aW5nKEdlb05vdGlmaWVyKiBub3RpZmllcikKIHsKLSNpZiBFTkFCTEUoQ0xJRU5U X0JBU0VEX0dFT0xPQ0FUSU9OKQotICAgIC8vIEZJWE1FOiBQYXNzIG9wdGlvbnMgdG8gY2xpZW50 LgotCisjaWYgVVNFKFBSRUVNUFRfR0VPTE9DQVRJT05fUEVSTUlTU0lPTikKICAgICBpZiAoIWlz QWxsb3dlZCgpKSB7CiAgICAgICAgIG1fc3RhcnRSZXF1ZXN0UGVybWlzc2lvbk5vdGlmaWVyID0g bm90aWZpZXI7CiAgICAgICAgIHJlcXVlc3RQZXJtaXNzaW9uKCk7CiAgICAgICAgIHJldHVybiB0 cnVlOwogICAgIH0KLSAgICAKKyNlbmRpZgorCisjaWYgRU5BQkxFKENMSUVOVF9CQVNFRF9HRU9M T0NBVElPTikKICAgICBpZiAoIW1fZnJhbWUpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApAQCAt NjI4LDExICs2MzUsMTIgQEAgYm9vbCBHZW9sb2NhdGlvbjo6c3RhcnRVcGRhdGluZyhHZW9Ob3Rp ZgogICAgIGlmICghcGFnZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCisgICAgLy8gRklYTUU6 IFBhc3Mgb3B0aW9ucyB0byBjbGllbnQuCiAgICAgcGFnZS0+Z2VvbG9jYXRpb25Db250cm9sbGVy KCktPmFkZE9ic2VydmVyKHRoaXMpOwogICAgIHJldHVybiB0cnVlOwogI2Vsc2UKICAgICByZXR1 cm4gbV9zZXJ2aWNlLT5zdGFydFVwZGF0aW5nKG5vdGlmaWVyLT5tX29wdGlvbnMuZ2V0KCkpOwot I2VuZGlmCisjZW5kaWYgCiB9CiAKIHZvaWQgR2VvbG9jYXRpb246OnN0b3BVcGRhdGluZygpCklu ZGV4OiBXZWJDb3JlL3BhZ2UvR2VvbG9jYXRpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3Bh Z2UvR2VvbG9jYXRpb24uaAkocmV2aXNpb24gNjM3MjEpCisrKyBXZWJDb3JlL3BhZ2UvR2VvbG9j YXRpb24uaAkod29ya2luZyBjb3B5KQpAQCAtMTY1LDcgKzE2NSw4IEBAIHByaXZhdGU6CiAgICAg RnJhbWUqIG1fZnJhbWU7CiAjaWYgIUVOQUJMRShDTElFTlRfQkFTRURfR0VPTE9DQVRJT04pCiAg ICAgT3duUHRyPEdlb2xvY2F0aW9uU2VydmljZT4gbV9zZXJ2aWNlOwotI2Vsc2UKKyNlbmRpZgor I2lmIFVTRShQUkVFTVBUX0dFT0xPQ0FUSU9OX1BFUk1JU1NJT04pCiAgICAgUmVmUHRyPEdlb05v dGlmaWVyPiBtX3N0YXJ0UmVxdWVzdFBlcm1pc3Npb25Ob3RpZmllcjsKICNlbmRpZgogICAgIFJl ZlB0cjxHZW9wb3NpdGlvbj4gbV9sYXN0UG9zaXRpb247Cg== 62049 2010-07-20 03:04:19 -0700 2010-07-20 03:06:24 -0700 patch geo_user_policy.patch text/plain 5944 maheshk SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDYzNzIxKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDctMTkgIE1haGVzaCBL dWxrYXJuaSAgPG1haGVzaC5rdWxrYXJuaUBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTmVlZCB0byBiZSBhYmxlIHRvIGNvbmZpZ3Vy ZSBHZW9sb2NhdGlvbiBwb2xpY3kgcmVnYXJkaW5nIHVzZXIgcGVybWlzc2lvbnMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyMDY4CisKKyAgICAgICAg SWYgQ0xJRU5UX0JBU0VEX0dFT0xPQ0FUSU9OIGlzIGVuYWJsZWQsIGVuYWJsZSBwcmVlbXRpdmUg cGVybWlzc2lvbiBwb2xpY3kKKyAgICAgICAgYnkgZGVmYXVsdCAKKworICAgICAgICAqIHd0Zi9Q bGF0Zm9ybS5oOgorICAgICAgICAKIDIwMTAtMDctMTkgIERpcmsgU2NodWx6ZSAgPGtyaXRAd2Vi a2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBOaWtvbGFzIFppbW1lcm1hbm4uCkluZGV4 OiBKYXZhU2NyaXB0Q29yZS93dGYvUGxhdGZvcm0uaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS93dGYvUGxhdGZvcm0uaAkocmV2aXNpb24gNjM3MjEpCisrKyBKYXZhU2NyaXB0Q29yZS93 dGYvUGxhdGZvcm0uaAkod29ya2luZyBjb3B5KQpAQCAtMTExNiw0ICsxMTE2LDExIEBAIG9uIE1p bkdXLiBTZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2gKICNkZWZpbmUgV1RGX1VTRV9QTEFU Rk9STV9TVFJBVEVHSUVTIDEKICNlbmRpZgogCisvKiBHZW9sb2NhdGlvbiByZXF1ZXN0IHBvbGlj eS4gcHJlLWVtcHRpdmUgcG9saWN5IGlzIHRvIGFjcXVpcmUgdXNlciBwZXJtaXNzaW9uIGJlZm9y ZSBhY3F1aXJpbmcgbG9jYXRpb24uCisgICBDbGllbnQgYmFzZWQgaW1wbGVtZW50YXRpb25zIHdp bGwgaGF2ZSBvcHRpb24gdG8gY2hvb3NlIGJldHdlZW4gcHJlLWVtcHRpdmUgYW5kIG5vbnByZS1l bXB0aXZlIHBlcm1pc3Npb24gcG9saWN5LgorICAgcHJlLWVtcHRpdmUgcGVybWlzc2lvbiBwb2xp Y3kgaXMgZW5hYmxlZCBieSBkZWZhdWx0IGZvciBhbGwgY2xpZW50LWJhc2VkIGltcGxlbWVudGF0 aW9ucy4gKi8KKyNpZiBFTkFCTEUoQ0xJRU5UX0JBU0VEX0dFT0xPQ0FUSU9OKQorI2RlZmluZSBX VEZfVVNFX1BSRUVNUFRfR0VPTE9DQVRJT05fUEVSTUlTU0lPTgorI2VuZGlmCisKICNlbmRpZiAv KiBXVEZfUGxhdGZvcm1faCAqLwpJbmRleDogV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDYzNzIxKQorKysgV2ViQ29yZS9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyNCBAQAorMjAxMC0wNy0xOSAgTWFoZXNoIEt1 bGthcm5pICA8bWFoZXNoLmt1bGthcm5pQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOZWVkIHRvIGJlIGFibGUgdG8gY29uZmlndXJl IEdlb2xvY2F0aW9uIHBvbGljeSByZWdhcmRpbmcgdXNlciBwZXJtaXNzaW9ucworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDIwNjgKKworICAgICAgICBJ bnRyb2R1Y2luZyBuZXcgVVNFKCkgZmxhZyBQUkVFTVBUX0dFT0xPQ0FUSU9OX1BSRU1JU1NJT04g dXNpbmcgd2hpY2gKKyAgICAgICAgYWNxdWlyZXMgdXNlciBwZXJtaXNzaW9uIGZpcnN0IGJlZm9y ZSBzdGFydGluZyBsb2NhdGlvbiBzZXJ2aWNlCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgZG9lcyBu b3QgaW50cm9kdWNlIGFueSBjaGFuZ2UgaW4gYmVoYXZpb3IgZm9yIGFueQorICAgICAgICBwbGF0 Zm9ybXMgY3VycmVudGx5IHVzaW5nIGdlb2xvY2F0aW9uLiBTbyB0aGVyZSBhcmUgbm8gbmV3IHRl c3RzCisgICAgICAgIGFkZGVkLgorCisgICAgICAgICogV2ViQ29yZS5wcm86CisgICAgICAgICog cGFnZS9HZW9sb2NhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHZW9sb2NhdGlvbjo6c3Rh cnRSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6Okdlb2xvY2F0aW9uOjpzZXRJc0FsbG93ZWQp OgorICAgICAgICAoV2ViQ29yZTo6R2VvbG9jYXRpb246OnN0YXJ0VXBkYXRpbmcpOgorICAgICAg ICAqIHBhZ2UvR2VvbG9jYXRpb24uaDoKKwogMjAxMC0wNy0xOSAgRGlyayBTY2h1bHplICA8a3Jp dEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5pa29sYXMgWmltbWVybWFubi4K SW5kZXg6IFdlYkNvcmUvV2ViQ29yZS5wcm8KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9XZWJDb3Jl LnBybwkocmV2aXNpb24gNjM3MjEpCisrKyBXZWJDb3JlL1dlYkNvcmUucHJvCSh3b3JraW5nIGNv cHkpCkBAIC0yNzA1LDYgKzI3MDUsOSBAQCBjb250YWlucyhERUZJTkVTLCBFTkFCTEVfUVRfQkVB UkVSPTEpIHsKIH0KIAogY29udGFpbnMoREVGSU5FUywgRU5BQkxFX0dFT0xPQ0FUSU9OPTEpIHsK KyAgICAjIGlmIGdlb2xvY2F0aW9uIGlzIGVuYWJsZWQsIGVuYWJsZSBwcmUtcmVxdWVzdCBmb3Ig cGVybWlzc2lvbiBwb2xpY3kKKyAgICBERUZJTkVTICs9IFdURl9VU0VfUFJFRU1QVF9HRU9MT0NB VElPTl9QRVJNSVNTSU9OCisKICAgICBIRUFERVJTICs9IFwKICAgICAgICAgcGxhdGZvcm0vcXQv R2VvbG9jYXRpb25TZXJ2aWNlUXQuaAogICAgIFNPVVJDRVMgKz0gXApJbmRleDogV2ViQ29yZS9w YWdlL0dlb2xvY2F0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvR2VvbG9jYXRp b24uY3BwCShyZXZpc2lvbiA2MzcyMSkKKysrIFdlYkNvcmUvcGFnZS9HZW9sb2NhdGlvbi5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTI3OSw3ICsyNzksNyBAQCBQYXNzUmVmUHRyPEdlb2xvY2F0aW9u OjpHZW9Ob3RpZmllcj4gR2VvCiAgICAgZWxzZSBpZiAoaGF2ZVN1aXRhYmxlQ2FjaGVkUG9zaXRp b24obm90aWZpZXItPm1fb3B0aW9ucy5nZXQoKSkpCiAgICAgICAgIG5vdGlmaWVyLT5zZXRVc2VD YWNoZWRQb3NpdGlvbigpOwogICAgIGVsc2UgaWYgKG5vdGlmaWVyLT5oYXNaZXJvVGltZW91dCgp IHx8IHN0YXJ0VXBkYXRpbmcobm90aWZpZXIuZ2V0KCkpKSB7Ci0jaWYgRU5BQkxFKENMSUVOVF9C QVNFRF9HRU9MT0NBVElPTikKKyNpZiBVU0UoUFJFRU1QVF9HRU9MT0NBVElPTl9QRVJNSVNTSU9O KQogICAgICAgICAvLyBPbmx5IHN0YXJ0IHRpbWVyIGlmIHdlJ3JlIG5vdCB3YWl0aW5nIGZvciB1 c2VyIHBlcm1pc3Npb24uCiAgICAgICAgIGlmICghbV9zdGFydFJlcXVlc3RQZXJtaXNzaW9uTm90 aWZpZXIpCiAjZW5kaWYgICAgICAgICAgICAKQEAgLTQwMCwxOCArNDAwLDIyIEBAIHZvaWQgR2Vv bG9jYXRpb246OnNldElzQWxsb3dlZChib29sIGFsbG8KICAgICAvLyBwb3NpdGlvbi4KICAgICBt X2FsbG93R2VvbG9jYXRpb24gPSBhbGxvd2VkID8gWWVzIDogTm87CiAgICAgCi0jaWYgRU5BQkxF KENMSUVOVF9CQVNFRF9HRU9MT0NBVElPTikKKyNpZiBVU0UoUFJFRU1QVF9HRU9MT0NBVElPTl9Q RVJNSVNTSU9OKQogICAgIGlmIChtX3N0YXJ0UmVxdWVzdFBlcm1pc3Npb25Ob3RpZmllcikgewog ICAgICAgICBpZiAoaXNBbGxvd2VkKCkpIHsKICAgICAgICAgICAgIC8vIFBlcm1pc3Npb24gcmVx dWVzdCB3YXMgbWFkZSBkdXJpbmcgdGhlIHN0YXJ0VXBkYXRpbmcgcHJvY2VzcwogICAgICAgICAg ICAgbV9zdGFydFJlcXVlc3RQZXJtaXNzaW9uTm90aWZpZXItPnN0YXJ0VGltZXJJZk5lZWRlZCgp OwogICAgICAgICAgICAgbV9zdGFydFJlcXVlc3RQZXJtaXNzaW9uTm90aWZpZXIgPSAwOworI2lm IEVOQUJMRShDTElFTlRfQkFTRURfR0VPTE9DQVRJT04pCiAgICAgICAgICAgICBpZiAoIW1fZnJh bWUpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgUGFnZSogcGFnZSA9IG1f ZnJhbWUtPnBhZ2UoKTsKICAgICAgICAgICAgIGlmICghcGFnZSkKICAgICAgICAgICAgICAgICBy ZXR1cm47CiAgICAgICAgICAgICBwYWdlLT5nZW9sb2NhdGlvbkNvbnRyb2xsZXIoKS0+YWRkT2Jz ZXJ2ZXIodGhpcyk7CisjZWxzZQorICAgICAgICAgICAgLy9UT0RPOiBIYW5kbGUgc3RhcnRVcGRh dGUoKSBmb3Igbm9uLWNsaWVudCBiYXNlZCBpbXBsZW1lbnRhdGlvbnMgdXNpbmcgcHJlLWVtcHRp dmUgcG9saWN5CisjZW5kaWYKICAgICAgICAgfSBlbHNlIHsKICAgICAgICAgICAgIG1fc3RhcnRS ZXF1ZXN0UGVybWlzc2lvbk5vdGlmaWVyLT5zZXRGYXRhbEVycm9yKFBvc2l0aW9uRXJyb3I6OmNy ZWF0ZShQb3NpdGlvbkVycm9yOjpQRVJNSVNTSU9OX0RFTklFRCwgcGVybWlzc2lvbkRlbmllZEVy cm9yTWVzc2FnZSkpOwogICAgICAgICAgICAgbV9vbmVTaG90cy5hZGQobV9zdGFydFJlcXVlc3RQ ZXJtaXNzaW9uTm90aWZpZXIpOwpAQCAtNjEyLDE1ICs2MTYsMTUgQEAgdm9pZCBHZW9sb2NhdGlv bjo6Z2VvbG9jYXRpb25TZXJ2aWNlRXJybwogCiBib29sIEdlb2xvY2F0aW9uOjpzdGFydFVwZGF0 aW5nKEdlb05vdGlmaWVyKiBub3RpZmllcikKIHsKLSNpZiBFTkFCTEUoQ0xJRU5UX0JBU0VEX0dF T0xPQ0FUSU9OKQotICAgIC8vIEZJWE1FOiBQYXNzIG9wdGlvbnMgdG8gY2xpZW50LgotCisjaWYg VVNFKFBSRUVNUFRfR0VPTE9DQVRJT05fUEVSTUlTU0lPTikKICAgICBpZiAoIWlzQWxsb3dlZCgp KSB7CiAgICAgICAgIG1fc3RhcnRSZXF1ZXN0UGVybWlzc2lvbk5vdGlmaWVyID0gbm90aWZpZXI7 CiAgICAgICAgIHJlcXVlc3RQZXJtaXNzaW9uKCk7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAg IH0KLSAgICAKKyNlbmRpZgorCisjaWYgRU5BQkxFKENMSUVOVF9CQVNFRF9HRU9MT0NBVElPTikK ICAgICBpZiAoIW1fZnJhbWUpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApAQCAtNjI4LDYgKzYz Miw3IEBAIGJvb2wgR2VvbG9jYXRpb246OnN0YXJ0VXBkYXRpbmcoR2VvTm90aWYKICAgICBpZiAo IXBhZ2UpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAorICAgIC8vIEZJWE1FOiBQYXNzIG9wdGlv bnMgdG8gY2xpZW50LgogICAgIHBhZ2UtPmdlb2xvY2F0aW9uQ29udHJvbGxlcigpLT5hZGRPYnNl cnZlcih0aGlzKTsKICAgICByZXR1cm4gdHJ1ZTsKICNlbHNlCkluZGV4OiBXZWJDb3JlL3BhZ2Uv R2VvbG9jYXRpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvR2VvbG9jYXRpb24uaAko cmV2aXNpb24gNjM3MjEpCisrKyBXZWJDb3JlL3BhZ2UvR2VvbG9jYXRpb24uaAkod29ya2luZyBj b3B5KQpAQCAtMTY1LDcgKzE2NSw4IEBAIHByaXZhdGU6CiAgICAgRnJhbWUqIG1fZnJhbWU7CiAj aWYgIUVOQUJMRShDTElFTlRfQkFTRURfR0VPTE9DQVRJT04pCiAgICAgT3duUHRyPEdlb2xvY2F0 aW9uU2VydmljZT4gbV9zZXJ2aWNlOwotI2Vsc2UKKyNlbmRpZgorI2lmIFVTRShQUkVFTVBUX0dF T0xPQ0FUSU9OX1BFUk1JU1NJT04pCiAgICAgUmVmUHRyPEdlb05vdGlmaWVyPiBtX3N0YXJ0UmVx dWVzdFBlcm1pc3Npb25Ob3RpZmllcjsKICNlbmRpZgogICAgIFJlZlB0cjxHZW9wb3NpdGlvbj4g bV9sYXN0UG9zaXRpb247Cg== 62050 2010-07-20 03:06:24 -0700 2010-07-20 03:12:24 -0700 patch geo_user_policy.patch text/plain 5906 maheshk SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDYzNzIxKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDctMTkgIE1haGVzaCBL dWxrYXJuaSAgPG1haGVzaC5rdWxrYXJuaUBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTmVlZCB0byBiZSBhYmxlIHRvIGNvbmZpZ3Vy ZSBHZW9sb2NhdGlvbiBwb2xpY3kgcmVnYXJkaW5nIHVzZXIgcGVybWlzc2lvbnMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyMDY4CisKKyAgICAgICAg SWYgQ0xJRU5UX0JBU0VEX0dFT0xPQ0FUSU9OIGlzIGVuYWJsZWQsIGVuYWJsZSBwcmVlbXRpdmUg cGVybWlzc2lvbiBwb2xpY3kKKyAgICAgICAgYnkgZGVmYXVsdCAKKworICAgICAgICAqIHd0Zi9Q bGF0Zm9ybS5oOgorICAgICAgICAKIDIwMTAtMDctMTkgIERpcmsgU2NodWx6ZSAgPGtyaXRAd2Vi a2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBOaWtvbGFzIFppbW1lcm1hbm4uCkluZGV4 OiBKYXZhU2NyaXB0Q29yZS93dGYvUGxhdGZvcm0uaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS93dGYvUGxhdGZvcm0uaAkocmV2aXNpb24gNjM3MjEpCisrKyBKYXZhU2NyaXB0Q29yZS93 dGYvUGxhdGZvcm0uaAkod29ya2luZyBjb3B5KQpAQCAtMTExNiw0ICsxMTE2LDExIEBAIG9uIE1p bkdXLiBTZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2gKICNkZWZpbmUgV1RGX1VTRV9QTEFU Rk9STV9TVFJBVEVHSUVTIDEKICNlbmRpZgogCisvKiBHZW9sb2NhdGlvbiByZXF1ZXN0IHBvbGlj eS4gcHJlLWVtcHRpdmUgcG9saWN5IGlzIHRvIGFjcXVpcmUgdXNlciBwZXJtaXNzaW9uIGJlZm9y ZSBhY3F1aXJpbmcgbG9jYXRpb24uCisgICBDbGllbnQgYmFzZWQgaW1wbGVtZW50YXRpb25zIHdp bGwgaGF2ZSBvcHRpb24gdG8gY2hvb3NlIGJldHdlZW4gcHJlLWVtcHRpdmUgYW5kIG5vbnByZS1l bXB0aXZlIHBlcm1pc3Npb24gcG9saWN5LgorICAgcHJlLWVtcHRpdmUgcGVybWlzc2lvbiBwb2xp Y3kgaXMgZW5hYmxlZCBieSBkZWZhdWx0IGZvciBhbGwgY2xpZW50LWJhc2VkIGltcGxlbWVudGF0 aW9ucy4gKi8KKyNpZiBFTkFCTEUoQ0xJRU5UX0JBU0VEX0dFT0xPQ0FUSU9OKQorI2RlZmluZSBX VEZfVVNFX1BSRUVNUFRfR0VPTE9DQVRJT05fUEVSTUlTU0lPTgorI2VuZGlmCisKICNlbmRpZiAv KiBXVEZfUGxhdGZvcm1faCAqLwpJbmRleDogV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDYzNzIxKQorKysgV2ViQ29yZS9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMyBAQAorMjAxMC0wNy0xOSAgTWFoZXNoIEt1 bGthcm5pICA8bWFoZXNoLmt1bGthcm5pQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOZWVkIHRvIGJlIGFibGUgdG8gY29uZmlndXJl IEdlb2xvY2F0aW9uIHBvbGljeSByZWdhcmRpbmcgdXNlciBwZXJtaXNzaW9ucworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDIwNjgKKworICAgICAgICBJ bnRyb2R1Y2luZyBuZXcgVVNFKCkgZmxhZyBQUkVFTVBUX0dFT0xPQ0FUSU9OX1BSRU1JU1NJT04g dXNpbmcgd2hpY2gKKyAgICAgICAgYWNxdWlyZXMgdXNlciBwZXJtaXNzaW9uIGZpcnN0IGJlZm9y ZSBzdGFydGluZyBsb2NhdGlvbiBzZXJ2aWNlCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgZG9lcyBu b3QgaW50cm9kdWNlIGFueSBjaGFuZ2UgaW4gYmVoYXZpb3IgZm9yIGFueSBwbGF0Zm9ybS4gU28g dGhlcmUgYXJlIG5vIG5ldyB0ZXN0cworICAgICAgICBhZGRlZC4KKworICAgICAgICAqIFdlYkNv cmUucHJvOgorICAgICAgICAqIHBhZ2UvR2VvbG9jYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6R2VvbG9jYXRpb246OnN0YXJ0UmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpHZW9sb2Nh dGlvbjo6c2V0SXNBbGxvd2VkKToKKyAgICAgICAgKFdlYkNvcmU6Okdlb2xvY2F0aW9uOjpzdGFy dFVwZGF0aW5nKToKKyAgICAgICAgKiBwYWdlL0dlb2xvY2F0aW9uLmg6CisKIDIwMTAtMDctMTkg IERpcmsgU2NodWx6ZSAgPGtyaXRAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBO aWtvbGFzIFppbW1lcm1hbm4uCkluZGV4OiBXZWJDb3JlL1dlYkNvcmUucHJvCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvV2ViQ29yZS5wcm8JKHJldmlzaW9uIDYzNzIxKQorKysgV2ViQ29yZS9XZWJD b3JlLnBybwkod29ya2luZyBjb3B5KQpAQCAtMjcwNSw2ICsyNzA1LDkgQEAgY29udGFpbnMoREVG SU5FUywgRU5BQkxFX1FUX0JFQVJFUj0xKSB7CiB9CiAKIGNvbnRhaW5zKERFRklORVMsIEVOQUJM RV9HRU9MT0NBVElPTj0xKSB7CisgICAgIyBpZiBnZW9sb2NhdGlvbiBpcyBlbmFibGVkLCBlbmFi bGUgcHJlLXJlcXVlc3QgZm9yIHBlcm1pc3Npb24gcG9saWN5CisgICAgREVGSU5FUyArPSBXVEZf VVNFX1BSRUVNUFRfR0VPTE9DQVRJT05fUEVSTUlTU0lPTgorCiAgICAgSEVBREVSUyArPSBcCiAg ICAgICAgIHBsYXRmb3JtL3F0L0dlb2xvY2F0aW9uU2VydmljZVF0LmgKICAgICBTT1VSQ0VTICs9 IFwKSW5kZXg6IFdlYkNvcmUvcGFnZS9HZW9sb2NhdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9wYWdlL0dlb2xvY2F0aW9uLmNwcAkocmV2aXNpb24gNjM3MjEpCisrKyBXZWJDb3JlL3Bh Z2UvR2VvbG9jYXRpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNzksNyArMjc5LDcgQEAgUGFz c1JlZlB0cjxHZW9sb2NhdGlvbjo6R2VvTm90aWZpZXI+IEdlbwogICAgIGVsc2UgaWYgKGhhdmVT dWl0YWJsZUNhY2hlZFBvc2l0aW9uKG5vdGlmaWVyLT5tX29wdGlvbnMuZ2V0KCkpKQogICAgICAg ICBub3RpZmllci0+c2V0VXNlQ2FjaGVkUG9zaXRpb24oKTsKICAgICBlbHNlIGlmIChub3RpZmll ci0+aGFzWmVyb1RpbWVvdXQoKSB8fCBzdGFydFVwZGF0aW5nKG5vdGlmaWVyLmdldCgpKSkgewot I2lmIEVOQUJMRShDTElFTlRfQkFTRURfR0VPTE9DQVRJT04pCisjaWYgVVNFKFBSRUVNUFRfR0VP TE9DQVRJT05fUEVSTUlTU0lPTikKICAgICAgICAgLy8gT25seSBzdGFydCB0aW1lciBpZiB3ZSdy ZSBub3Qgd2FpdGluZyBmb3IgdXNlciBwZXJtaXNzaW9uLgogICAgICAgICBpZiAoIW1fc3RhcnRS ZXF1ZXN0UGVybWlzc2lvbk5vdGlmaWVyKQogI2VuZGlmICAgICAgICAgICAgCkBAIC00MDAsMTgg KzQwMCwyMiBAQCB2b2lkIEdlb2xvY2F0aW9uOjpzZXRJc0FsbG93ZWQoYm9vbCBhbGxvCiAgICAg Ly8gcG9zaXRpb24uCiAgICAgbV9hbGxvd0dlb2xvY2F0aW9uID0gYWxsb3dlZCA/IFllcyA6IE5v OwogICAgIAotI2lmIEVOQUJMRShDTElFTlRfQkFTRURfR0VPTE9DQVRJT04pCisjaWYgVVNFKFBS RUVNUFRfR0VPTE9DQVRJT05fUEVSTUlTU0lPTikKICAgICBpZiAobV9zdGFydFJlcXVlc3RQZXJt aXNzaW9uTm90aWZpZXIpIHsKICAgICAgICAgaWYgKGlzQWxsb3dlZCgpKSB7CiAgICAgICAgICAg ICAvLyBQZXJtaXNzaW9uIHJlcXVlc3Qgd2FzIG1hZGUgZHVyaW5nIHRoZSBzdGFydFVwZGF0aW5n IHByb2Nlc3MKICAgICAgICAgICAgIG1fc3RhcnRSZXF1ZXN0UGVybWlzc2lvbk5vdGlmaWVyLT5z dGFydFRpbWVySWZOZWVkZWQoKTsKICAgICAgICAgICAgIG1fc3RhcnRSZXF1ZXN0UGVybWlzc2lv bk5vdGlmaWVyID0gMDsKKyNpZiBFTkFCTEUoQ0xJRU5UX0JBU0VEX0dFT0xPQ0FUSU9OKQogICAg ICAgICAgICAgaWYgKCFtX2ZyYW1lKQogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAg ICAgIFBhZ2UqIHBhZ2UgPSBtX2ZyYW1lLT5wYWdlKCk7CiAgICAgICAgICAgICBpZiAoIXBhZ2Up CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgcGFnZS0+Z2VvbG9jYXRpb25D b250cm9sbGVyKCktPmFkZE9ic2VydmVyKHRoaXMpOworI2Vsc2UKKyAgICAgICAgICAgIC8vVE9E TzogSGFuZGxlIHN0YXJ0VXBkYXRlKCkgZm9yIG5vbi1jbGllbnQgYmFzZWQgaW1wbGVtZW50YXRp b25zIHVzaW5nIHByZS1lbXB0aXZlIHBvbGljeQorI2VuZGlmCiAgICAgICAgIH0gZWxzZSB7CiAg ICAgICAgICAgICBtX3N0YXJ0UmVxdWVzdFBlcm1pc3Npb25Ob3RpZmllci0+c2V0RmF0YWxFcnJv cihQb3NpdGlvbkVycm9yOjpjcmVhdGUoUG9zaXRpb25FcnJvcjo6UEVSTUlTU0lPTl9ERU5JRUQs IHBlcm1pc3Npb25EZW5pZWRFcnJvck1lc3NhZ2UpKTsKICAgICAgICAgICAgIG1fb25lU2hvdHMu YWRkKG1fc3RhcnRSZXF1ZXN0UGVybWlzc2lvbk5vdGlmaWVyKTsKQEAgLTYxMiwxNSArNjE2LDE1 IEBAIHZvaWQgR2VvbG9jYXRpb246Omdlb2xvY2F0aW9uU2VydmljZUVycm8KIAogYm9vbCBHZW9s b2NhdGlvbjo6c3RhcnRVcGRhdGluZyhHZW9Ob3RpZmllciogbm90aWZpZXIpCiB7Ci0jaWYgRU5B QkxFKENMSUVOVF9CQVNFRF9HRU9MT0NBVElPTikKLSAgICAvLyBGSVhNRTogUGFzcyBvcHRpb25z IHRvIGNsaWVudC4KLQorI2lmIFVTRShQUkVFTVBUX0dFT0xPQ0FUSU9OX1BFUk1JU1NJT04pCiAg ICAgaWYgKCFpc0FsbG93ZWQoKSkgewogICAgICAgICBtX3N0YXJ0UmVxdWVzdFBlcm1pc3Npb25O b3RpZmllciA9IG5vdGlmaWVyOwogICAgICAgICByZXF1ZXN0UGVybWlzc2lvbigpOwogICAgICAg ICByZXR1cm4gdHJ1ZTsKICAgICB9Ci0gICAgCisjZW5kaWYKKworI2lmIEVOQUJMRShDTElFTlRf QkFTRURfR0VPTE9DQVRJT04pCiAgICAgaWYgKCFtX2ZyYW1lKQogICAgICAgICByZXR1cm4gZmFs c2U7CiAKQEAgLTYyOCw2ICs2MzIsNyBAQCBib29sIEdlb2xvY2F0aW9uOjpzdGFydFVwZGF0aW5n KEdlb05vdGlmCiAgICAgaWYgKCFwYWdlKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKKyAgICAv LyBGSVhNRTogUGFzcyBvcHRpb25zIHRvIGNsaWVudC4KICAgICBwYWdlLT5nZW9sb2NhdGlvbkNv bnRyb2xsZXIoKS0+YWRkT2JzZXJ2ZXIodGhpcyk7CiAgICAgcmV0dXJuIHRydWU7CiAjZWxzZQpJ bmRleDogV2ViQ29yZS9wYWdlL0dlb2xvY2F0aW9uLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9w YWdlL0dlb2xvY2F0aW9uLmgJKHJldmlzaW9uIDYzNzIxKQorKysgV2ViQ29yZS9wYWdlL0dlb2xv Y2F0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTE2NSw3ICsxNjUsOCBAQCBwcml2YXRlOgogICAg IEZyYW1lKiBtX2ZyYW1lOwogI2lmICFFTkFCTEUoQ0xJRU5UX0JBU0VEX0dFT0xPQ0FUSU9OKQog ICAgIE93blB0cjxHZW9sb2NhdGlvblNlcnZpY2U+IG1fc2VydmljZTsKLSNlbHNlCisjZW5kaWYK KyNpZiBVU0UoUFJFRU1QVF9HRU9MT0NBVElPTl9QRVJNSVNTSU9OKQogICAgIFJlZlB0cjxHZW9O b3RpZmllcj4gbV9zdGFydFJlcXVlc3RQZXJtaXNzaW9uTm90aWZpZXI7CiAjZW5kaWYKICAgICBS ZWZQdHI8R2VvcG9zaXRpb24+IG1fbGFzdFBvc2l0aW9uOwo= 62052 2010-07-20 03:12:24 -0700 2010-07-20 09:39:39 -0700 style issues corrected geo_user_policy.patch text/plain 5907 maheshk SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDYzNzIxKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDctMTkgIE1haGVzaCBL dWxrYXJuaSAgPG1haGVzaC5rdWxrYXJuaUBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTmVlZCB0byBiZSBhYmxlIHRvIGNvbmZpZ3Vy ZSBHZW9sb2NhdGlvbiBwb2xpY3kgcmVnYXJkaW5nIHVzZXIgcGVybWlzc2lvbnMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyMDY4CisKKyAgICAgICAg SWYgQ0xJRU5UX0JBU0VEX0dFT0xPQ0FUSU9OIGlzIGVuYWJsZWQsIGVuYWJsZSBwcmVlbXRpdmUg cGVybWlzc2lvbiBwb2xpY3kKKyAgICAgICAgYnkgZGVmYXVsdCAKKworICAgICAgICAqIHd0Zi9Q bGF0Zm9ybS5oOgorICAgICAgICAKIDIwMTAtMDctMTkgIERpcmsgU2NodWx6ZSAgPGtyaXRAd2Vi a2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBOaWtvbGFzIFppbW1lcm1hbm4uCkluZGV4 OiBKYXZhU2NyaXB0Q29yZS93dGYvUGxhdGZvcm0uaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS93dGYvUGxhdGZvcm0uaAkocmV2aXNpb24gNjM3MjEpCisrKyBKYXZhU2NyaXB0Q29yZS93 dGYvUGxhdGZvcm0uaAkod29ya2luZyBjb3B5KQpAQCAtMTExNiw0ICsxMTE2LDExIEBAIG9uIE1p bkdXLiBTZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2gKICNkZWZpbmUgV1RGX1VTRV9QTEFU Rk9STV9TVFJBVEVHSUVTIDEKICNlbmRpZgogCisvKiBHZW9sb2NhdGlvbiByZXF1ZXN0IHBvbGlj eS4gcHJlLWVtcHRpdmUgcG9saWN5IGlzIHRvIGFjcXVpcmUgdXNlciBwZXJtaXNzaW9uIGJlZm9y ZSBhY3F1aXJpbmcgbG9jYXRpb24uCisgICBDbGllbnQgYmFzZWQgaW1wbGVtZW50YXRpb25zIHdp bGwgaGF2ZSBvcHRpb24gdG8gY2hvb3NlIGJldHdlZW4gcHJlLWVtcHRpdmUgYW5kIG5vbnByZS1l bXB0aXZlIHBlcm1pc3Npb24gcG9saWN5LgorICAgcHJlLWVtcHRpdmUgcGVybWlzc2lvbiBwb2xp Y3kgaXMgZW5hYmxlZCBieSBkZWZhdWx0IGZvciBhbGwgY2xpZW50LWJhc2VkIGltcGxlbWVudGF0 aW9ucy4gKi8KKyNpZiBFTkFCTEUoQ0xJRU5UX0JBU0VEX0dFT0xPQ0FUSU9OKQorI2RlZmluZSBX VEZfVVNFX1BSRUVNUFRfR0VPTE9DQVRJT05fUEVSTUlTU0lPTgorI2VuZGlmCisKICNlbmRpZiAv KiBXVEZfUGxhdGZvcm1faCAqLwpJbmRleDogV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDYzNzIxKQorKysgV2ViQ29yZS9DaGFuZ2VM b2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMyBAQAorMjAxMC0wNy0xOSAgTWFoZXNoIEt1 bGthcm5pICA8bWFoZXNoLmt1bGthcm5pQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOZWVkIHRvIGJlIGFibGUgdG8gY29uZmlndXJl IEdlb2xvY2F0aW9uIHBvbGljeSByZWdhcmRpbmcgdXNlciBwZXJtaXNzaW9ucworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDIwNjgKKworICAgICAgICBJ bnRyb2R1Y2luZyBuZXcgVVNFKCkgZmxhZyBQUkVFTVBUX0dFT0xPQ0FUSU9OX1BSRU1JU1NJT04g dXNpbmcgd2hpY2gKKyAgICAgICAgYWNxdWlyZXMgdXNlciBwZXJtaXNzaW9uIGZpcnN0IGJlZm9y ZSBzdGFydGluZyBsb2NhdGlvbiBzZXJ2aWNlCisKKyAgICAgICAgVGhpcyBjaGFuZ2UgZG9lcyBu b3QgaW50cm9kdWNlIGFueSBjaGFuZ2UgaW4gYmVoYXZpb3IgZm9yIGFueSBwbGF0Zm9ybS4gU28g dGhlcmUgYXJlIG5vIG5ldyB0ZXN0cworICAgICAgICBhZGRlZC4KKworICAgICAgICAqIFdlYkNv cmUucHJvOgorICAgICAgICAqIHBhZ2UvR2VvbG9jYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6R2VvbG9jYXRpb246OnN0YXJ0UmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpHZW9sb2Nh dGlvbjo6c2V0SXNBbGxvd2VkKToKKyAgICAgICAgKFdlYkNvcmU6Okdlb2xvY2F0aW9uOjpzdGFy dFVwZGF0aW5nKToKKyAgICAgICAgKiBwYWdlL0dlb2xvY2F0aW9uLmg6CisKIDIwMTAtMDctMTkg IERpcmsgU2NodWx6ZSAgPGtyaXRAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBO aWtvbGFzIFppbW1lcm1hbm4uCkluZGV4OiBXZWJDb3JlL1dlYkNvcmUucHJvCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvV2ViQ29yZS5wcm8JKHJldmlzaW9uIDYzNzIxKQorKysgV2ViQ29yZS9XZWJD b3JlLnBybwkod29ya2luZyBjb3B5KQpAQCAtMjcwNSw2ICsyNzA1LDkgQEAgY29udGFpbnMoREVG SU5FUywgRU5BQkxFX1FUX0JFQVJFUj0xKSB7CiB9CiAKIGNvbnRhaW5zKERFRklORVMsIEVOQUJM RV9HRU9MT0NBVElPTj0xKSB7CisgICAgIyBpZiBnZW9sb2NhdGlvbiBpcyBlbmFibGVkLCBlbmFi bGUgcHJlLXJlcXVlc3QgZm9yIHBlcm1pc3Npb24gcG9saWN5CisgICAgREVGSU5FUyArPSBXVEZf VVNFX1BSRUVNUFRfR0VPTE9DQVRJT05fUEVSTUlTU0lPTgorCiAgICAgSEVBREVSUyArPSBcCiAg ICAgICAgIHBsYXRmb3JtL3F0L0dlb2xvY2F0aW9uU2VydmljZVF0LmgKICAgICBTT1VSQ0VTICs9 IFwKSW5kZXg6IFdlYkNvcmUvcGFnZS9HZW9sb2NhdGlvbi5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9wYWdlL0dlb2xvY2F0aW9uLmNwcAkocmV2aXNpb24gNjM3MjEpCisrKyBXZWJDb3JlL3Bh Z2UvR2VvbG9jYXRpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNzksNyArMjc5LDcgQEAgUGFz c1JlZlB0cjxHZW9sb2NhdGlvbjo6R2VvTm90aWZpZXI+IEdlbwogICAgIGVsc2UgaWYgKGhhdmVT dWl0YWJsZUNhY2hlZFBvc2l0aW9uKG5vdGlmaWVyLT5tX29wdGlvbnMuZ2V0KCkpKQogICAgICAg ICBub3RpZmllci0+c2V0VXNlQ2FjaGVkUG9zaXRpb24oKTsKICAgICBlbHNlIGlmIChub3RpZmll ci0+aGFzWmVyb1RpbWVvdXQoKSB8fCBzdGFydFVwZGF0aW5nKG5vdGlmaWVyLmdldCgpKSkgewot I2lmIEVOQUJMRShDTElFTlRfQkFTRURfR0VPTE9DQVRJT04pCisjaWYgVVNFKFBSRUVNUFRfR0VP TE9DQVRJT05fUEVSTUlTU0lPTikKICAgICAgICAgLy8gT25seSBzdGFydCB0aW1lciBpZiB3ZSdy ZSBub3Qgd2FpdGluZyBmb3IgdXNlciBwZXJtaXNzaW9uLgogICAgICAgICBpZiAoIW1fc3RhcnRS ZXF1ZXN0UGVybWlzc2lvbk5vdGlmaWVyKQogI2VuZGlmICAgICAgICAgICAgCkBAIC00MDAsMTgg KzQwMCwyMiBAQCB2b2lkIEdlb2xvY2F0aW9uOjpzZXRJc0FsbG93ZWQoYm9vbCBhbGxvCiAgICAg Ly8gcG9zaXRpb24uCiAgICAgbV9hbGxvd0dlb2xvY2F0aW9uID0gYWxsb3dlZCA/IFllcyA6IE5v OwogICAgIAotI2lmIEVOQUJMRShDTElFTlRfQkFTRURfR0VPTE9DQVRJT04pCisjaWYgVVNFKFBS RUVNUFRfR0VPTE9DQVRJT05fUEVSTUlTU0lPTikKICAgICBpZiAobV9zdGFydFJlcXVlc3RQZXJt aXNzaW9uTm90aWZpZXIpIHsKICAgICAgICAgaWYgKGlzQWxsb3dlZCgpKSB7CiAgICAgICAgICAg ICAvLyBQZXJtaXNzaW9uIHJlcXVlc3Qgd2FzIG1hZGUgZHVyaW5nIHRoZSBzdGFydFVwZGF0aW5n IHByb2Nlc3MKICAgICAgICAgICAgIG1fc3RhcnRSZXF1ZXN0UGVybWlzc2lvbk5vdGlmaWVyLT5z dGFydFRpbWVySWZOZWVkZWQoKTsKICAgICAgICAgICAgIG1fc3RhcnRSZXF1ZXN0UGVybWlzc2lv bk5vdGlmaWVyID0gMDsKKyNpZiBFTkFCTEUoQ0xJRU5UX0JBU0VEX0dFT0xPQ0FUSU9OKQogICAg ICAgICAgICAgaWYgKCFtX2ZyYW1lKQogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAg ICAgIFBhZ2UqIHBhZ2UgPSBtX2ZyYW1lLT5wYWdlKCk7CiAgICAgICAgICAgICBpZiAoIXBhZ2Up CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgcGFnZS0+Z2VvbG9jYXRpb25D b250cm9sbGVyKCktPmFkZE9ic2VydmVyKHRoaXMpOworI2Vsc2UKKyAgICAgICAgICAgIC8vIFRP RE86IEhhbmRsZSBzdGFydFVwZGF0ZSgpIGZvciBub24tY2xpZW50IGJhc2VkIGltcGxlbWVudGF0 aW9ucyB1c2luZyBwcmUtZW1wdGl2ZSBwb2xpY3kKKyNlbmRpZgogICAgICAgICB9IGVsc2Ugewog ICAgICAgICAgICAgbV9zdGFydFJlcXVlc3RQZXJtaXNzaW9uTm90aWZpZXItPnNldEZhdGFsRXJy b3IoUG9zaXRpb25FcnJvcjo6Y3JlYXRlKFBvc2l0aW9uRXJyb3I6OlBFUk1JU1NJT05fREVOSUVE LCBwZXJtaXNzaW9uRGVuaWVkRXJyb3JNZXNzYWdlKSk7CiAgICAgICAgICAgICBtX29uZVNob3Rz LmFkZChtX3N0YXJ0UmVxdWVzdFBlcm1pc3Npb25Ob3RpZmllcik7CkBAIC02MTIsMTUgKzYxNiwx NSBAQCB2b2lkIEdlb2xvY2F0aW9uOjpnZW9sb2NhdGlvblNlcnZpY2VFcnJvCiAKIGJvb2wgR2Vv bG9jYXRpb246OnN0YXJ0VXBkYXRpbmcoR2VvTm90aWZpZXIqIG5vdGlmaWVyKQogewotI2lmIEVO QUJMRShDTElFTlRfQkFTRURfR0VPTE9DQVRJT04pCi0gICAgLy8gRklYTUU6IFBhc3Mgb3B0aW9u cyB0byBjbGllbnQuCi0KKyNpZiBVU0UoUFJFRU1QVF9HRU9MT0NBVElPTl9QRVJNSVNTSU9OKQog ICAgIGlmICghaXNBbGxvd2VkKCkpIHsKICAgICAgICAgbV9zdGFydFJlcXVlc3RQZXJtaXNzaW9u Tm90aWZpZXIgPSBub3RpZmllcjsKICAgICAgICAgcmVxdWVzdFBlcm1pc3Npb24oKTsKICAgICAg ICAgcmV0dXJuIHRydWU7CiAgICAgfQotICAgIAorI2VuZGlmCisKKyNpZiBFTkFCTEUoQ0xJRU5U X0JBU0VEX0dFT0xPQ0FUSU9OKQogICAgIGlmICghbV9mcmFtZSkKICAgICAgICAgcmV0dXJuIGZh bHNlOwogCkBAIC02MjgsNiArNjMyLDcgQEAgYm9vbCBHZW9sb2NhdGlvbjo6c3RhcnRVcGRhdGlu ZyhHZW9Ob3RpZgogICAgIGlmICghcGFnZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCisgICAg Ly8gRklYTUU6IFBhc3Mgb3B0aW9ucyB0byBjbGllbnQuCiAgICAgcGFnZS0+Z2VvbG9jYXRpb25D b250cm9sbGVyKCktPmFkZE9ic2VydmVyKHRoaXMpOwogICAgIHJldHVybiB0cnVlOwogI2Vsc2UK SW5kZXg6IFdlYkNvcmUvcGFnZS9HZW9sb2NhdGlvbi5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv cGFnZS9HZW9sb2NhdGlvbi5oCShyZXZpc2lvbiA2MzcyMSkKKysrIFdlYkNvcmUvcGFnZS9HZW9s b2NhdGlvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNjUsNyArMTY1LDggQEAgcHJpdmF0ZToKICAg ICBGcmFtZSogbV9mcmFtZTsKICNpZiAhRU5BQkxFKENMSUVOVF9CQVNFRF9HRU9MT0NBVElPTikK ICAgICBPd25QdHI8R2VvbG9jYXRpb25TZXJ2aWNlPiBtX3NlcnZpY2U7Ci0jZWxzZQorI2VuZGlm CisjaWYgVVNFKFBSRUVNUFRfR0VPTE9DQVRJT05fUEVSTUlTU0lPTikKICAgICBSZWZQdHI8R2Vv Tm90aWZpZXI+IG1fc3RhcnRSZXF1ZXN0UGVybWlzc2lvbk5vdGlmaWVyOwogI2VuZGlmCiAgICAg UmVmUHRyPEdlb3Bvc2l0aW9uPiBtX2xhc3RQb3NpdGlvbjsK 62084 2010-07-20 09:39:39 -0700 2010-07-20 11:59:21 -0700 build fix geo_user_policy.patch text/plain 5909 maheshk SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDYzNzIxKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMDctMTkgIE1haGVzaCBL dWxrYXJuaSAgPG1haGVzaC5rdWxrYXJuaUBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTmVlZCB0byBiZSBhYmxlIHRvIGNvbmZpZ3Vy ZSBHZW9sb2NhdGlvbiBwb2xpY3kgcmVnYXJkaW5nIHVzZXIgcGVybWlzc2lvbnMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyMDY4CisKKyAgICAgICAg SWYgQ0xJRU5UX0JBU0VEX0dFT0xPQ0FUSU9OIGlzIGVuYWJsZWQsIGVuYWJsZSBwcmVlbXRpdmUg cGVybWlzc2lvbiBwb2xpY3kKKyAgICAgICAgYnkgZGVmYXVsdCAKKworICAgICAgICAqIHd0Zi9Q bGF0Zm9ybS5oOgorICAgICAgICAKIDIwMTAtMDctMTkgIERpcmsgU2NodWx6ZSAgPGtyaXRAd2Vi a2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBOaWtvbGFzIFppbW1lcm1hbm4uCkluZGV4 OiBKYXZhU2NyaXB0Q29yZS93dGYvUGxhdGZvcm0uaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS93dGYvUGxhdGZvcm0uaAkocmV2aXNpb24gNjM3MjEpCisrKyBKYXZhU2NyaXB0Q29yZS93 dGYvUGxhdGZvcm0uaAkod29ya2luZyBjb3B5KQpAQCAtMTExNiw0ICsxMTE2LDExIEBAIG9uIE1p bkdXLiBTZWUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2gKICNkZWZpbmUgV1RGX1VTRV9QTEFU Rk9STV9TVFJBVEVHSUVTIDEKICNlbmRpZgogCisvKiBHZW9sb2NhdGlvbiByZXF1ZXN0IHBvbGlj eS4gcHJlLWVtcHRpdmUgcG9saWN5IGlzIHRvIGFjcXVpcmUgdXNlciBwZXJtaXNzaW9uIGJlZm9y ZSBhY3F1aXJpbmcgbG9jYXRpb24uCisgICBDbGllbnQgYmFzZWQgaW1wbGVtZW50YXRpb25zIHdp bGwgaGF2ZSBvcHRpb24gdG8gY2hvb3NlIGJldHdlZW4gcHJlLWVtcHRpdmUgYW5kIG5vbnByZS1l bXB0aXZlIHBlcm1pc3Npb24gcG9saWN5LgorICAgcHJlLWVtcHRpdmUgcGVybWlzc2lvbiBwb2xp Y3kgaXMgZW5hYmxlZCBieSBkZWZhdWx0IGZvciBhbGwgY2xpZW50LWJhc2VkIGltcGxlbWVudGF0 aW9ucy4gKi8KKyNpZiBFTkFCTEUoQ0xJRU5UX0JBU0VEX0dFT0xPQ0FUSU9OKQorI2RlZmluZSBX VEZfVVNFX1BSRUVNUFRfR0VPTE9DQVRJT05fUEVSTUlTU0lPTiAxCisjZW5kaWYKKwogI2VuZGlm IC8qIFdURl9QbGF0Zm9ybV9oICovCkluZGV4OiBXZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gNjM3MjEpCisrKyBXZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDEwLTA3LTE5ICBNYWhlc2gg S3Vsa2FybmkgIDxtYWhlc2gua3Vsa2FybmlAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5lZWQgdG8gYmUgYWJsZSB0byBjb25maWd1 cmUgR2VvbG9jYXRpb24gcG9saWN5IHJlZ2FyZGluZyB1c2VyIHBlcm1pc3Npb25zCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MjA2OAorCisgICAgICAg IEludHJvZHVjaW5nIG5ldyBVU0UoKSBmbGFnIFBSRUVNUFRfR0VPTE9DQVRJT05fUFJFTUlTU0lP TiB1c2luZyB3aGljaAorICAgICAgICBhY3F1aXJlcyB1c2VyIHBlcm1pc3Npb24gZmlyc3QgYmVm b3JlIHN0YXJ0aW5nIGxvY2F0aW9uIHNlcnZpY2UKKworICAgICAgICBUaGlzIGNoYW5nZSBkb2Vz IG5vdCBpbnRyb2R1Y2UgYW55IGNoYW5nZSBpbiBiZWhhdmlvciBmb3IgYW55IHBsYXRmb3JtLiBT byB0aGVyZSBhcmUgbm8gbmV3IHRlc3RzCisgICAgICAgIGFkZGVkLgorCisgICAgICAgICogV2Vi Q29yZS5wcm86CisgICAgICAgICogcGFnZS9HZW9sb2NhdGlvbi5jcHA6CisgICAgICAgIChXZWJD b3JlOjpHZW9sb2NhdGlvbjo6c3RhcnRSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6Okdlb2xv Y2F0aW9uOjpzZXRJc0FsbG93ZWQpOgorICAgICAgICAoV2ViQ29yZTo6R2VvbG9jYXRpb246OnN0 YXJ0VXBkYXRpbmcpOgorICAgICAgICAqIHBhZ2UvR2VvbG9jYXRpb24uaDoKKwogMjAxMC0wNy0x OSAgRGlyayBTY2h1bHplICA8a3JpdEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IE5pa29sYXMgWmltbWVybWFubi4KSW5kZXg6IFdlYkNvcmUvV2ViQ29yZS5wcm8KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9XZWJDb3JlLnBybwkocmV2aXNpb24gNjM3MjEpCisrKyBXZWJDb3JlL1dl YkNvcmUucHJvCSh3b3JraW5nIGNvcHkpCkBAIC0yNzA1LDYgKzI3MDUsOSBAQCBjb250YWlucyhE RUZJTkVTLCBFTkFCTEVfUVRfQkVBUkVSPTEpIHsKIH0KIAogY29udGFpbnMoREVGSU5FUywgRU5B QkxFX0dFT0xPQ0FUSU9OPTEpIHsKKyAgICAjIGlmIGdlb2xvY2F0aW9uIGlzIGVuYWJsZWQsIGVu YWJsZSBwcmUtcmVxdWVzdCBmb3IgcGVybWlzc2lvbiBwb2xpY3kKKyAgICBERUZJTkVTICs9IFdU Rl9VU0VfUFJFRU1QVF9HRU9MT0NBVElPTl9QRVJNSVNTSU9OCisKICAgICBIRUFERVJTICs9IFwK ICAgICAgICAgcGxhdGZvcm0vcXQvR2VvbG9jYXRpb25TZXJ2aWNlUXQuaAogICAgIFNPVVJDRVMg Kz0gXApJbmRleDogV2ViQ29yZS9wYWdlL0dlb2xvY2F0aW9uLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3BhZ2UvR2VvbG9jYXRpb24uY3BwCShyZXZpc2lvbiA2MzcyMSkKKysrIFdlYkNvcmUv cGFnZS9HZW9sb2NhdGlvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI3OSw3ICsyNzksNyBAQCBQ YXNzUmVmUHRyPEdlb2xvY2F0aW9uOjpHZW9Ob3RpZmllcj4gR2VvCiAgICAgZWxzZSBpZiAoaGF2 ZVN1aXRhYmxlQ2FjaGVkUG9zaXRpb24obm90aWZpZXItPm1fb3B0aW9ucy5nZXQoKSkpCiAgICAg ICAgIG5vdGlmaWVyLT5zZXRVc2VDYWNoZWRQb3NpdGlvbigpOwogICAgIGVsc2UgaWYgKG5vdGlm aWVyLT5oYXNaZXJvVGltZW91dCgpIHx8IHN0YXJ0VXBkYXRpbmcobm90aWZpZXIuZ2V0KCkpKSB7 Ci0jaWYgRU5BQkxFKENMSUVOVF9CQVNFRF9HRU9MT0NBVElPTikKKyNpZiBVU0UoUFJFRU1QVF9H RU9MT0NBVElPTl9QRVJNSVNTSU9OKQogICAgICAgICAvLyBPbmx5IHN0YXJ0IHRpbWVyIGlmIHdl J3JlIG5vdCB3YWl0aW5nIGZvciB1c2VyIHBlcm1pc3Npb24uCiAgICAgICAgIGlmICghbV9zdGFy dFJlcXVlc3RQZXJtaXNzaW9uTm90aWZpZXIpCiAjZW5kaWYgICAgICAgICAgICAKQEAgLTQwMCwx OCArNDAwLDIyIEBAIHZvaWQgR2VvbG9jYXRpb246OnNldElzQWxsb3dlZChib29sIGFsbG8KICAg ICAvLyBwb3NpdGlvbi4KICAgICBtX2FsbG93R2VvbG9jYXRpb24gPSBhbGxvd2VkID8gWWVzIDog Tm87CiAgICAgCi0jaWYgRU5BQkxFKENMSUVOVF9CQVNFRF9HRU9MT0NBVElPTikKKyNpZiBVU0Uo UFJFRU1QVF9HRU9MT0NBVElPTl9QRVJNSVNTSU9OKQogICAgIGlmIChtX3N0YXJ0UmVxdWVzdFBl cm1pc3Npb25Ob3RpZmllcikgewogICAgICAgICBpZiAoaXNBbGxvd2VkKCkpIHsKICAgICAgICAg ICAgIC8vIFBlcm1pc3Npb24gcmVxdWVzdCB3YXMgbWFkZSBkdXJpbmcgdGhlIHN0YXJ0VXBkYXRp bmcgcHJvY2VzcwogICAgICAgICAgICAgbV9zdGFydFJlcXVlc3RQZXJtaXNzaW9uTm90aWZpZXIt PnN0YXJ0VGltZXJJZk5lZWRlZCgpOwogICAgICAgICAgICAgbV9zdGFydFJlcXVlc3RQZXJtaXNz aW9uTm90aWZpZXIgPSAwOworI2lmIEVOQUJMRShDTElFTlRfQkFTRURfR0VPTE9DQVRJT04pCiAg ICAgICAgICAgICBpZiAoIW1fZnJhbWUpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAg ICAgICAgUGFnZSogcGFnZSA9IG1fZnJhbWUtPnBhZ2UoKTsKICAgICAgICAgICAgIGlmICghcGFn ZSkKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICBwYWdlLT5nZW9sb2NhdGlv bkNvbnRyb2xsZXIoKS0+YWRkT2JzZXJ2ZXIodGhpcyk7CisjZWxzZQorICAgICAgICAgICAgLy8g VE9ETzogSGFuZGxlIHN0YXJ0VXBkYXRlKCkgZm9yIG5vbi1jbGllbnQgYmFzZWQgaW1wbGVtZW50 YXRpb25zIHVzaW5nIHByZS1lbXB0aXZlIHBvbGljeQorI2VuZGlmCiAgICAgICAgIH0gZWxzZSB7 CiAgICAgICAgICAgICBtX3N0YXJ0UmVxdWVzdFBlcm1pc3Npb25Ob3RpZmllci0+c2V0RmF0YWxF cnJvcihQb3NpdGlvbkVycm9yOjpjcmVhdGUoUG9zaXRpb25FcnJvcjo6UEVSTUlTU0lPTl9ERU5J RUQsIHBlcm1pc3Npb25EZW5pZWRFcnJvck1lc3NhZ2UpKTsKICAgICAgICAgICAgIG1fb25lU2hv dHMuYWRkKG1fc3RhcnRSZXF1ZXN0UGVybWlzc2lvbk5vdGlmaWVyKTsKQEAgLTYxMiwxNSArNjE2 LDE1IEBAIHZvaWQgR2VvbG9jYXRpb246Omdlb2xvY2F0aW9uU2VydmljZUVycm8KIAogYm9vbCBH ZW9sb2NhdGlvbjo6c3RhcnRVcGRhdGluZyhHZW9Ob3RpZmllciogbm90aWZpZXIpCiB7Ci0jaWYg RU5BQkxFKENMSUVOVF9CQVNFRF9HRU9MT0NBVElPTikKLSAgICAvLyBGSVhNRTogUGFzcyBvcHRp b25zIHRvIGNsaWVudC4KLQorI2lmIFVTRShQUkVFTVBUX0dFT0xPQ0FUSU9OX1BFUk1JU1NJT04p CiAgICAgaWYgKCFpc0FsbG93ZWQoKSkgewogICAgICAgICBtX3N0YXJ0UmVxdWVzdFBlcm1pc3Np b25Ob3RpZmllciA9IG5vdGlmaWVyOwogICAgICAgICByZXF1ZXN0UGVybWlzc2lvbigpOwogICAg ICAgICByZXR1cm4gdHJ1ZTsKICAgICB9Ci0gICAgCisjZW5kaWYKKworI2lmIEVOQUJMRShDTElF TlRfQkFTRURfR0VPTE9DQVRJT04pCiAgICAgaWYgKCFtX2ZyYW1lKQogICAgICAgICByZXR1cm4g ZmFsc2U7CiAKQEAgLTYyOCw2ICs2MzIsNyBAQCBib29sIEdlb2xvY2F0aW9uOjpzdGFydFVwZGF0 aW5nKEdlb05vdGlmCiAgICAgaWYgKCFwYWdlKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKKyAg ICAvLyBGSVhNRTogUGFzcyBvcHRpb25zIHRvIGNsaWVudC4KICAgICBwYWdlLT5nZW9sb2NhdGlv bkNvbnRyb2xsZXIoKS0+YWRkT2JzZXJ2ZXIodGhpcyk7CiAgICAgcmV0dXJuIHRydWU7CiAjZWxz ZQpJbmRleDogV2ViQ29yZS9wYWdlL0dlb2xvY2F0aW9uLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9wYWdlL0dlb2xvY2F0aW9uLmgJKHJldmlzaW9uIDYzNzIxKQorKysgV2ViQ29yZS9wYWdlL0dl b2xvY2F0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTE2NSw3ICsxNjUsOCBAQCBwcml2YXRlOgog ICAgIEZyYW1lKiBtX2ZyYW1lOwogI2lmICFFTkFCTEUoQ0xJRU5UX0JBU0VEX0dFT0xPQ0FUSU9O KQogICAgIE93blB0cjxHZW9sb2NhdGlvblNlcnZpY2U+IG1fc2VydmljZTsKLSNlbHNlCisjZW5k aWYKKyNpZiBVU0UoUFJFRU1QVF9HRU9MT0NBVElPTl9QRVJNSVNTSU9OKQogICAgIFJlZlB0cjxH ZW9Ob3RpZmllcj4gbV9zdGFydFJlcXVlc3RQZXJtaXNzaW9uTm90aWZpZXI7CiAjZW5kaWYKICAg ICBSZWZQdHI8R2VvcG9zaXRpb24+IG1fbGFzdFBvc2l0aW9uOwo=