<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE bugzilla SYSTEM "https://bugs.webkit.org/page.cgi?id=bugzilla.dtd">

<bugzilla version="5.0.4.1"
          urlbase="https://bugs.webkit.org/"
          
          maintainer="admin@webkit.org"
>

    <bug>
          <bug_id>156651</bug_id>
          
          <creation_ts>2016-04-15 18:12:08 -0700</creation_ts>
          <short_desc>[GTK] Expose AllowUniversalAccessFromFileURLs preference now that calling localStorage.getItem() results in SecurityError: DOM Exception 18</short_desc>
          <delta_ts>2021-06-12 08:07:31 -0700</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>WebKitGTK</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Linux</op_sys>
          <bug_status>REOPENED</bug_status>
          <resolution></resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords></keywords>
          <priority>P1</priority>
          <bug_severity>Critical</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Dustin Falgout">dustin</reporter>
          <assigned_to name="Nobody">webkit-unassigned</assigned_to>
          <cc>berto</cc>
    
    <cc>bfulgham</cc>
    
    <cc>bugs-noreply</cc>
    
    <cc>cgarcia</cc>
    
    <cc>commit-queue</cc>
    
    <cc>felix.a.hubble</cc>
    
    <cc>gustavo</cc>
    
    <cc>king_pirate11</cc>
    
    <cc>marco.lazzeri</cc>
    
    <cc>mcatanzaro</cc>
    
    <cc>mrobinson</cc>
    
    <cc>tpopela</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1184300</commentid>
    <comment_count>0</comment_count>
    <who name="Dustin Falgout">dustin</who>
    <bug_when>2016-04-15 18:12:08 -0700</bug_when>
    <thetext>This issue appeared with the latest release of webkit2gtk (2.12.1). It does not occur with the previous version (2.12.0). Please let me know if there is any further information I can provide that might be helpful. Thanks.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184375</commentid>
    <comment_count>1</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2016-04-16 11:46:12 -0700</bug_when>
    <thetext>I guess you are using local file URIs, in which case this is expected behavior after r197858. You can access sessionStorage instead. It&apos;s unfortunate to have a compatibility break in a stable release, but this one looks unavoidable.

(If this is happening for http/https URIs, then we would need to reopen this.)

You miiight be able to access localStorage by using webkit_settings_set_allow_file_access_from_file_urls, but I haven&apos;t tested to see if that would work.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184376</commentid>
    <comment_count>2</comment_count>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2016-04-16 11:59:27 -0700</bug_when>
    <thetext>(In reply to comment #1)
&gt; I guess you are using local file URIs, in which case this is expected
&gt; behavior after r197858. You can access sessionStorage instead. It&apos;s
&gt; unfortunate to have a compatibility break in a stable release, but this one
&gt; looks unavoidable.
&gt; 
&gt; (If this is happening for http/https URIs, then we would need to reopen
&gt; this.)
&gt; 
&gt; You miiight be able to access localStorage by using
&gt; webkit_settings_set_allow_file_access_from_file_urls, but I haven&apos;t tested
&gt; to see if that would work.

(In reply to comment #0)
&gt; This issue appeared with the latest release of webkit2gtk (2.12.1). It does
&gt; not occur with the previous version (2.12.0). Please let me know if there is
&gt; any further information I can provide that might be helpful. Thanks.

The equivalent setting on iOS/OS X is how we deal with this for the WebInspector and other applications seeking to access local storage from local file content.

The point of the earlier security fix is to avoidance case of downloaded HTML content (such as e-mail attachments or JS injected into local contexts) from having access to your local file system and arbitrary local storage.

If you are serving local files in your applications, you can use the suggested preference to tell Webkit that you are approve of these kinds of interactions.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184387</commentid>
    <comment_count>3</comment_count>
    <who name="Dustin Falgout">dustin</who>
    <bug_when>2016-04-16 14:48:02 -0700</bug_when>
    <thetext>The &quot;allow_file_access_from_file_urls&quot; setting does not have any affect on this. We&apos;ve always enabled that setting. I implemented cookies as a fallback for now but it seems like there should be an option to allow access to local storage when the files are served locally (and not downloaded from the web).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184405</commentid>
    <comment_count>4</comment_count>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2016-04-16 17:51:00 -0700</bug_when>
    <thetext>(In reply to comment #3)
&gt; The &quot;allow_file_access_from_file_urls&quot; setting does not have any affect on
&gt; this. We&apos;ve always enabled that setting. I implemented cookies as a fallback
&gt; for now but it seems like there should be an option to allow access to local
&gt; storage when the files are served locally (and not downloaded from the web).

That seems like a bug. I&apos;ll try to give better notes when I&apos;m at my computer.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184414</commentid>
    <comment_count>5</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2016-04-16 18:36:39 -0700</bug_when>
    <thetext>(In reply to comment #4)
&gt; That seems like a bug.

I wonder, because there are two settings here, AllowFileAccessFromFileURLs and AllowUniversalAccessFromFileURLs. Only AllowFileAccessFromFileURLs is exposed by WebKitGTK+, but perhapsAllowUniversalAccessFromFileURLs is the setting that&apos;s needed here?

I&apos;d hate to add new API in a point release, but might be needed here.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184415</commentid>
    <comment_count>6</comment_count>
    <who name="Dustin Falgout">dustin</who>
    <bug_when>2016-04-16 18:39:04 -0700</bug_when>
    <thetext>It was my understanding that &quot;AllowUniversalAccessFromFileURLs&quot; was part of the webkit1 API and not webkit2. Do you think its worth trying to enable both settings being that we are using only webkit2?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184421</commentid>
    <comment_count>7</comment_count>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2016-04-16 19:58:11 -0700</bug_when>
    <thetext>(In reply to comment #6)
&gt; It was my understanding that &quot;AllowUniversalAccessFromFileURLs&quot; was part of
&gt; the webkit1 API and not webkit2. Do you think its worth trying to enable
&gt; both settings being that we are using only webkit2?

Yes -- that&apos;s the setting that controls it. We use the UniversalAccessFromFileURLs setting to gate access.

This is definitely a WK2 supported setting.

-Brent</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184422</commentid>
    <comment_count>8</comment_count>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2016-04-16 20:13:40 -0700</bug_when>
    <thetext>(In reply to comment #7)
&gt; (In reply to comment #6)
&gt; &gt; It was my understanding that &quot;AllowUniversalAccessFromFileURLs&quot; was part of
&gt; &gt; the webkit1 API and not webkit2. Do you think its worth trying to enable
&gt; &gt; both settings being that we are using only webkit2?
&gt; 
&gt; Yes -- that&apos;s the setting that controls it. We use the
&gt; UniversalAccessFromFileURLs setting to gate access.

See &apos;SecurityOrigin::canAccessStorage&apos; for the details. Local storage access is gated (for file:// URLs) on m_universalAccess.

This gets set up in Document::initSecurityContext():

    if (settings-&gt;allowUniversalAccessFromFileURLs()
        || m_frame-&gt;loader().client().shouldForceUniversalAccessFromLocalURL(m_url)) {
        // Some clients want local URLs to have universal access, but that setting is dangerous for other clients.
        securityOrigin()-&gt;grantUniversalAccess();
    }

So, you might be able to do something with the frame loader client&apos;s &quot;shouldForceUniversalAccessFromLocalURL&quot;.

You might be able to use WKBundlePageShouldForceUniversalAccessFromLocalURLCallback to set a function that either always says &quot;Yes, go ahead and use it&quot;, or check for specific URLs that you approve of.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184423</commentid>
    <comment_count>9</comment_count>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2016-04-16 20:16:04 -0700</bug_when>
    <thetext>(In reply to comment #8)
&gt; 
&gt; So, you might be able to do something with the frame loader client&apos;s
&gt; &quot;shouldForceUniversalAccessFromLocalURL&quot;.
&gt; 
&gt; You might be able to use
&gt; WKBundlePageShouldForceUniversalAccessFromLocalURLCallback to set a function
&gt; that either always says &quot;Yes, go ahead and use it&quot;, or check for specific
&gt; URLs that you approve of.

Also:

WKBundleSetAllowUniversalAccessFromFileURLs might be all you need. This is a WKWebViewConfigurationPrivate.h method.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184425</commentid>
    <comment_count>10</comment_count>
    <who name="Dustin Falgout">dustin</who>
    <bug_when>2016-04-16 20:24:56 -0700</bug_when>
    <thetext>Cool. Thanks for the info. 

@Michael, please let me know if there&apos;s anything I can do to help get this fixed.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184439</commentid>
    <comment_count>11</comment_count>
      <attachid>276573</attachid>
    <who name="Dustin Falgout">dustin</who>
    <bug_when>2016-04-16 22:08:50 -0700</bug_when>
    <thetext>Created attachment 276573
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184441</commentid>
    <comment_count>12</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2016-04-16 22:10:22 -0700</bug_when>
    <thetext>Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184443</commentid>
    <comment_count>13</comment_count>
      <attachid>276576</attachid>
    <who name="Dustin Falgout">dustin</who>
    <bug_when>2016-04-16 22:36:18 -0700</bug_when>
    <thetext>Created attachment 276576
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184444</commentid>
    <comment_count>14</comment_count>
      <attachid>276577</attachid>
    <who name="Dustin Falgout">dustin</who>
    <bug_when>2016-04-16 22:41:08 -0700</bug_when>
    <thetext>Created attachment 276577
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184445</commentid>
    <comment_count>15</comment_count>
      <attachid>276578</attachid>
    <who name="Dustin Falgout">dustin</who>
    <bug_when>2016-04-16 22:48:50 -0700</bug_when>
    <thetext>Created attachment 276578
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184446</commentid>
    <comment_count>16</comment_count>
      <attachid>276579</attachid>
    <who name="Dustin Falgout">dustin</who>
    <bug_when>2016-04-16 22:55:19 -0700</bug_when>
    <thetext>Created attachment 276579
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184447</commentid>
    <comment_count>17</comment_count>
    <who name="Dustin Falgout">dustin</who>
    <bug_when>2016-04-16 23:07:10 -0700</bug_when>
    <thetext>I don&apos;t see my commit message on the patch (not sure if that&apos;s normal-I used the webkit-patch script to upload it). Anyway, here is my commit message:


GTK: Expose WebKitAllowUniversalAccessFromFileURLs preference key in WebKitGTK+

As of r197858 JavaScript loaded in the context of a file scheme url cannot access local storage. That is a major breaking change as many applications that serve files locally rely on having access to local storage. The point of the that security fix is to avoid cases of downloaded HTML content (such as e-mail attachments or JS injected into local contexts) from having access to your local file system and arbitrary local storage. If you are serving local files in your applications, you can use the WebKitAllowUniversalAccessFromFileURLs preference key to tell Webkit that you are approve of these kinds of interactions.

https://bugs.webkit.org/show_bug.cgi?id=156651</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184470</commentid>
    <comment_count>18</comment_count>
      <attachid>276579</attachid>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2016-04-17 08:48:05 -0700</bug_when>
    <thetext>Comment on attachment 276579
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=276579&amp;action=review

Please look under Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitSettings.cpp, and add a test at the bottom of testWebKitSettings just to make sure changing the value of the setting actually works. You can just copy the test for AllowFileAccessFromFileURLs and change the name of the setting.

Anyway, this looks good to me; I presume you&apos;ve tested and confirmed it solves your problem. This requires approval from another GTK+ reviewer as it adds new API, though, and from Carlos specifically as the Since tags assume a backport to 2.12.2.

&gt; Source/WebKit2/ChangeLog:7
&gt; +

You should add your commit message here, underneath the reviewed by line, then it will get added to the SVN commit message.

&gt; Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp:1268
&gt; +            _(&quot;Allow local storage access from the context of file scheme URLs&quot;),

Maybe we should say &quot;Allow universal access&quot; here, in case the setting is overloaded for something other than local storage in the future (or if that already is the case).</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184471</commentid>
    <comment_count>19</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2016-04-17 08:50:11 -0700</bug_when>
    <thetext>(In reply to comment #18)
&gt; Please look under
&gt; Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitSettings.cpp, and add a test
&gt; at the bottom of testWebKitSettings just to make sure changing the value of
&gt; the setting actually works. You can just copy the test for
&gt; AllowFileAccessFromFileURLs and change the name of the setting.

Be sure to re-run the prepare-ChangeLog script to create a new changelog under Tools after you do this.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184484</commentid>
    <comment_count>20</comment_count>
      <attachid>276593</attachid>
    <who name="Dustin Falgout">dustin</who>
    <bug_when>2016-04-17 10:21:30 -0700</bug_when>
    <thetext>Created attachment 276593
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184485</commentid>
    <comment_count>21</comment_count>
      <attachid>276594</attachid>
    <who name="Dustin Falgout">dustin</who>
    <bug_when>2016-04-17 10:34:28 -0700</bug_when>
    <thetext>Created attachment 276594
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184492</commentid>
    <comment_count>22</comment_count>
      <attachid>276594</attachid>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2016-04-17 11:04:49 -0700</bug_when>
    <thetext>Comment on attachment 276594
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=276594&amp;action=review

&gt; Source/WebKit2/ChangeLog:8
&gt; +        breaking change as many applications that serve files locally rely on having access to local storage. The point  

Out of curiosity, did this break some free software application? Are you aware of any applications typically included in Linux distributions that would be affected by this? We might need to make an announcement regarding this....</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184500</commentid>
    <comment_count>23</comment_count>
    <who name="Dustin Falgout">dustin</who>
    <bug_when>2016-04-17 12:04:11 -0700</bug_when>
    <thetext>(In reply to comment #22)
&gt; Comment on attachment 276594 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=276594&amp;action=review
&gt; 
&gt; &gt; Source/WebKit2/ChangeLog:8
&gt; &gt; +        breaking change as many applications that serve files locally rely on having access to local storage. The point  
&gt; 
&gt; Out of curiosity, did this break some free software application? Are you
&gt; aware of any applications typically included in Linux distributions that
&gt; would be affected by this? We might need to make an announcement regarding
&gt; this....

I maintain lightdm-webkit2-greeter. We use it as the default greeter for Antergos. This issue broke the greeter for everyone because it never occurred to me that it was in the realm of possibility for local storage to be unavailable. Definitely a lesson learned. I&apos;ve already implemented some changes to prevent failures like this one from breaking the login screen in the future. Back to your question, (sorry), I don&apos;t know of any other affected applications off the top of my head, but I&apos;m sure there are some.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184508</commentid>
    <comment_count>24</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2016-04-17 14:05:59 -0700</bug_when>
    <thetext>Sorry you got hit by this. I put out an warning on webkit-gtk list and GNOME distributor-list.

Do consider that WebKit is probably not a good dependency for a display manager; if you happen to have unlimited time and money, an automated test (e.g. using OpenQA) to make sure your distro boots to the login screen would be a good investment.

(Anyway, I wonder if the security semantics of localStorage with respect to local applications are properly understood. As far as I can tell, the same database under ~/.local/share/webkit/databases is shared by all applications. All installed applications are necessarily trusted, but this still seems non-ideal.)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184564</commentid>
    <comment_count>25</comment_count>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2016-04-17 18:43:20 -0700</bug_when>
    <thetext>(In reply to comment #18)
&gt; Comment on attachment 276579 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=276579&amp;action=review

Note that there are some local and session storage tests that I think should have showed this on GTK before it was noticed by and end-user. Perhaps they aren&apos;t turned on?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184587</commentid>
    <comment_count>26</comment_count>
      <attachid>276594</attachid>
    <who name="Carlos Garcia Campos">cgarcia</who>
    <bug_when>2016-04-18 00:09:28 -0700</bug_when>
    <thetext>Comment on attachment 276594
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=276594&amp;action=review

We have always tried to avoid exposing this setting, because it&apos;s considered dangerous. My main concern is that this looks like the easy solution to fix any cross-origin issue in web apps, but it&apos;s not necessarily the right one. But anyway, if we can&apos;t avoid exposing this, let&apos;s just do it, but not in a stable branch. We released 2.12.0 with a behavior and we should stay with it. So, I see two possibilities here:

1.- Patch WebKit in 2.12 branch only to allow access to local storage from file URLs when AllowFileAccessFromFileURLS is set.
2.- Roll out the patch that introduced the issue. It doesn&apos;t look like a so serious issue in the end, and it has always been that way.

Then expose this setting in trunk for 2.14.

&gt; Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp:1257
&gt; +     * should be allowed to access content from any origin.  By default, when

Extra space between origin. and By default.

&gt; Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp:1261
&gt; +     * it would be possible to use local storage, for example.

I think we should explain here the differences between allow-file-access and allow-universal-access, to make sure people who actually need allow-file-access don&apos;t use this setting. We should probably warn that this could be dangerous.

&gt; Source/WebKit2/UIProcess/API/gtk/WebKitSettings.cpp:1263
&gt; +     * Since: 2.12.2

I don&apos;t think we should add new API to 2.12 branch, applications shouldn&apos;t need any change to properly work between 2.12 and 2.12.x</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184589</commentid>
    <comment_count>27</comment_count>
    <who name="Carlos Garcia Campos">cgarcia</who>
    <bug_when>2016-04-18 00:11:02 -0700</bug_when>
    <thetext>cq- is only because of the Since: tags, the patch looks to me for trunk. Remember to add the index of new symbols for 2.14 in the docs too.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184653</commentid>
    <comment_count>28</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2016-04-18 07:56:06 -0700</bug_when>
    <thetext>(In reply to comment #26) 
&gt; 1.- Patch WebKit in 2.12 branch only to allow access to local storage from
&gt; file URLs when AllowFileAccessFromFileURLS is set.

No please, let&apos;s not change the semantics of this setting just for a stable branch.

&gt; 2.- Roll out the patch that introduced the issue. It doesn&apos;t look like a so
&gt; serious issue in the end, and it has always been that way.

I dunno about that either; arbitrary access to localStorage seems pretty serious.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184836</commentid>
    <comment_count>29</comment_count>
    <who name="Dustin Falgout">dustin</who>
    <bug_when>2016-04-18 15:31:47 -0700</bug_when>
    <thetext>(In reply to comment #28)
&gt; 
&gt; I dunno about that either; arbitrary access to localStorage seems pretty
&gt; serious.

IMO, an API breaking change making it into a point release undetected is more serious than anything else. (IJS)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184937</commentid>
    <comment_count>30</comment_count>
    <who name="Carlos Garcia Campos">cgarcia</who>
    <bug_when>2016-04-18 23:50:05 -0700</bug_when>
    <thetext>(In reply to comment #28)
&gt; (In reply to comment #26) 
&gt; &gt; 1.- Patch WebKit in 2.12 branch only to allow access to local storage from
&gt; &gt; file URLs when AllowFileAccessFromFileURLS is set.
&gt; 
&gt; No please, let&apos;s not change the semantics of this setting just for a stable
&gt; branch.

It&apos;s not actually changing the semantics, it&apos;s just assuming that if you enabled that setting is because your app is serving file URIs and you also want to allow access to the local storage, for backwards compatibility only.

&gt; &gt; 2.- Roll out the patch that introduced the issue. It doesn&apos;t look like a so
&gt; &gt; serious issue in the end, and it has always been that way.
&gt; 
&gt; I dunno about that either; arbitrary access to localStorage seems pretty
&gt; serious.

That&apos;s why my initial proposal was to limit it to apps already enabling file access. We could also check the document URL to see if it&apos;s a local file, but it could be a custom URI scheme or a resource:/.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1184940</commentid>
    <comment_count>31</comment_count>
    <who name="Dustin Falgout">dustin</who>
    <bug_when>2016-04-18 23:58:35 -0700</bug_when>
    <thetext>(In reply to comment #30)
&gt; (In reply to comment #28)
&gt; &gt; (In reply to comment #26) 
&gt; &gt; &gt; 1.- Patch WebKit in 2.12 branch only to allow access to local storage from
&gt; &gt; &gt; file URLs when AllowFileAccessFromFileURLS is set.
&gt; &gt; 
&gt; &gt; No please, let&apos;s not change the semantics of this setting just for a stable
&gt; &gt; branch.
&gt; 
&gt; It&apos;s not actually changing the semantics, it&apos;s just assuming that if you
&gt; enabled that setting is because your app is serving file URIs and you also
&gt; want to allow access to the local storage, for backwards compatibility only.

For what its worth, this sounds reasonable to me.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1185053</commentid>
    <comment_count>32</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2016-04-19 09:58:46 -0700</bug_when>
    <thetext>I still kinda think the best option is just to add the new API, even in a stable release, because I think very few apps will be affected by this.

(In reply to comment #30)
&gt; It&apos;s not actually changing the semantics, it&apos;s just assuming that if you
&gt; enabled that setting is because your app is serving file URIs and you also
&gt; want to allow access to the local storage, for backwards compatibility only.

I guess it&apos;s OK to do this for 2.12 only, to unblock this, but then apps are going to have to change twice: once now to use AllowFileAccessFromFileURLs if they didn&apos;t already have that set (does this lightdm greeter use that?), and again in five months to switch to AllowUniversalAccessFromFileURLs because AllowFileAccessFromFileURLs won&apos;t work anymore in 2.14. (Surely we do not want the semantics of our setting to differ from Apple&apos;s going forward.)

&gt; That&apos;s why my initial proposal was to limit it to apps already enabling file
&gt; access. We could also check the document URL to see if it&apos;s a local file,
&gt; but it could be a custom URI scheme or a resource:/.

I don&apos;t think this wins much; if apps using AllowFileAccessFromFileURLs allow opening untrusted files, then that&apos;s already more serious than allowing access to localStorage.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1185057</commentid>
    <comment_count>33</comment_count>
    <who name="Carlos Garcia Campos">cgarcia</who>
    <bug_when>2016-04-19 10:09:36 -0700</bug_when>
    <thetext>(In reply to comment #32)
&gt; I still kinda think the best option is just to add the new API, even in a
&gt; stable release, because I think very few apps will be affected by this.
&gt; 
&gt; (In reply to comment #30)
&gt; &gt; It&apos;s not actually changing the semantics, it&apos;s just assuming that if you
&gt; &gt; enabled that setting is because your app is serving file URIs and you also
&gt; &gt; want to allow access to the local storage, for backwards compatibility only.
&gt; 
&gt; I guess it&apos;s OK to do this for 2.12 only, to unblock this, but then apps are
&gt; going to have to change twice: once now to use AllowFileAccessFromFileURLs
&gt; if they didn&apos;t already have that set (does this lightdm greeter use that?),
&gt; and again in five months to switch to AllowUniversalAccessFromFileURLs
&gt; because AllowFileAccessFromFileURLs won&apos;t work anymore in 2.14. (Surely we
&gt; do not want the semantics of our setting to differ from Apple&apos;s going
&gt; forward.)

No, that&apos;s not the point at all. Apps should not need to adapt anything, that&apos;s why I don&apos;t want to add a new setting, I&apos;m assuming that aps already use AllowFileAccessFromFileURLs, which I think is the case lightdm, the only app we know that is affected by this.

&gt; &gt; That&apos;s why my initial proposal was to limit it to apps already enabling file
&gt; &gt; access. We could also check the document URL to see if it&apos;s a local file,
&gt; &gt; but it could be a custom URI scheme or a resource:/.
&gt; 
&gt; I don&apos;t think this wins much; if apps using AllowFileAccessFromFileURLs
&gt; allow opening untrusted files, then that&apos;s already more serious than
&gt; allowing access to localStorage.

The point is simply that apps don&apos;t need to do anything.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1185061</commentid>
    <comment_count>34</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2016-04-19 10:19:53 -0700</bug_when>
    <thetext>I don&apos;t understand, are you proposing that we permanently alter the semantics of AllowFileAccessFromFileURLs for GTK only to allow access to localStorage?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1185350</commentid>
    <comment_count>35</comment_count>
    <who name="Carlos Garcia Campos">cgarcia</who>
    <bug_when>2016-04-19 22:56:38 -0700</bug_when>
    <thetext>(In reply to comment #34)
&gt; I don&apos;t understand, are you proposing that we permanently alter the
&gt; semantics of AllowFileAccessFromFileURLs for GTK only to allow access to
&gt; localStorage?

Not at all. I&apos;m proposing that we assume that apps already setting AllowFileAccessFromFileURLs are serving local file URIs and allow access to local storage for them for backwards compatibility. We won&apos;t document, nor encourage anybody to use that setting for that particular purpose.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1185411</commentid>
    <comment_count>36</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2016-04-20 07:59:04 -0700</bug_when>
    <thetext>(In reply to comment #35)
&gt; (In reply to comment #34)
&gt; &gt; I don&apos;t understand, are you proposing that we permanently alter the
&gt; &gt; semantics of AllowFileAccessFromFileURLs for GTK only to allow access to
&gt; &gt; localStorage?
&gt; 
&gt; Not at all. I&apos;m proposing that we assume that apps already setting
&gt; AllowFileAccessFromFileURLs are serving local file URIs and allow access to
&gt; local storage for them for backwards compatibility. We won&apos;t document, nor
&gt; encourage anybody to use that setting for that particular purpose.

So you proposing that we permanently alter AllowFileAccessFromFileURLs to allow access to local storage, for all ports? (Brent?)

What, then, would be the value in the AllowUniversalAccessFromFileURLs setting?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1185415</commentid>
    <comment_count>37</comment_count>
    <who name="Carlos Garcia Campos">cgarcia</who>
    <bug_when>2016-04-20 08:33:47 -0700</bug_when>
    <thetext>(In reply to comment #36)
&gt; (In reply to comment #35)
&gt; &gt; (In reply to comment #34)
&gt; &gt; &gt; I don&apos;t understand, are you proposing that we permanently alter the
&gt; &gt; &gt; semantics of AllowFileAccessFromFileURLs for GTK only to allow access to
&gt; &gt; &gt; localStorage?
&gt; &gt; 
&gt; &gt; Not at all. I&apos;m proposing that we assume that apps already setting
&gt; &gt; AllowFileAccessFromFileURLs are serving local file URIs and allow access to
&gt; &gt; local storage for them for backwards compatibility. We won&apos;t document, nor
&gt; &gt; encourage anybody to use that setting for that particular purpose.
&gt; 
&gt; So you proposing that we permanently alter AllowFileAccessFromFileURLs to
&gt; allow access to local storage, for all ports? (Brent?)

No, I haven&apos;t said that. I&apos;m proposing that we allow access to local storage for apps already setting AllowFileAccessFromFileURLs in 2.12 branch only. Tha doesn&apos;t affect trunk nor any other port. Only for backwards compatibility, because that was the case already in 2.12.0.

&gt; What, then, would be the value in the AllowUniversalAccessFromFileURLs
&gt; setting?

For trunk we should expose the universal access setting or shouldForceUniversalAccessFromLocalURL() or both.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1185524</commentid>
    <comment_count>38</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2016-04-20 13:30:53 -0700</bug_when>
    <thetext>(In reply to comment #37)
&gt; No, I haven&apos;t said that. I&apos;m proposing that we allow access to local storage
&gt; for apps already setting AllowFileAccessFromFileURLs in 2.12 branch only.
&gt; Tha doesn&apos;t affect trunk nor any other port. Only for backwards
&gt; compatibility, because that was the case already in 2.12.0.

OK, I confirmed lightdm-webkit2-greeter is actually using this setting. Let&apos;s do it.

&gt; For trunk we should expose the universal access setting or
&gt; shouldForceUniversalAccessFromLocalURL() or both.

OK, so this patch would be good for trunk with altered Since tags.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1185541</commentid>
    <comment_count>39</comment_count>
      <attachid>276852</attachid>
    <who name="Dustin Falgout">dustin</who>
    <bug_when>2016-04-20 14:31:17 -0700</bug_when>
    <thetext>Created attachment 276852
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1185581</commentid>
    <comment_count>40</comment_count>
      <attachid>276852</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2016-04-20 15:56:23 -0700</bug_when>
    <thetext>Comment on attachment 276852
Patch

Clearing flags on attachment: 276852

Committed r199795: &lt;http://trac.webkit.org/changeset/199795&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1185582</commentid>
    <comment_count>41</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2016-04-20 15:56:31 -0700</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1185707</commentid>
    <comment_count>42</comment_count>
    <who name="Carlos Garcia Campos">cgarcia</who>
    <bug_when>2016-04-21 00:19:59 -0700</bug_when>
    <thetext>(In reply to comment #38)
&gt; (In reply to comment #37)
&gt; &gt; No, I haven&apos;t said that. I&apos;m proposing that we allow access to local storage
&gt; &gt; for apps already setting AllowFileAccessFromFileURLs in 2.12 branch only.
&gt; &gt; Tha doesn&apos;t affect trunk nor any other port. Only for backwards
&gt; &gt; compatibility, because that was the case already in 2.12.0.
&gt; 
&gt; OK, I confirmed lightdm-webkit2-greeter is actually using this setting.
&gt; Let&apos;s do it.
&gt; 
&gt; &gt; For trunk we should expose the universal access setting or
&gt; &gt; shouldForceUniversalAccessFromLocalURL() or both.
&gt; 
&gt; OK, so this patch would be good for trunk with altered Since tags.

I made a couple of comments in my review and suggested to add the index of new symbols to the docs, but still, I&apos;ll do that in a follow up.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1185767</commentid>
    <comment_count>43</comment_count>
    <who name="Michael Catanzaro">mcatanzaro</who>
    <bug_when>2016-04-21 06:44:54 -0700</bug_when>
    <thetext>(In reply to comment #42)
&gt; I made a couple of comments in my review and suggested to add the index of
&gt; new symbols to the docs, but still, I&apos;ll do that in a follow up.

Sorry, I missed this in all the discussion.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>276573</attachid>
            <date>2016-04-16 22:08:50 -0700</date>
            <delta_ts>2016-04-16 22:36:12 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-156651-20160417000905.patch</filename>
            <type>text/plain</type>
            <size>3933</size>
            <attacher name="Dustin Falgout">dustin</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5NjM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjM0MGUxZDFjYTFkMDA1
NDI4ZDI4YWUyOGZjZTA5M2ZjNjIxM2RkNi4uOWQxYTM2Y2Q0NDhhM2VhMzc4YTQ1NzdmOTVlZjhh
MTUzYjQyODg4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE2LTA0LTE2ICBEdXN0
aW4gRmFsZ291dCAgPGR1c3RpbkBmYWxnb3V0LnVzPgorCisgICAgICAgIFdrV2VidmlldzogY2Fs
bGluZyBsb2NhbFN0b3JhZ2UuZ2V0SXRlbSgpIHJlc3VsdHMgaW4gVW5jYXVnaHQgRXhjZXB0aW9u
OiBTZWN1cml0eUVycm9yOiBET00gRXhjZXB0aW9uIDE4OiBBbiBhdHRlbXB0IHdhcyBtYWRlIHRv
IGJyZWFrIHRocm91Z2ggdGhlIHNlY3VyaXR5IHBvbGljeSBvZiB0aGUgdXNlciBhZ2VudC4KKyAg
ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NjY1MQorCisg
ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNz
L0FQSS9ndGsvV2ViS2l0U2V0dGluZ3MuY3BwOgorICAgICAgICAod2ViS2l0U2V0dGluZ3NTZXRQ
cm9wZXJ0eSk6CisgICAgICAgICh3ZWJLaXRTZXR0aW5nc0dldFByb3BlcnR5KToKKyAgICAgICAg
KHdlYmtpdF9zZXR0aW5nc19jbGFzc19pbml0KToKKwogMjAxNi0wNC0xNiAgRGFuIEJlcm5zdGVp
biAgPG1pdHpAYXBwbGUuY29tPgogCiAgICAgICAgIFtNYWNdIFdlYiBDb250ZW50IHNlcnZpY2Ug
d2l0aCBhIHJlc3RyaWN0ZWQgZW50aXRsZW1lbnQgbWF5IGxvYWQgYXJiaXRyYXJ5IGR5bGlicwpk
aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGlu
Z3MuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGluZ3Mu
Y3BwCmluZGV4IDQwOWFiY2RlYjkwY2JkNzVmMmIxZmQxY2U2NzhjYTgxNmMxNmRlMzYuLmQ2ZmRl
MGFlODIzZGMwNmIzN2M2YmZjNjFiYTA5MGM5NTk3NWFkMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFNldHRpbmdzLmNwcAorKysgYi9Tb3VyY2Uv
V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRTZXR0aW5ncy5jcHAKQEAgLTE0NCw3ICsx
NDQsOCBAQCBlbnVtIHsKICAgICBQUk9QX0VOQUJMRV9NRURJQV9TVFJFQU0sCiAgICAgUFJPUF9F
TkFCTEVfU1BBVElBTF9OQVZJR0FUSU9OLAogICAgIFBST1BfRU5BQkxFX01FRElBU09VUkNFLAot
ICAgIFBST1BfQUxMT1dfRklMRV9BQ0NFU1NfRlJPTV9GSUxFX1VSTFMKKyAgICBQUk9QX0FMTE9X
X0ZJTEVfQUNDRVNTX0ZST01fRklMRV9VUkxTLAorICAgIFBST1BfQUxMT1dfVU5JVkVSU0FMX0FD
Q0VTU19GUk9NX0ZJTEVfVVJMUwogfTsKIAogc3RhdGljIHZvaWQgd2ViS2l0U2V0dGluZ3NDb25z
dHJ1Y3RlZChHT2JqZWN0KiBvYmplY3QpCkBAIC0zMTMsNiArMzE0LDkgQEAgc3RhdGljIHZvaWQg
d2ViS2l0U2V0dGluZ3NTZXRQcm9wZXJ0eShHT2JqZWN0KiBvYmplY3QsIGd1aW50IHByb3BJZCwg
Y29uc3QgR1ZhbHUKICAgICBjYXNlIFBST1BfQUxMT1dfRklMRV9BQ0NFU1NfRlJPTV9GSUxFX1VS
TFM6CiAgICAgICAgIHdlYmtpdF9zZXR0aW5nc19zZXRfYWxsb3dfZmlsZV9hY2Nlc3NfZnJvbV9m
aWxlX3VybHMoc2V0dGluZ3MsIGdfdmFsdWVfZ2V0X2Jvb2xlYW4odmFsdWUpKTsKICAgICAgICAg
YnJlYWs7CisgICAgY2FzZSBQUk9QX0FMTE9XX1VOSVZFUlNBTF9BQ0NFU1NfRlJPTV9GSUxFX1VS
TFM6CisgICAgICAgIHdlYmtpdF9zZXR0aW5nc19zZXRfYWxsb3dfdW5pdmVyc2FsX2FjY2Vzc19m
cm9tX2ZpbGVfdXJscyhzZXR0aW5ncywgZ192YWx1ZV9nZXRfYm9vbGVhbih2YWx1ZSkpOworICAg
ICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBHX09CSkVDVF9XQVJOX0lOVkFMSURf
UFJPUEVSVFlfSUQob2JqZWN0LCBwcm9wSWQsIHBhcmFtU3BlYyk7CiAgICAgICAgIGJyZWFrOwpA
QCAtNDcxLDYgKzQ3NSw5IEBAIHN0YXRpYyB2b2lkIHdlYktpdFNldHRpbmdzR2V0UHJvcGVydHko
R09iamVjdCogb2JqZWN0LCBndWludCBwcm9wSWQsIEdWYWx1ZSogdmFsCiAgICAgY2FzZSBQUk9Q
X0FMTE9XX0ZJTEVfQUNDRVNTX0ZST01fRklMRV9VUkxTOgogICAgICAgICBnX3ZhbHVlX3NldF9i
b29sZWFuKHZhbHVlLCB3ZWJraXRfc2V0dGluZ3NfZ2V0X2FsbG93X2ZpbGVfYWNjZXNzX2Zyb21f
ZmlsZV91cmxzKHNldHRpbmdzKSk7CiAgICAgICAgIGJyZWFrOworICAgIGNhc2UgUFJPUF9BTExP
V19VTklWRVJTQUxfQUNDRVNTX0ZST01fRklMRV9VUkxTOgorICAgICAgICBnX3ZhbHVlX3NldF9i
b29sZWFuKHZhbHVlLCB3ZWJraXRfc2V0dGluZ3NfZ2V0X2FsbG93X3VuaXZlcnNhbF9hY2Nlc3Nf
ZnJvbV9maWxlX3VybHMoc2V0dGluZ3MpKTsKKyAgICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoK
ICAgICAgICAgR19PQkpFQ1RfV0FSTl9JTlZBTElEX1BST1BFUlRZX0lEKG9iamVjdCwgcHJvcElk
LCBwYXJhbVNwZWMpOwogICAgICAgICBicmVhazsKQEAgLTEyNDIsNiArMTI0OSwyNiBAQCBzdGF0
aWMgdm9pZCB3ZWJraXRfc2V0dGluZ3NfY2xhc3NfaW5pdChXZWJLaXRTZXR0aW5nc0NsYXNzKiBr
bGFzcykKICAgICAgICAgICAgIF8oIldoZXRoZXIgZmlsZSBhY2Nlc3MgaXMgYWxsb3dlZCBmcm9t
IGZpbGUgVVJMcy4iKSwKICAgICAgICAgICAgIEZBTFNFLAogICAgICAgICAgICAgcmVhZFdyaXRl
Q29uc3RydWN0UGFyYW1GbGFncykpOworCisgICAgLyoqCisgICAgICogV2ViS2l0U2V0dGluZ3M6
YWxsb3ctdW5pdmVyc2FsLWFjY2Vzcy1mcm9tLWZpbGUtdXJsczoKKyAgICAgKgorICAgICAqIFdo
ZXRoZXIgb3Igbm90IEphdmFTY3JpcHQgcnVubmluZyBpbiB0aGUgY29udGV4dCBvZiBhIGZpbGUg
c2NoZW1lIFVSTAorICAgICAqIHNob3VsZCBiZSBhbGxvd2VkIHRvIGFjY2VzcyBjb250ZW50IGZy
b20gYW55IG9yaWdpbi4gIEJ5IGRlZmF1bHQsIHdoZW4KKyAgICAgKiBzb21ldGhpbmcgaXMgbG9h
ZGVkIGluIGEgI1dlYktpdFdlYlZpZXcgdXNpbmcgYSBmaWxlIHNjaGVtZSBVUkwsCisgICAgICog
YWNjZXNzIHRvIHRoZSBsb2NhbCBmaWxlIHN5c3RlbSBhbmQgYXJiaXRyYXJ5IGxvY2FsIHN0b3Jh
Z2UgaXMgbm90CisgICAgICogYWxsb3dlZC4gVGhpcyBzZXR0aW5nIGFsbG93cyB5b3UgdG8gY2hh
bmdlIHRoYXQgYmVoYXZpb3VyLCBzbyB0aGF0CisgICAgICogaXQgd291bGQgYmUgcG9zc2libGUg
dG8gdXNlIGxvY2FsIHN0b3JhZ2UsIGZvciBleGFtcGxlLgorICAgICAqCisgICAgICogU2luY2U6
IDIuMTIuMgorICAgICAqLworICAgIGdfb2JqZWN0X2NsYXNzX2luc3RhbGxfcHJvcGVydHkoZ09i
amVjdENsYXNzLAorICAgICAgICBQUk9QX0FMTE9XX1VOSVZFUlNBTF9BQ0NFU1NfRlJPTV9GSUxF
X1VSTFMsCisgICAgICAgIGdfcGFyYW1fc3BlY19ib29sZWFuKCJhbGxvdy11bml2ZXJzYWwtYWNj
ZXNzLWZyb20tZmlsZS11cmxzIiwKKyAgICAgICAgICAgIF8oIkFsbG93IGxvY2FsIHN0b3JhZ2Ug
YWNjZXNzIGZyb20gdGhlIGNvbnRleHQgb2YgZmlsZSBzY2hlbWUgVVJMcyIpLAorICAgICAgICAg
ICAgXygiV2hldGhlciBvciBub3QgbG9jYWwgc3RvcmFnZSBpcyBhbGxvd2VkIGZyb20gdGhlIGNv
bnRleHQgb2YgZmlsZSBzY2hlbWUgVVJMcyIpLAorICAgICAgICAgICAgRkFMU0UsCisgICAgICAg
ICAgICByZWFkV3JpdGVDb25zdHJ1Y3RQYXJhbUZsYWdzKSk7CiB9CiAKIFdlYlByZWZlcmVuY2Vz
KiB3ZWJraXRTZXR0aW5nc0dldFByZWZlcmVuY2VzKFdlYktpdFNldHRpbmdzKiBzZXR0aW5ncykK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>276576</attachid>
            <date>2016-04-16 22:36:18 -0700</date>
            <delta_ts>2016-04-16 22:41:01 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-156651-20160417003633.patch</filename>
            <type>text/plain</type>
            <size>4958</size>
            <attacher name="Dustin Falgout">dustin</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5NjM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjM0MGUxZDFjYTFkMDA1
NDI4ZDI4YWUyOGZjZTA5M2ZjNjIxM2RkNi4uOGY5NDBjMzc4ODEzMDAwNmRmODYzYjc0YTU3MjAy
YTEwNGYxYzM3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE2LTA0LTE2ICBEdXN0
aW4gRmFsZ291dCAgPGR1c3RpbkBmYWxnb3V0LnVzPgorCisgICAgICAgIFdrV2VidmlldzogY2Fs
bGluZyBsb2NhbFN0b3JhZ2UuZ2V0SXRlbSgpIHJlc3VsdHMgaW4gVW5jYXVnaHQgRXhjZXB0aW9u
OiBTZWN1cml0eUVycm9yOiBET00gRXhjZXB0aW9uIDE4OiBBbiBhdHRlbXB0IHdhcyBtYWRlIHRv
IGJyZWFrIHRocm91Z2ggdGhlIHNlY3VyaXR5IHBvbGljeSBvZiB0aGUgdXNlciBhZ2VudC4KKyAg
ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NjY1MQorCisg
ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNz
L0FQSS9ndGsvV2ViS2l0U2V0dGluZ3MuY3BwOgorICAgICAgICAod2ViS2l0U2V0dGluZ3NTZXRQ
cm9wZXJ0eSk6CisgICAgICAgICh3ZWJLaXRTZXR0aW5nc0dldFByb3BlcnR5KToKKyAgICAgICAg
KHdlYmtpdF9zZXR0aW5nc19jbGFzc19pbml0KToKKyAgICAgICAgKHdlYmtpdF9zZXR0aW5nc19z
ZXRfYWxsb3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJscyk6CisKIDIwMTYtMDQtMTYg
IERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBbTWFjXSBXZWIgQ29u
dGVudCBzZXJ2aWNlIHdpdGggYSByZXN0cmljdGVkIGVudGl0bGVtZW50IG1heSBsb2FkIGFyYml0
cmFyeSBkeWxpYnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr
L1dlYktpdFNldHRpbmdzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dl
YktpdFNldHRpbmdzLmNwcAppbmRleCA0MDlhYmNkZWI5MGNiZDc1ZjJiMWZkMWNlNjc4Y2E4MTZj
MTZkZTM2Li5kODhiZjhhMjNmYTM1MDAwYmQ3NGFiZmQ4YmQxMzlhYmUyYWQzNTc4IDEwMDY0NAot
LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRTZXR0aW5ncy5jcHAK
KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGluZ3MuY3Bw
CkBAIC0xNDQsNyArMTQ0LDggQEAgZW51bSB7CiAgICAgUFJPUF9FTkFCTEVfTUVESUFfU1RSRUFN
LAogICAgIFBST1BfRU5BQkxFX1NQQVRJQUxfTkFWSUdBVElPTiwKICAgICBQUk9QX0VOQUJMRV9N
RURJQVNPVVJDRSwKLSAgICBQUk9QX0FMTE9XX0ZJTEVfQUNDRVNTX0ZST01fRklMRV9VUkxTCisg
ICAgUFJPUF9BTExPV19GSUxFX0FDQ0VTU19GUk9NX0ZJTEVfVVJMUywKKyAgICBQUk9QX0FMTE9X
X1VOSVZFUlNBTF9BQ0NFU1NfRlJPTV9GSUxFX1VSTFMKIH07CiAKIHN0YXRpYyB2b2lkIHdlYktp
dFNldHRpbmdzQ29uc3RydWN0ZWQoR09iamVjdCogb2JqZWN0KQpAQCAtMzEzLDYgKzMxNCw5IEBA
IHN0YXRpYyB2b2lkIHdlYktpdFNldHRpbmdzU2V0UHJvcGVydHkoR09iamVjdCogb2JqZWN0LCBn
dWludCBwcm9wSWQsIGNvbnN0IEdWYWx1CiAgICAgY2FzZSBQUk9QX0FMTE9XX0ZJTEVfQUNDRVNT
X0ZST01fRklMRV9VUkxTOgogICAgICAgICB3ZWJraXRfc2V0dGluZ3Nfc2V0X2FsbG93X2ZpbGVf
YWNjZXNzX2Zyb21fZmlsZV91cmxzKHNldHRpbmdzLCBnX3ZhbHVlX2dldF9ib29sZWFuKHZhbHVl
KSk7CiAgICAgICAgIGJyZWFrOworICAgIGNhc2UgUFJPUF9BTExPV19VTklWRVJTQUxfQUNDRVNT
X0ZST01fRklMRV9VUkxTOgorICAgICAgICB3ZWJraXRfc2V0dGluZ3Nfc2V0X2FsbG93X3VuaXZl
cnNhbF9hY2Nlc3NfZnJvbV9maWxlX3VybHMoc2V0dGluZ3MsIGdfdmFsdWVfZ2V0X2Jvb2xlYW4o
dmFsdWUpKTsKKyAgICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgR19PQkpFQ1Rf
V0FSTl9JTlZBTElEX1BST1BFUlRZX0lEKG9iamVjdCwgcHJvcElkLCBwYXJhbVNwZWMpOwogICAg
ICAgICBicmVhazsKQEAgLTQ3MSw2ICs0NzUsOSBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRTZXR0aW5n
c0dldFByb3BlcnR5KEdPYmplY3QqIG9iamVjdCwgZ3VpbnQgcHJvcElkLCBHVmFsdWUqIHZhbAog
ICAgIGNhc2UgUFJPUF9BTExPV19GSUxFX0FDQ0VTU19GUk9NX0ZJTEVfVVJMUzoKICAgICAgICAg
Z192YWx1ZV9zZXRfYm9vbGVhbih2YWx1ZSwgd2Via2l0X3NldHRpbmdzX2dldF9hbGxvd19maWxl
X2FjY2Vzc19mcm9tX2ZpbGVfdXJscyhzZXR0aW5ncykpOwogICAgICAgICBicmVhazsKKyAgICBj
YXNlIFBST1BfQUxMT1dfVU5JVkVSU0FMX0FDQ0VTU19GUk9NX0ZJTEVfVVJMUzoKKyAgICAgICAg
Z192YWx1ZV9zZXRfYm9vbGVhbih2YWx1ZSwgd2Via2l0X3NldHRpbmdzX2dldF9hbGxvd191bml2
ZXJzYWxfYWNjZXNzX2Zyb21fZmlsZV91cmxzKHNldHRpbmdzKSk7CisgICAgICAgIGJyZWFrOwog
ICAgIGRlZmF1bHQ6CiAgICAgICAgIEdfT0JKRUNUX1dBUk5fSU5WQUxJRF9QUk9QRVJUWV9JRChv
YmplY3QsIHByb3BJZCwgcGFyYW1TcGVjKTsKICAgICAgICAgYnJlYWs7CkBAIC0xMjQyLDYgKzEy
NDksMjYgQEAgc3RhdGljIHZvaWQgd2Via2l0X3NldHRpbmdzX2NsYXNzX2luaXQoV2ViS2l0U2V0
dGluZ3NDbGFzcyoga2xhc3MpCiAgICAgICAgICAgICBfKCJXaGV0aGVyIGZpbGUgYWNjZXNzIGlz
IGFsbG93ZWQgZnJvbSBmaWxlIFVSTHMuIiksCiAgICAgICAgICAgICBGQUxTRSwKICAgICAgICAg
ICAgIHJlYWRXcml0ZUNvbnN0cnVjdFBhcmFtRmxhZ3MpKTsKKworICAgIC8qKgorICAgICAqIFdl
YktpdFNldHRpbmdzOmFsbG93LXVuaXZlcnNhbC1hY2Nlc3MtZnJvbS1maWxlLXVybHM6CisgICAg
ICoKKyAgICAgKiBXaGV0aGVyIG9yIG5vdCBKYXZhU2NyaXB0IHJ1bm5pbmcgaW4gdGhlIGNvbnRl
eHQgb2YgYSBmaWxlIHNjaGVtZSBVUkwKKyAgICAgKiBzaG91bGQgYmUgYWxsb3dlZCB0byBhY2Nl
c3MgY29udGVudCBmcm9tIGFueSBvcmlnaW4uICBCeSBkZWZhdWx0LCB3aGVuCisgICAgICogc29t
ZXRoaW5nIGlzIGxvYWRlZCBpbiBhICNXZWJLaXRXZWJWaWV3IHVzaW5nIGEgZmlsZSBzY2hlbWUg
VVJMLAorICAgICAqIGFjY2VzcyB0byB0aGUgbG9jYWwgZmlsZSBzeXN0ZW0gYW5kIGFyYml0cmFy
eSBsb2NhbCBzdG9yYWdlIGlzIG5vdAorICAgICAqIGFsbG93ZWQuIFRoaXMgc2V0dGluZyBhbGxv
d3MgeW91IHRvIGNoYW5nZSB0aGF0IGJlaGF2aW91ciwgc28gdGhhdAorICAgICAqIGl0IHdvdWxk
IGJlIHBvc3NpYmxlIHRvIHVzZSBsb2NhbCBzdG9yYWdlLCBmb3IgZXhhbXBsZS4KKyAgICAgKgor
ICAgICAqIFNpbmNlOiAyLjEyLjIKKyAgICAgKi8KKyAgICBnX29iamVjdF9jbGFzc19pbnN0YWxs
X3Byb3BlcnR5KGdPYmplY3RDbGFzcywKKyAgICAgICAgUFJPUF9BTExPV19VTklWRVJTQUxfQUND
RVNTX0ZST01fRklMRV9VUkxTLAorICAgICAgICBnX3BhcmFtX3NwZWNfYm9vbGVhbigiYWxsb3ct
dW5pdmVyc2FsLWFjY2Vzcy1mcm9tLWZpbGUtdXJscyIsCisgICAgICAgICAgICBfKCJBbGxvdyBs
b2NhbCBzdG9yYWdlIGFjY2VzcyBmcm9tIHRoZSBjb250ZXh0IG9mIGZpbGUgc2NoZW1lIFVSTHMi
KSwKKyAgICAgICAgICAgIF8oIldoZXRoZXIgb3Igbm90IGxvY2FsIHN0b3JhZ2UgaXMgYWxsb3dl
ZCBmcm9tIHRoZSBjb250ZXh0IG9mIGZpbGUgc2NoZW1lIFVSTHMiKSwKKyAgICAgICAgICAgIEZB
TFNFLAorICAgICAgICAgICAgcmVhZFdyaXRlQ29uc3RydWN0UGFyYW1GbGFncykpOwogfQogCiBX
ZWJQcmVmZXJlbmNlcyogd2Via2l0U2V0dGluZ3NHZXRQcmVmZXJlbmNlcyhXZWJLaXRTZXR0aW5n
cyogc2V0dGluZ3MpCkBAIC0zMDYyLDMgKzMwODksMjQgQEAgdm9pZCB3ZWJraXRfc2V0dGluZ3Nf
c2V0X2FsbG93X2ZpbGVfYWNjZXNzX2Zyb21fZmlsZV91cmxzKFdlYktpdFNldHRpbmdzKiBzZXR0
aW4KICAgICBwcml2LT5wcmVmZXJlbmNlcy0+c2V0QWxsb3dGaWxlQWNjZXNzRnJvbUZpbGVVUkxz
KGFsbG93ZWQpOwogICAgIGdfb2JqZWN0X25vdGlmeShHX09CSkVDVChzZXR0aW5ncyksICJhbGxv
dy1maWxlLWFjY2Vzcy1mcm9tLWZpbGUtdXJscyIpOwogfQorCisvKioKKyAqIHdlYmtpdF9zZXR0
aW5nc19zZXRfYWxsb3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJsczoKKyAqIEBzZXR0
aW5nczogYSAjV2ViS2l0U2V0dGluZ3MKKyAqIEBhbGxvd2VkOiBWYWx1ZSB0byBiZSBzZXQKKyAq
CisgKiBTZXQgdGhlICNXZWJLaXRTZXR0aW5nczphbGxvdy11bml2ZXJzYWwtYWNjZXNzLWZyb20t
ZmlsZS11cmxzIHByb3BlcnR5LgorICoKKyAqIFNpbmNlOiAyLjEwCisgKi8KK3ZvaWQgd2Via2l0
X3NldHRpbmdzX3NldF9hbGxvd191bml2ZXJzYWxfYWNjZXNzX2Zyb21fZmlsZV91cmxzKFdlYktp
dFNldHRpbmdzKiBzZXR0aW5ncywgZ2Jvb2xlYW4gYWxsb3dlZCkKK3sKKyAgICBnX3JldHVybl9p
Zl9mYWlsKFdFQktJVF9JU19TRVRUSU5HUyhzZXR0aW5ncykpOworCisgICAgV2ViS2l0U2V0dGlu
Z3NQcml2YXRlKiBwcml2ID0gc2V0dGluZ3MtPnByaXY7CisgICAgaWYgKHByaXYtPnByZWZlcmVu
Y2VzLT5hbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMcygpID09IGFsbG93ZWQpCisgICAg
ICAgIHJldHVybjsKKworICAgIHByaXYtPnByZWZlcmVuY2VzLT5zZXRBbGxvd1VuaXZlcnNhbEFj
Y2Vzc0Zyb21GaWxlVVJMcyhhbGxvd2VkKTsKKyAgICBnX29iamVjdF9ub3RpZnkoR19PQkpFQ1Qo
c2V0dGluZ3MpLCAiYWxsb3ctdW5pdmVyc2FsLWFjY2Vzcy1mcm9tLWZpbGUtdXJscyIpOworfQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>276577</attachid>
            <date>2016-04-16 22:41:08 -0700</date>
            <delta_ts>2016-04-16 22:48:43 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-156651-20160417004123.patch</filename>
            <type>text/plain</type>
            <size>5573</size>
            <attacher name="Dustin Falgout">dustin</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5NjM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjM0MGUxZDFjYTFkMDA1
NDI4ZDI4YWUyOGZjZTA5M2ZjNjIxM2RkNi4uZGI5ZjA3NDQxZTA1NjQyNjFjMTU2OGQzMWFmZTY1
NWY1ZTZhMmQ5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE2LTA0LTE2ICBEdXN0
aW4gRmFsZ291dCAgPGR1c3RpbkBmYWxnb3V0LnVzPgorCisgICAgICAgIFdrV2VidmlldzogY2Fs
bGluZyBsb2NhbFN0b3JhZ2UuZ2V0SXRlbSgpIHJlc3VsdHMgaW4gVW5jYXVnaHQgRXhjZXB0aW9u
OiBTZWN1cml0eUVycm9yOiBET00gRXhjZXB0aW9uIDE4OiBBbiBhdHRlbXB0IHdhcyBtYWRlIHRv
IGJyZWFrIHRocm91Z2ggdGhlIHNlY3VyaXR5IHBvbGljeSBvZiB0aGUgdXNlciBhZ2VudC4KKyAg
ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NjY1MQorCisg
ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNz
L0FQSS9ndGsvV2ViS2l0U2V0dGluZ3MuY3BwOgorICAgICAgICAod2ViS2l0U2V0dGluZ3NTZXRQ
cm9wZXJ0eSk6CisgICAgICAgICh3ZWJLaXRTZXR0aW5nc0dldFByb3BlcnR5KToKKyAgICAgICAg
KHdlYmtpdF9zZXR0aW5nc19jbGFzc19pbml0KToKKyAgICAgICAgKHdlYmtpdF9zZXR0aW5nc19n
ZXRfYWxsb3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJscyk6CisgICAgICAgICh3ZWJr
aXRfc2V0dGluZ3Nfc2V0X2FsbG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxlX3VybHMpOgor
CiAyMDE2LTA0LTE2ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAKICAgICAgICAg
W01hY10gV2ViIENvbnRlbnQgc2VydmljZSB3aXRoIGEgcmVzdHJpY3RlZCBlbnRpdGxlbWVudCBt
YXkgbG9hZCBhcmJpdHJhcnkgZHlsaWJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy
b2Nlc3MvQVBJL2d0ay9XZWJLaXRTZXR0aW5ncy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl
c3MvQVBJL2d0ay9XZWJLaXRTZXR0aW5ncy5jcHAKaW5kZXggNDA5YWJjZGViOTBjYmQ3NWYyYjFm
ZDFjZTY3OGNhODE2YzE2ZGUzNi4uYmY2YzVkNTY4ZTRiYmQyODkxOWExNDA2Mjg3M2QyZmRmM2Fh
NGE0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0
U2V0dGluZ3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktp
dFNldHRpbmdzLmNwcApAQCAtMTQ0LDcgKzE0NCw4IEBAIGVudW0gewogICAgIFBST1BfRU5BQkxF
X01FRElBX1NUUkVBTSwKICAgICBQUk9QX0VOQUJMRV9TUEFUSUFMX05BVklHQVRJT04sCiAgICAg
UFJPUF9FTkFCTEVfTUVESUFTT1VSQ0UsCi0gICAgUFJPUF9BTExPV19GSUxFX0FDQ0VTU19GUk9N
X0ZJTEVfVVJMUworICAgIFBST1BfQUxMT1dfRklMRV9BQ0NFU1NfRlJPTV9GSUxFX1VSTFMsCisg
ICAgUFJPUF9BTExPV19VTklWRVJTQUxfQUNDRVNTX0ZST01fRklMRV9VUkxTCiB9OwogCiBzdGF0
aWMgdm9pZCB3ZWJLaXRTZXR0aW5nc0NvbnN0cnVjdGVkKEdPYmplY3QqIG9iamVjdCkKQEAgLTMx
Myw2ICszMTQsOSBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRTZXR0aW5nc1NldFByb3BlcnR5KEdPYmpl
Y3QqIG9iamVjdCwgZ3VpbnQgcHJvcElkLCBjb25zdCBHVmFsdQogICAgIGNhc2UgUFJPUF9BTExP
V19GSUxFX0FDQ0VTU19GUk9NX0ZJTEVfVVJMUzoKICAgICAgICAgd2Via2l0X3NldHRpbmdzX3Nl
dF9hbGxvd19maWxlX2FjY2Vzc19mcm9tX2ZpbGVfdXJscyhzZXR0aW5ncywgZ192YWx1ZV9nZXRf
Ym9vbGVhbih2YWx1ZSkpOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIFBST1BfQUxMT1dfVU5J
VkVSU0FMX0FDQ0VTU19GUk9NX0ZJTEVfVVJMUzoKKyAgICAgICAgd2Via2l0X3NldHRpbmdzX3Nl
dF9hbGxvd191bml2ZXJzYWxfYWNjZXNzX2Zyb21fZmlsZV91cmxzKHNldHRpbmdzLCBnX3ZhbHVl
X2dldF9ib29sZWFuKHZhbHVlKSk7CisgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAg
ICAgIEdfT0JKRUNUX1dBUk5fSU5WQUxJRF9QUk9QRVJUWV9JRChvYmplY3QsIHByb3BJZCwgcGFy
YW1TcGVjKTsKICAgICAgICAgYnJlYWs7CkBAIC00NzEsNiArNDc1LDkgQEAgc3RhdGljIHZvaWQg
d2ViS2l0U2V0dGluZ3NHZXRQcm9wZXJ0eShHT2JqZWN0KiBvYmplY3QsIGd1aW50IHByb3BJZCwg
R1ZhbHVlKiB2YWwKICAgICBjYXNlIFBST1BfQUxMT1dfRklMRV9BQ0NFU1NfRlJPTV9GSUxFX1VS
TFM6CiAgICAgICAgIGdfdmFsdWVfc2V0X2Jvb2xlYW4odmFsdWUsIHdlYmtpdF9zZXR0aW5nc19n
ZXRfYWxsb3dfZmlsZV9hY2Nlc3NfZnJvbV9maWxlX3VybHMoc2V0dGluZ3MpKTsKICAgICAgICAg
YnJlYWs7CisgICAgY2FzZSBQUk9QX0FMTE9XX1VOSVZFUlNBTF9BQ0NFU1NfRlJPTV9GSUxFX1VS
TFM6CisgICAgICAgIGdfdmFsdWVfc2V0X2Jvb2xlYW4odmFsdWUsIHdlYmtpdF9zZXR0aW5nc19n
ZXRfYWxsb3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJscyhzZXR0aW5ncykpOworICAg
ICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBHX09CSkVDVF9XQVJOX0lOVkFMSURf
UFJPUEVSVFlfSUQob2JqZWN0LCBwcm9wSWQsIHBhcmFtU3BlYyk7CiAgICAgICAgIGJyZWFrOwpA
QCAtMTI0Miw2ICsxMjQ5LDI2IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9zZXR0aW5nc19jbGFzc19p
bml0KFdlYktpdFNldHRpbmdzQ2xhc3MqIGtsYXNzKQogICAgICAgICAgICAgXygiV2hldGhlciBm
aWxlIGFjY2VzcyBpcyBhbGxvd2VkIGZyb20gZmlsZSBVUkxzLiIpLAogICAgICAgICAgICAgRkFM
U0UsCiAgICAgICAgICAgICByZWFkV3JpdGVDb25zdHJ1Y3RQYXJhbUZsYWdzKSk7CisKKyAgICAv
KioKKyAgICAgKiBXZWJLaXRTZXR0aW5nczphbGxvdy11bml2ZXJzYWwtYWNjZXNzLWZyb20tZmls
ZS11cmxzOgorICAgICAqCisgICAgICogV2hldGhlciBvciBub3QgSmF2YVNjcmlwdCBydW5uaW5n
IGluIHRoZSBjb250ZXh0IG9mIGEgZmlsZSBzY2hlbWUgVVJMCisgICAgICogc2hvdWxkIGJlIGFs
bG93ZWQgdG8gYWNjZXNzIGNvbnRlbnQgZnJvbSBhbnkgb3JpZ2luLiAgQnkgZGVmYXVsdCwgd2hl
bgorICAgICAqIHNvbWV0aGluZyBpcyBsb2FkZWQgaW4gYSAjV2ViS2l0V2ViVmlldyB1c2luZyBh
IGZpbGUgc2NoZW1lIFVSTCwKKyAgICAgKiBhY2Nlc3MgdG8gdGhlIGxvY2FsIGZpbGUgc3lzdGVt
IGFuZCBhcmJpdHJhcnkgbG9jYWwgc3RvcmFnZSBpcyBub3QKKyAgICAgKiBhbGxvd2VkLiBUaGlz
IHNldHRpbmcgYWxsb3dzIHlvdSB0byBjaGFuZ2UgdGhhdCBiZWhhdmlvdXIsIHNvIHRoYXQKKyAg
ICAgKiBpdCB3b3VsZCBiZSBwb3NzaWJsZSB0byB1c2UgbG9jYWwgc3RvcmFnZSwgZm9yIGV4YW1w
bGUuCisgICAgICoKKyAgICAgKiBTaW5jZTogMi4xMi4yCisgICAgICovCisgICAgZ19vYmplY3Rf
Y2xhc3NfaW5zdGFsbF9wcm9wZXJ0eShnT2JqZWN0Q2xhc3MsCisgICAgICAgIFBST1BfQUxMT1df
VU5JVkVSU0FMX0FDQ0VTU19GUk9NX0ZJTEVfVVJMUywKKyAgICAgICAgZ19wYXJhbV9zcGVjX2Jv
b2xlYW4oImFsbG93LXVuaXZlcnNhbC1hY2Nlc3MtZnJvbS1maWxlLXVybHMiLAorICAgICAgICAg
ICAgXygiQWxsb3cgbG9jYWwgc3RvcmFnZSBhY2Nlc3MgZnJvbSB0aGUgY29udGV4dCBvZiBmaWxl
IHNjaGVtZSBVUkxzIiksCisgICAgICAgICAgICBfKCJXaGV0aGVyIG9yIG5vdCBsb2NhbCBzdG9y
YWdlIGlzIGFsbG93ZWQgZnJvbSB0aGUgY29udGV4dCBvZiBmaWxlIHNjaGVtZSBVUkxzIiksCisg
ICAgICAgICAgICBGQUxTRSwKKyAgICAgICAgICAgIHJlYWRXcml0ZUNvbnN0cnVjdFBhcmFtRmxh
Z3MpKTsKIH0KIAogV2ViUHJlZmVyZW5jZXMqIHdlYmtpdFNldHRpbmdzR2V0UHJlZmVyZW5jZXMo
V2ViS2l0U2V0dGluZ3MqIHNldHRpbmdzKQpAQCAtMzA2MiwzICszMDg5LDQxIEBAIHZvaWQgd2Vi
a2l0X3NldHRpbmdzX3NldF9hbGxvd19maWxlX2FjY2Vzc19mcm9tX2ZpbGVfdXJscyhXZWJLaXRT
ZXR0aW5ncyogc2V0dGluCiAgICAgcHJpdi0+cHJlZmVyZW5jZXMtPnNldEFsbG93RmlsZUFjY2Vz
c0Zyb21GaWxlVVJMcyhhbGxvd2VkKTsKICAgICBnX29iamVjdF9ub3RpZnkoR19PQkpFQ1Qoc2V0
dGluZ3MpLCAiYWxsb3ctZmlsZS1hY2Nlc3MtZnJvbS1maWxlLXVybHMiKTsKIH0KKworLyoqCisg
KiB3ZWJraXRfc2V0dGluZ3NfZ2V0X2FsbG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxlX3Vy
bHM6CisgKiBAc2V0dGluZ3M6IGEgI1dlYktpdFNldHRpbmdzCisgKgorICogR2V0IHRoZSAjV2Vi
S2l0U2V0dGluZ3M6YWxsb3ctdW5pdmVyc2FsLWFjY2Vzcy1mcm9tLWZpbGUtdXJscyBwcm9wZXJ0
eS4KKyAqCisgKiBSZXR1cm5zOiAlVFJVRSBJZiB1bml2ZXJzYWwgYWNjZXNzIGZyb20gZmlsZSBV
UkxzIGlzIGFsbG93ZWQgb3IgJUZBTFNFIG90aGVyd2lzZS4KKyAqCisgKiBTaW5jZTogMi4xMi4y
CisgKi8KK2dib29sZWFuIHdlYmtpdF9zZXR0aW5nc19nZXRfYWxsb3dfdW5pdmVyc2FsX2FjY2Vz
c19mcm9tX2ZpbGVfdXJscyhXZWJLaXRTZXR0aW5ncyogc2V0dGluZ3MpCit7CisgICAgZ19yZXR1
cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1NFVFRJTkdTKHNldHRpbmdzKSwgRkFMU0UpOworCisg
ICAgcmV0dXJuIHNldHRpbmdzLT5wcml2LT5wcmVmZXJlbmNlcy0+YWxsb3dVbml2ZXJzYWxBY2Nl
c3NGcm9tRmlsZVVSTHMoKTsKK30KKworLyoqCisgKiB3ZWJraXRfc2V0dGluZ3Nfc2V0X2FsbG93
X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxlX3VybHM6CisgKiBAc2V0dGluZ3M6IGEgI1dlYktp
dFNldHRpbmdzCisgKiBAYWxsb3dlZDogVmFsdWUgdG8gYmUgc2V0CisgKgorICogU2V0IHRoZSAj
V2ViS2l0U2V0dGluZ3M6YWxsb3ctdW5pdmVyc2FsLWFjY2Vzcy1mcm9tLWZpbGUtdXJscyBwcm9w
ZXJ0eS4KKyAqCisgKiBTaW5jZTogMi4xMi4yCisgKi8KK3ZvaWQgd2Via2l0X3NldHRpbmdzX3Nl
dF9hbGxvd191bml2ZXJzYWxfYWNjZXNzX2Zyb21fZmlsZV91cmxzKFdlYktpdFNldHRpbmdzKiBz
ZXR0aW5ncywgZ2Jvb2xlYW4gYWxsb3dlZCkKK3sKKyAgICBnX3JldHVybl9pZl9mYWlsKFdFQktJ
VF9JU19TRVRUSU5HUyhzZXR0aW5ncykpOworCisgICAgV2ViS2l0U2V0dGluZ3NQcml2YXRlKiBw
cml2ID0gc2V0dGluZ3MtPnByaXY7CisgICAgaWYgKHByaXYtPnByZWZlcmVuY2VzLT5hbGxvd1Vu
aXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMcygpID09IGFsbG93ZWQpCisgICAgICAgIHJldHVybjsK
KworICAgIHByaXYtPnByZWZlcmVuY2VzLT5zZXRBbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxl
VVJMcyhhbGxvd2VkKTsKKyAgICBnX29iamVjdF9ub3RpZnkoR19PQkpFQ1Qoc2V0dGluZ3MpLCAi
YWxsb3ctdW5pdmVyc2FsLWFjY2Vzcy1mcm9tLWZpbGUtdXJscyIpOworfQo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>276578</attachid>
            <date>2016-04-16 22:48:50 -0700</date>
            <delta_ts>2016-04-16 22:55:12 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-156651-20160417004905.patch</filename>
            <type>text/plain</type>
            <size>6526</size>
            <attacher name="Dustin Falgout">dustin</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5NjM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjM0MGUxZDFjYTFkMDA1
NDI4ZDI4YWUyOGZjZTA5M2ZjNjIxM2RkNi4uNTljN2FlODIzZWM1YzMwNWJkOWQ4OTQ3MzQ0NDRl
OTZkZTM0MzVkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE2LTA0LTE2ICBEdXN0
aW4gRmFsZ291dCAgPGR1c3RpbkBmYWxnb3V0LnVzPgorCisgICAgICAgIFdrV2VidmlldzogY2Fs
bGluZyBsb2NhbFN0b3JhZ2UuZ2V0SXRlbSgpIHJlc3VsdHMgaW4gVW5jYXVnaHQgRXhjZXB0aW9u
OiBTZWN1cml0eUVycm9yOiBET00gRXhjZXB0aW9uIDE4OiBBbiBhdHRlbXB0IHdhcyBtYWRlIHRv
IGJyZWFrIHRocm91Z2ggdGhlIHNlY3VyaXR5IHBvbGljeSBvZiB0aGUgdXNlciBhZ2VudC4KKyAg
ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NjY1MQorCisg
ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNz
L0FQSS9ndGsvV2ViS2l0U2V0dGluZ3MuY3BwOgorICAgICAgICAod2ViS2l0U2V0dGluZ3NTZXRQ
cm9wZXJ0eSk6CisgICAgICAgICh3ZWJLaXRTZXR0aW5nc0dldFByb3BlcnR5KToKKyAgICAgICAg
KHdlYmtpdF9zZXR0aW5nc19jbGFzc19pbml0KToKKyAgICAgICAgKHdlYmtpdF9zZXR0aW5nc19n
ZXRfYWxsb3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJscyk6CisgICAgICAgICh3ZWJr
aXRfc2V0dGluZ3Nfc2V0X2FsbG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxlX3VybHMpOgor
ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFNldHRpbmdzLmg6CisKIDIwMTYtMDQt
MTYgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBbTWFjXSBXZWIg
Q29udGVudCBzZXJ2aWNlIHdpdGggYSByZXN0cmljdGVkIGVudGl0bGVtZW50IG1heSBsb2FkIGFy
Yml0cmFyeSBkeWxpYnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv
Z3RrL1dlYktpdFNldHRpbmdzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr
L1dlYktpdFNldHRpbmdzLmNwcAppbmRleCA0MDlhYmNkZWI5MGNiZDc1ZjJiMWZkMWNlNjc4Y2E4
MTZjMTZkZTM2Li5iZjZjNWQ1NjhlNGJiZDI4OTE5YTE0MDYyODczZDJmZGYzYWE0YTQyIDEwMDY0
NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRTZXR0aW5ncy5j
cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGluZ3Mu
Y3BwCkBAIC0xNDQsNyArMTQ0LDggQEAgZW51bSB7CiAgICAgUFJPUF9FTkFCTEVfTUVESUFfU1RS
RUFNLAogICAgIFBST1BfRU5BQkxFX1NQQVRJQUxfTkFWSUdBVElPTiwKICAgICBQUk9QX0VOQUJM
RV9NRURJQVNPVVJDRSwKLSAgICBQUk9QX0FMTE9XX0ZJTEVfQUNDRVNTX0ZST01fRklMRV9VUkxT
CisgICAgUFJPUF9BTExPV19GSUxFX0FDQ0VTU19GUk9NX0ZJTEVfVVJMUywKKyAgICBQUk9QX0FM
TE9XX1VOSVZFUlNBTF9BQ0NFU1NfRlJPTV9GSUxFX1VSTFMKIH07CiAKIHN0YXRpYyB2b2lkIHdl
YktpdFNldHRpbmdzQ29uc3RydWN0ZWQoR09iamVjdCogb2JqZWN0KQpAQCAtMzEzLDYgKzMxNCw5
IEBAIHN0YXRpYyB2b2lkIHdlYktpdFNldHRpbmdzU2V0UHJvcGVydHkoR09iamVjdCogb2JqZWN0
LCBndWludCBwcm9wSWQsIGNvbnN0IEdWYWx1CiAgICAgY2FzZSBQUk9QX0FMTE9XX0ZJTEVfQUND
RVNTX0ZST01fRklMRV9VUkxTOgogICAgICAgICB3ZWJraXRfc2V0dGluZ3Nfc2V0X2FsbG93X2Zp
bGVfYWNjZXNzX2Zyb21fZmlsZV91cmxzKHNldHRpbmdzLCBnX3ZhbHVlX2dldF9ib29sZWFuKHZh
bHVlKSk7CiAgICAgICAgIGJyZWFrOworICAgIGNhc2UgUFJPUF9BTExPV19VTklWRVJTQUxfQUND
RVNTX0ZST01fRklMRV9VUkxTOgorICAgICAgICB3ZWJraXRfc2V0dGluZ3Nfc2V0X2FsbG93X3Vu
aXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxlX3VybHMoc2V0dGluZ3MsIGdfdmFsdWVfZ2V0X2Jvb2xl
YW4odmFsdWUpKTsKKyAgICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgR19PQkpF
Q1RfV0FSTl9JTlZBTElEX1BST1BFUlRZX0lEKG9iamVjdCwgcHJvcElkLCBwYXJhbVNwZWMpOwog
ICAgICAgICBicmVhazsKQEAgLTQ3MSw2ICs0NzUsOSBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRTZXR0
aW5nc0dldFByb3BlcnR5KEdPYmplY3QqIG9iamVjdCwgZ3VpbnQgcHJvcElkLCBHVmFsdWUqIHZh
bAogICAgIGNhc2UgUFJPUF9BTExPV19GSUxFX0FDQ0VTU19GUk9NX0ZJTEVfVVJMUzoKICAgICAg
ICAgZ192YWx1ZV9zZXRfYm9vbGVhbih2YWx1ZSwgd2Via2l0X3NldHRpbmdzX2dldF9hbGxvd19m
aWxlX2FjY2Vzc19mcm9tX2ZpbGVfdXJscyhzZXR0aW5ncykpOwogICAgICAgICBicmVhazsKKyAg
ICBjYXNlIFBST1BfQUxMT1dfVU5JVkVSU0FMX0FDQ0VTU19GUk9NX0ZJTEVfVVJMUzoKKyAgICAg
ICAgZ192YWx1ZV9zZXRfYm9vbGVhbih2YWx1ZSwgd2Via2l0X3NldHRpbmdzX2dldF9hbGxvd191
bml2ZXJzYWxfYWNjZXNzX2Zyb21fZmlsZV91cmxzKHNldHRpbmdzKSk7CisgICAgICAgIGJyZWFr
OwogICAgIGRlZmF1bHQ6CiAgICAgICAgIEdfT0JKRUNUX1dBUk5fSU5WQUxJRF9QUk9QRVJUWV9J
RChvYmplY3QsIHByb3BJZCwgcGFyYW1TcGVjKTsKICAgICAgICAgYnJlYWs7CkBAIC0xMjQyLDYg
KzEyNDksMjYgQEAgc3RhdGljIHZvaWQgd2Via2l0X3NldHRpbmdzX2NsYXNzX2luaXQoV2ViS2l0
U2V0dGluZ3NDbGFzcyoga2xhc3MpCiAgICAgICAgICAgICBfKCJXaGV0aGVyIGZpbGUgYWNjZXNz
IGlzIGFsbG93ZWQgZnJvbSBmaWxlIFVSTHMuIiksCiAgICAgICAgICAgICBGQUxTRSwKICAgICAg
ICAgICAgIHJlYWRXcml0ZUNvbnN0cnVjdFBhcmFtRmxhZ3MpKTsKKworICAgIC8qKgorICAgICAq
IFdlYktpdFNldHRpbmdzOmFsbG93LXVuaXZlcnNhbC1hY2Nlc3MtZnJvbS1maWxlLXVybHM6Cisg
ICAgICoKKyAgICAgKiBXaGV0aGVyIG9yIG5vdCBKYXZhU2NyaXB0IHJ1bm5pbmcgaW4gdGhlIGNv
bnRleHQgb2YgYSBmaWxlIHNjaGVtZSBVUkwKKyAgICAgKiBzaG91bGQgYmUgYWxsb3dlZCB0byBh
Y2Nlc3MgY29udGVudCBmcm9tIGFueSBvcmlnaW4uICBCeSBkZWZhdWx0LCB3aGVuCisgICAgICog
c29tZXRoaW5nIGlzIGxvYWRlZCBpbiBhICNXZWJLaXRXZWJWaWV3IHVzaW5nIGEgZmlsZSBzY2hl
bWUgVVJMLAorICAgICAqIGFjY2VzcyB0byB0aGUgbG9jYWwgZmlsZSBzeXN0ZW0gYW5kIGFyYml0
cmFyeSBsb2NhbCBzdG9yYWdlIGlzIG5vdAorICAgICAqIGFsbG93ZWQuIFRoaXMgc2V0dGluZyBh
bGxvd3MgeW91IHRvIGNoYW5nZSB0aGF0IGJlaGF2aW91ciwgc28gdGhhdAorICAgICAqIGl0IHdv
dWxkIGJlIHBvc3NpYmxlIHRvIHVzZSBsb2NhbCBzdG9yYWdlLCBmb3IgZXhhbXBsZS4KKyAgICAg
KgorICAgICAqIFNpbmNlOiAyLjEyLjIKKyAgICAgKi8KKyAgICBnX29iamVjdF9jbGFzc19pbnN0
YWxsX3Byb3BlcnR5KGdPYmplY3RDbGFzcywKKyAgICAgICAgUFJPUF9BTExPV19VTklWRVJTQUxf
QUNDRVNTX0ZST01fRklMRV9VUkxTLAorICAgICAgICBnX3BhcmFtX3NwZWNfYm9vbGVhbigiYWxs
b3ctdW5pdmVyc2FsLWFjY2Vzcy1mcm9tLWZpbGUtdXJscyIsCisgICAgICAgICAgICBfKCJBbGxv
dyBsb2NhbCBzdG9yYWdlIGFjY2VzcyBmcm9tIHRoZSBjb250ZXh0IG9mIGZpbGUgc2NoZW1lIFVS
THMiKSwKKyAgICAgICAgICAgIF8oIldoZXRoZXIgb3Igbm90IGxvY2FsIHN0b3JhZ2UgaXMgYWxs
b3dlZCBmcm9tIHRoZSBjb250ZXh0IG9mIGZpbGUgc2NoZW1lIFVSTHMiKSwKKyAgICAgICAgICAg
IEZBTFNFLAorICAgICAgICAgICAgcmVhZFdyaXRlQ29uc3RydWN0UGFyYW1GbGFncykpOwogfQog
CiBXZWJQcmVmZXJlbmNlcyogd2Via2l0U2V0dGluZ3NHZXRQcmVmZXJlbmNlcyhXZWJLaXRTZXR0
aW5ncyogc2V0dGluZ3MpCkBAIC0zMDYyLDMgKzMwODksNDEgQEAgdm9pZCB3ZWJraXRfc2V0dGlu
Z3Nfc2V0X2FsbG93X2ZpbGVfYWNjZXNzX2Zyb21fZmlsZV91cmxzKFdlYktpdFNldHRpbmdzKiBz
ZXR0aW4KICAgICBwcml2LT5wcmVmZXJlbmNlcy0+c2V0QWxsb3dGaWxlQWNjZXNzRnJvbUZpbGVV
UkxzKGFsbG93ZWQpOwogICAgIGdfb2JqZWN0X25vdGlmeShHX09CSkVDVChzZXR0aW5ncyksICJh
bGxvdy1maWxlLWFjY2Vzcy1mcm9tLWZpbGUtdXJscyIpOwogfQorCisvKioKKyAqIHdlYmtpdF9z
ZXR0aW5nc19nZXRfYWxsb3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJsczoKKyAqIEBz
ZXR0aW5nczogYSAjV2ViS2l0U2V0dGluZ3MKKyAqCisgKiBHZXQgdGhlICNXZWJLaXRTZXR0aW5n
czphbGxvdy11bml2ZXJzYWwtYWNjZXNzLWZyb20tZmlsZS11cmxzIHByb3BlcnR5LgorICoKKyAq
IFJldHVybnM6ICVUUlVFIElmIHVuaXZlcnNhbCBhY2Nlc3MgZnJvbSBmaWxlIFVSTHMgaXMgYWxs
b3dlZCBvciAlRkFMU0Ugb3RoZXJ3aXNlLgorICoKKyAqIFNpbmNlOiAyLjEyLjIKKyAqLworZ2Jv
b2xlYW4gd2Via2l0X3NldHRpbmdzX2dldF9hbGxvd191bml2ZXJzYWxfYWNjZXNzX2Zyb21fZmls
ZV91cmxzKFdlYktpdFNldHRpbmdzKiBzZXR0aW5ncykKK3sKKyAgICBnX3JldHVybl92YWxfaWZf
ZmFpbChXRUJLSVRfSVNfU0VUVElOR1Moc2V0dGluZ3MpLCBGQUxTRSk7CisKKyAgICByZXR1cm4g
c2V0dGluZ3MtPnByaXYtPnByZWZlcmVuY2VzLT5hbGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxl
VVJMcygpOworfQorCisvKioKKyAqIHdlYmtpdF9zZXR0aW5nc19zZXRfYWxsb3dfdW5pdmVyc2Fs
X2FjY2Vzc19mcm9tX2ZpbGVfdXJsczoKKyAqIEBzZXR0aW5nczogYSAjV2ViS2l0U2V0dGluZ3MK
KyAqIEBhbGxvd2VkOiBWYWx1ZSB0byBiZSBzZXQKKyAqCisgKiBTZXQgdGhlICNXZWJLaXRTZXR0
aW5nczphbGxvdy11bml2ZXJzYWwtYWNjZXNzLWZyb20tZmlsZS11cmxzIHByb3BlcnR5LgorICoK
KyAqIFNpbmNlOiAyLjEyLjIKKyAqLwordm9pZCB3ZWJraXRfc2V0dGluZ3Nfc2V0X2FsbG93X3Vu
aXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxlX3VybHMoV2ViS2l0U2V0dGluZ3MqIHNldHRpbmdzLCBn
Ym9vbGVhbiBhbGxvd2VkKQoreworICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1NFVFRJ
TkdTKHNldHRpbmdzKSk7CisKKyAgICBXZWJLaXRTZXR0aW5nc1ByaXZhdGUqIHByaXYgPSBzZXR0
aW5ncy0+cHJpdjsKKyAgICBpZiAocHJpdi0+cHJlZmVyZW5jZXMtPmFsbG93VW5pdmVyc2FsQWNj
ZXNzRnJvbUZpbGVVUkxzKCkgPT0gYWxsb3dlZCkKKyAgICAgICAgcmV0dXJuOworCisgICAgcHJp
di0+cHJlZmVyZW5jZXMtPnNldEFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzKGFsbG93
ZWQpOworICAgIGdfb2JqZWN0X25vdGlmeShHX09CSkVDVChzZXR0aW5ncyksICJhbGxvdy11bml2
ZXJzYWwtYWNjZXNzLWZyb20tZmlsZS11cmxzIik7Cit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRTZXR0aW5ncy5oIGIvU291cmNlL1dlYktpdDIv
VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGluZ3MuaAppbmRleCBkOWVjNDgwMzQ1MGIxYWQx
NDJlNDM5ODg3ZmVhYWNlNDU4YzRiNmFkLi5lNjQ3M2YyYjYwN2JlNDIzYWNmYTc0MjcyMmE1ZGVi
MTI1ZDc2NDcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9X
ZWJLaXRTZXR0aW5ncy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dl
YktpdFNldHRpbmdzLmgKQEAgLTQyMSw2ICs0MjEsMTMgQEAgV0VCS0lUX0FQSSB2b2lkCiB3ZWJr
aXRfc2V0dGluZ3Nfc2V0X2FsbG93X2ZpbGVfYWNjZXNzX2Zyb21fZmlsZV91cmxzICAgICAgICAg
ICAoV2ViS2l0U2V0dGluZ3MgKnNldHRpbmdzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdib29sZWFuICAgICAgICBhbGxv
d2VkKTsKIAorV0VCS0lUX0FQSSBnYm9vbGVhbgord2Via2l0X3NldHRpbmdzX2dldF9hbGxvd191
bml2ZXJzYWxfYWNjZXNzX2Zyb21fZmlsZV91cmxzICAgICAgKFdlYktpdFNldHRpbmdzICpzZXR0
aW5ncyk7CisKK1dFQktJVF9BUEkgdm9pZAord2Via2l0X3NldHRpbmdzX3NldF9hbGxvd191bml2
ZXJzYWxfYWNjZXNzX2Zyb21fZmlsZV91cmxzICAgICAgKFdlYktpdFNldHRpbmdzICpzZXR0aW5n
cywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICBnYm9vbGVhbiAgICAgICAgYWxsb3dlZCk7CisKIEdfRU5EX0RFQ0xTCiAKICNl
bmRpZiAvKiBXZWJLaXRTZXR0aW5nc19oICovCg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>276579</attachid>
            <date>2016-04-16 22:55:19 -0700</date>
            <delta_ts>2016-04-17 10:21:24 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-156651-20160417005534.patch</filename>
            <type>text/plain</type>
            <size>7347</size>
            <attacher name="Dustin Falgout">dustin</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5NjM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjM0MGUxZDFjYTFkMDA1
NDI4ZDI4YWUyOGZjZTA5M2ZjNjIxM2RkNi4uNmQ2NTc5MGM3YTI1NTgzZTAwMWY5YWIyNGQyMzA3
Mjg5YWRiMDQ0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE2LTA0LTE2ICBEdXN0
aW4gRmFsZ291dCAgPGR1c3RpbkBmYWxnb3V0LnVzPgorCisgICAgICAgIFdrV2VidmlldzogY2Fs
bGluZyBsb2NhbFN0b3JhZ2UuZ2V0SXRlbSgpIHJlc3VsdHMgaW4gVW5jYXVnaHQgRXhjZXB0aW9u
OiBTZWN1cml0eUVycm9yOiBET00gRXhjZXB0aW9uIDE4OiBBbiBhdHRlbXB0IHdhcyBtYWRlIHRv
IGJyZWFrIHRocm91Z2ggdGhlIHNlY3VyaXR5IHBvbGljeSBvZiB0aGUgdXNlciBhZ2VudC4KKyAg
ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NjY1MQorCisg
ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNz
L0FQSS9ndGsvV2ViS2l0U2V0dGluZ3MuY3BwOgorICAgICAgICAod2ViS2l0U2V0dGluZ3NTZXRQ
cm9wZXJ0eSk6CisgICAgICAgICh3ZWJLaXRTZXR0aW5nc0dldFByb3BlcnR5KToKKyAgICAgICAg
KHdlYmtpdF9zZXR0aW5nc19jbGFzc19pbml0KToKKyAgICAgICAgKHdlYmtpdF9zZXR0aW5nc19n
ZXRfYWxsb3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJscyk6CisgICAgICAgICh3ZWJr
aXRfc2V0dGluZ3Nfc2V0X2FsbG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxlX3VybHMpOgor
ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFNldHRpbmdzLmg6CisgICAgICAgICog
VUlQcm9jZXNzL0FQSS9ndGsvZG9jcy93ZWJraXQyZ3RrLTQuMC1zZWN0aW9ucy50eHQ6CisKIDIw
MTYtMDQtMTYgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBbTWFj
XSBXZWIgQ29udGVudCBzZXJ2aWNlIHdpdGggYSByZXN0cmljdGVkIGVudGl0bGVtZW50IG1heSBs
b2FkIGFyYml0cmFyeSBkeWxpYnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz
cy9BUEkvZ3RrL1dlYktpdFNldHRpbmdzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B
UEkvZ3RrL1dlYktpdFNldHRpbmdzLmNwcAppbmRleCA0MDlhYmNkZWI5MGNiZDc1ZjJiMWZkMWNl
Njc4Y2E4MTZjMTZkZTM2Li5iZjZjNWQ1NjhlNGJiZDI4OTE5YTE0MDYyODczZDJmZGYzYWE0YTQy
IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRTZXR0
aW5ncy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2V0
dGluZ3MuY3BwCkBAIC0xNDQsNyArMTQ0LDggQEAgZW51bSB7CiAgICAgUFJPUF9FTkFCTEVfTUVE
SUFfU1RSRUFNLAogICAgIFBST1BfRU5BQkxFX1NQQVRJQUxfTkFWSUdBVElPTiwKICAgICBQUk9Q
X0VOQUJMRV9NRURJQVNPVVJDRSwKLSAgICBQUk9QX0FMTE9XX0ZJTEVfQUNDRVNTX0ZST01fRklM
RV9VUkxTCisgICAgUFJPUF9BTExPV19GSUxFX0FDQ0VTU19GUk9NX0ZJTEVfVVJMUywKKyAgICBQ
Uk9QX0FMTE9XX1VOSVZFUlNBTF9BQ0NFU1NfRlJPTV9GSUxFX1VSTFMKIH07CiAKIHN0YXRpYyB2
b2lkIHdlYktpdFNldHRpbmdzQ29uc3RydWN0ZWQoR09iamVjdCogb2JqZWN0KQpAQCAtMzEzLDYg
KzMxNCw5IEBAIHN0YXRpYyB2b2lkIHdlYktpdFNldHRpbmdzU2V0UHJvcGVydHkoR09iamVjdCog
b2JqZWN0LCBndWludCBwcm9wSWQsIGNvbnN0IEdWYWx1CiAgICAgY2FzZSBQUk9QX0FMTE9XX0ZJ
TEVfQUNDRVNTX0ZST01fRklMRV9VUkxTOgogICAgICAgICB3ZWJraXRfc2V0dGluZ3Nfc2V0X2Fs
bG93X2ZpbGVfYWNjZXNzX2Zyb21fZmlsZV91cmxzKHNldHRpbmdzLCBnX3ZhbHVlX2dldF9ib29s
ZWFuKHZhbHVlKSk7CiAgICAgICAgIGJyZWFrOworICAgIGNhc2UgUFJPUF9BTExPV19VTklWRVJT
QUxfQUNDRVNTX0ZST01fRklMRV9VUkxTOgorICAgICAgICB3ZWJraXRfc2V0dGluZ3Nfc2V0X2Fs
bG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxlX3VybHMoc2V0dGluZ3MsIGdfdmFsdWVfZ2V0
X2Jvb2xlYW4odmFsdWUpKTsKKyAgICAgICAgYnJlYWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAg
R19PQkpFQ1RfV0FSTl9JTlZBTElEX1BST1BFUlRZX0lEKG9iamVjdCwgcHJvcElkLCBwYXJhbVNw
ZWMpOwogICAgICAgICBicmVhazsKQEAgLTQ3MSw2ICs0NzUsOSBAQCBzdGF0aWMgdm9pZCB3ZWJL
aXRTZXR0aW5nc0dldFByb3BlcnR5KEdPYmplY3QqIG9iamVjdCwgZ3VpbnQgcHJvcElkLCBHVmFs
dWUqIHZhbAogICAgIGNhc2UgUFJPUF9BTExPV19GSUxFX0FDQ0VTU19GUk9NX0ZJTEVfVVJMUzoK
ICAgICAgICAgZ192YWx1ZV9zZXRfYm9vbGVhbih2YWx1ZSwgd2Via2l0X3NldHRpbmdzX2dldF9h
bGxvd19maWxlX2FjY2Vzc19mcm9tX2ZpbGVfdXJscyhzZXR0aW5ncykpOwogICAgICAgICBicmVh
azsKKyAgICBjYXNlIFBST1BfQUxMT1dfVU5JVkVSU0FMX0FDQ0VTU19GUk9NX0ZJTEVfVVJMUzoK
KyAgICAgICAgZ192YWx1ZV9zZXRfYm9vbGVhbih2YWx1ZSwgd2Via2l0X3NldHRpbmdzX2dldF9h
bGxvd191bml2ZXJzYWxfYWNjZXNzX2Zyb21fZmlsZV91cmxzKHNldHRpbmdzKSk7CisgICAgICAg
IGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIEdfT0JKRUNUX1dBUk5fSU5WQUxJRF9QUk9Q
RVJUWV9JRChvYmplY3QsIHByb3BJZCwgcGFyYW1TcGVjKTsKICAgICAgICAgYnJlYWs7CkBAIC0x
MjQyLDYgKzEyNDksMjYgQEAgc3RhdGljIHZvaWQgd2Via2l0X3NldHRpbmdzX2NsYXNzX2luaXQo
V2ViS2l0U2V0dGluZ3NDbGFzcyoga2xhc3MpCiAgICAgICAgICAgICBfKCJXaGV0aGVyIGZpbGUg
YWNjZXNzIGlzIGFsbG93ZWQgZnJvbSBmaWxlIFVSTHMuIiksCiAgICAgICAgICAgICBGQUxTRSwK
ICAgICAgICAgICAgIHJlYWRXcml0ZUNvbnN0cnVjdFBhcmFtRmxhZ3MpKTsKKworICAgIC8qKgor
ICAgICAqIFdlYktpdFNldHRpbmdzOmFsbG93LXVuaXZlcnNhbC1hY2Nlc3MtZnJvbS1maWxlLXVy
bHM6CisgICAgICoKKyAgICAgKiBXaGV0aGVyIG9yIG5vdCBKYXZhU2NyaXB0IHJ1bm5pbmcgaW4g
dGhlIGNvbnRleHQgb2YgYSBmaWxlIHNjaGVtZSBVUkwKKyAgICAgKiBzaG91bGQgYmUgYWxsb3dl
ZCB0byBhY2Nlc3MgY29udGVudCBmcm9tIGFueSBvcmlnaW4uICBCeSBkZWZhdWx0LCB3aGVuCisg
ICAgICogc29tZXRoaW5nIGlzIGxvYWRlZCBpbiBhICNXZWJLaXRXZWJWaWV3IHVzaW5nIGEgZmls
ZSBzY2hlbWUgVVJMLAorICAgICAqIGFjY2VzcyB0byB0aGUgbG9jYWwgZmlsZSBzeXN0ZW0gYW5k
IGFyYml0cmFyeSBsb2NhbCBzdG9yYWdlIGlzIG5vdAorICAgICAqIGFsbG93ZWQuIFRoaXMgc2V0
dGluZyBhbGxvd3MgeW91IHRvIGNoYW5nZSB0aGF0IGJlaGF2aW91ciwgc28gdGhhdAorICAgICAq
IGl0IHdvdWxkIGJlIHBvc3NpYmxlIHRvIHVzZSBsb2NhbCBzdG9yYWdlLCBmb3IgZXhhbXBsZS4K
KyAgICAgKgorICAgICAqIFNpbmNlOiAyLjEyLjIKKyAgICAgKi8KKyAgICBnX29iamVjdF9jbGFz
c19pbnN0YWxsX3Byb3BlcnR5KGdPYmplY3RDbGFzcywKKyAgICAgICAgUFJPUF9BTExPV19VTklW
RVJTQUxfQUNDRVNTX0ZST01fRklMRV9VUkxTLAorICAgICAgICBnX3BhcmFtX3NwZWNfYm9vbGVh
bigiYWxsb3ctdW5pdmVyc2FsLWFjY2Vzcy1mcm9tLWZpbGUtdXJscyIsCisgICAgICAgICAgICBf
KCJBbGxvdyBsb2NhbCBzdG9yYWdlIGFjY2VzcyBmcm9tIHRoZSBjb250ZXh0IG9mIGZpbGUgc2No
ZW1lIFVSTHMiKSwKKyAgICAgICAgICAgIF8oIldoZXRoZXIgb3Igbm90IGxvY2FsIHN0b3JhZ2Ug
aXMgYWxsb3dlZCBmcm9tIHRoZSBjb250ZXh0IG9mIGZpbGUgc2NoZW1lIFVSTHMiKSwKKyAgICAg
ICAgICAgIEZBTFNFLAorICAgICAgICAgICAgcmVhZFdyaXRlQ29uc3RydWN0UGFyYW1GbGFncykp
OwogfQogCiBXZWJQcmVmZXJlbmNlcyogd2Via2l0U2V0dGluZ3NHZXRQcmVmZXJlbmNlcyhXZWJL
aXRTZXR0aW5ncyogc2V0dGluZ3MpCkBAIC0zMDYyLDMgKzMwODksNDEgQEAgdm9pZCB3ZWJraXRf
c2V0dGluZ3Nfc2V0X2FsbG93X2ZpbGVfYWNjZXNzX2Zyb21fZmlsZV91cmxzKFdlYktpdFNldHRp
bmdzKiBzZXR0aW4KICAgICBwcml2LT5wcmVmZXJlbmNlcy0+c2V0QWxsb3dGaWxlQWNjZXNzRnJv
bUZpbGVVUkxzKGFsbG93ZWQpOwogICAgIGdfb2JqZWN0X25vdGlmeShHX09CSkVDVChzZXR0aW5n
cyksICJhbGxvdy1maWxlLWFjY2Vzcy1mcm9tLWZpbGUtdXJscyIpOwogfQorCisvKioKKyAqIHdl
YmtpdF9zZXR0aW5nc19nZXRfYWxsb3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJsczoK
KyAqIEBzZXR0aW5nczogYSAjV2ViS2l0U2V0dGluZ3MKKyAqCisgKiBHZXQgdGhlICNXZWJLaXRT
ZXR0aW5nczphbGxvdy11bml2ZXJzYWwtYWNjZXNzLWZyb20tZmlsZS11cmxzIHByb3BlcnR5Lgor
ICoKKyAqIFJldHVybnM6ICVUUlVFIElmIHVuaXZlcnNhbCBhY2Nlc3MgZnJvbSBmaWxlIFVSTHMg
aXMgYWxsb3dlZCBvciAlRkFMU0Ugb3RoZXJ3aXNlLgorICoKKyAqIFNpbmNlOiAyLjEyLjIKKyAq
LworZ2Jvb2xlYW4gd2Via2l0X3NldHRpbmdzX2dldF9hbGxvd191bml2ZXJzYWxfYWNjZXNzX2Zy
b21fZmlsZV91cmxzKFdlYktpdFNldHRpbmdzKiBzZXR0aW5ncykKK3sKKyAgICBnX3JldHVybl92
YWxfaWZfZmFpbChXRUJLSVRfSVNfU0VUVElOR1Moc2V0dGluZ3MpLCBGQUxTRSk7CisKKyAgICBy
ZXR1cm4gc2V0dGluZ3MtPnByaXYtPnByZWZlcmVuY2VzLT5hbGxvd1VuaXZlcnNhbEFjY2Vzc0Zy
b21GaWxlVVJMcygpOworfQorCisvKioKKyAqIHdlYmtpdF9zZXR0aW5nc19zZXRfYWxsb3dfdW5p
dmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJsczoKKyAqIEBzZXR0aW5nczogYSAjV2ViS2l0U2V0
dGluZ3MKKyAqIEBhbGxvd2VkOiBWYWx1ZSB0byBiZSBzZXQKKyAqCisgKiBTZXQgdGhlICNXZWJL
aXRTZXR0aW5nczphbGxvdy11bml2ZXJzYWwtYWNjZXNzLWZyb20tZmlsZS11cmxzIHByb3BlcnR5
LgorICoKKyAqIFNpbmNlOiAyLjEyLjIKKyAqLwordm9pZCB3ZWJraXRfc2V0dGluZ3Nfc2V0X2Fs
bG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxlX3VybHMoV2ViS2l0U2V0dGluZ3MqIHNldHRp
bmdzLCBnYm9vbGVhbiBhbGxvd2VkKQoreworICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VCS0lUX0lT
X1NFVFRJTkdTKHNldHRpbmdzKSk7CisKKyAgICBXZWJLaXRTZXR0aW5nc1ByaXZhdGUqIHByaXYg
PSBzZXR0aW5ncy0+cHJpdjsKKyAgICBpZiAocHJpdi0+cHJlZmVyZW5jZXMtPmFsbG93VW5pdmVy
c2FsQWNjZXNzRnJvbUZpbGVVUkxzKCkgPT0gYWxsb3dlZCkKKyAgICAgICAgcmV0dXJuOworCisg
ICAgcHJpdi0+cHJlZmVyZW5jZXMtPnNldEFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxz
KGFsbG93ZWQpOworICAgIGdfb2JqZWN0X25vdGlmeShHX09CSkVDVChzZXR0aW5ncyksICJhbGxv
dy11bml2ZXJzYWwtYWNjZXNzLWZyb20tZmlsZS11cmxzIik7Cit9CmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRTZXR0aW5ncy5oIGIvU291cmNlL1dl
YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGluZ3MuaAppbmRleCBkOWVjNDgwMzQ1
MGIxYWQxNDJlNDM5ODg3ZmVhYWNlNDU4YzRiNmFkLi5lNjQ3M2YyYjYwN2JlNDIzYWNmYTc0Mjcy
MmE1ZGViMTI1ZDc2NDcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ
L2d0ay9XZWJLaXRTZXR0aW5ncy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv
Z3RrL1dlYktpdFNldHRpbmdzLmgKQEAgLTQyMSw2ICs0MjEsMTMgQEAgV0VCS0lUX0FQSSB2b2lk
CiB3ZWJraXRfc2V0dGluZ3Nfc2V0X2FsbG93X2ZpbGVfYWNjZXNzX2Zyb21fZmlsZV91cmxzICAg
ICAgICAgICAoV2ViS2l0U2V0dGluZ3MgKnNldHRpbmdzLAogICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdib29sZWFuICAgICAg
ICBhbGxvd2VkKTsKIAorV0VCS0lUX0FQSSBnYm9vbGVhbgord2Via2l0X3NldHRpbmdzX2dldF9h
bGxvd191bml2ZXJzYWxfYWNjZXNzX2Zyb21fZmlsZV91cmxzICAgICAgKFdlYktpdFNldHRpbmdz
ICpzZXR0aW5ncyk7CisKK1dFQktJVF9BUEkgdm9pZAord2Via2l0X3NldHRpbmdzX3NldF9hbGxv
d191bml2ZXJzYWxfYWNjZXNzX2Zyb21fZmlsZV91cmxzICAgICAgKFdlYktpdFNldHRpbmdzICpz
ZXR0aW5ncywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICBnYm9vbGVhbiAgICAgICAgYWxsb3dlZCk7CisKIEdfRU5EX0RFQ0xT
CiAKICNlbmRpZiAvKiBXZWJLaXRTZXR0aW5nc19oICovCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi
S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGstNC4wLXNlY3Rpb25zLnR4dCBi
L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay00LjAtc2Vj
dGlvbnMudHh0CmluZGV4IDI0NWViNTQzZTk1ZjBkZmYyZDQ4N2VlNGY5OTEwNTNkZGQyMGEwOTIu
LjAwMmVmMzNhYTc5MmMyNWVhNjUzYjMxNjY0MTYyMmUzNDE4NDBkZGMgMTAwNjQ0Ci0tLSBhL1Nv
dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay00LjAtc2VjdGlv
bnMudHh0CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0
Mmd0ay00LjAtc2VjdGlvbnMudHh0CkBAIC00NTMsNiArNDUzLDggQEAgd2Via2l0X3NldHRpbmdz
X2dldF9lbmFibGVfbWVkaWFzb3VyY2UKIHdlYmtpdF9zZXR0aW5nc19zZXRfZW5hYmxlX21lZGlh
c291cmNlCiB3ZWJraXRfc2V0dGluZ3NfZ2V0X2FsbG93X2ZpbGVfYWNjZXNzX2Zyb21fZmlsZV91
cmxzCiB3ZWJraXRfc2V0dGluZ3Nfc2V0X2FsbG93X2ZpbGVfYWNjZXNzX2Zyb21fZmlsZV91cmxz
Cit3ZWJraXRfc2V0dGluZ3NfZ2V0X2FsbG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxlX3Vy
bHMKK3dlYmtpdF9zZXR0aW5nc19zZXRfYWxsb3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVf
dXJscwogCiA8U1VCU0VDVElPTiBTdGFuZGFyZD4KIFdlYktpdFNldHRpbmdzQ2xhc3MK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>276593</attachid>
            <date>2016-04-17 10:21:30 -0700</date>
            <delta_ts>2016-04-17 10:34:19 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-156651-20160417122146.patch</filename>
            <type>text/plain</type>
            <size>7170</size>
            <attacher name="Dustin Falgout">dustin</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5NjM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V
SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRTZXR0aW5ncy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy
b2Nlc3MvQVBJL2d0ay9XZWJLaXRTZXR0aW5ncy5jcHAKaW5kZXggNDA5YWJjZGViOTBjYmQ3NWYy
YjFmZDFjZTY3OGNhODE2YzE2ZGUzNi4uNjE2YjQ2MTU5OTNmM2Q4YzUyYTE5NTFmZTAxNDVhMjMz
MjMzYWJkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi
S2l0U2V0dGluZ3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dl
YktpdFNldHRpbmdzLmNwcApAQCAtMTQ0LDcgKzE0NCw4IEBAIGVudW0gewogICAgIFBST1BfRU5B
QkxFX01FRElBX1NUUkVBTSwKICAgICBQUk9QX0VOQUJMRV9TUEFUSUFMX05BVklHQVRJT04sCiAg
ICAgUFJPUF9FTkFCTEVfTUVESUFTT1VSQ0UsCi0gICAgUFJPUF9BTExPV19GSUxFX0FDQ0VTU19G
Uk9NX0ZJTEVfVVJMUworICAgIFBST1BfQUxMT1dfRklMRV9BQ0NFU1NfRlJPTV9GSUxFX1VSTFMs
CisgICAgUFJPUF9BTExPV19VTklWRVJTQUxfQUNDRVNTX0ZST01fRklMRV9VUkxTCiB9OwogCiBz
dGF0aWMgdm9pZCB3ZWJLaXRTZXR0aW5nc0NvbnN0cnVjdGVkKEdPYmplY3QqIG9iamVjdCkKQEAg
LTMxMyw2ICszMTQsOSBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRTZXR0aW5nc1NldFByb3BlcnR5KEdP
YmplY3QqIG9iamVjdCwgZ3VpbnQgcHJvcElkLCBjb25zdCBHVmFsdQogICAgIGNhc2UgUFJPUF9B
TExPV19GSUxFX0FDQ0VTU19GUk9NX0ZJTEVfVVJMUzoKICAgICAgICAgd2Via2l0X3NldHRpbmdz
X3NldF9hbGxvd19maWxlX2FjY2Vzc19mcm9tX2ZpbGVfdXJscyhzZXR0aW5ncywgZ192YWx1ZV9n
ZXRfYm9vbGVhbih2YWx1ZSkpOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIFBST1BfQUxMT1df
VU5JVkVSU0FMX0FDQ0VTU19GUk9NX0ZJTEVfVVJMUzoKKyAgICAgICAgd2Via2l0X3NldHRpbmdz
X3NldF9hbGxvd191bml2ZXJzYWxfYWNjZXNzX2Zyb21fZmlsZV91cmxzKHNldHRpbmdzLCBnX3Zh
bHVlX2dldF9ib29sZWFuKHZhbHVlKSk7CisgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAg
ICAgICAgIEdfT0JKRUNUX1dBUk5fSU5WQUxJRF9QUk9QRVJUWV9JRChvYmplY3QsIHByb3BJZCwg
cGFyYW1TcGVjKTsKICAgICAgICAgYnJlYWs7CkBAIC00NzEsNiArNDc1LDkgQEAgc3RhdGljIHZv
aWQgd2ViS2l0U2V0dGluZ3NHZXRQcm9wZXJ0eShHT2JqZWN0KiBvYmplY3QsIGd1aW50IHByb3BJ
ZCwgR1ZhbHVlKiB2YWwKICAgICBjYXNlIFBST1BfQUxMT1dfRklMRV9BQ0NFU1NfRlJPTV9GSUxF
X1VSTFM6CiAgICAgICAgIGdfdmFsdWVfc2V0X2Jvb2xlYW4odmFsdWUsIHdlYmtpdF9zZXR0aW5n
c19nZXRfYWxsb3dfZmlsZV9hY2Nlc3NfZnJvbV9maWxlX3VybHMoc2V0dGluZ3MpKTsKICAgICAg
ICAgYnJlYWs7CisgICAgY2FzZSBQUk9QX0FMTE9XX1VOSVZFUlNBTF9BQ0NFU1NfRlJPTV9GSUxF
X1VSTFM6CisgICAgICAgIGdfdmFsdWVfc2V0X2Jvb2xlYW4odmFsdWUsIHdlYmtpdF9zZXR0aW5n
c19nZXRfYWxsb3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJscyhzZXR0aW5ncykpOwor
ICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBHX09CSkVDVF9XQVJOX0lOVkFM
SURfUFJPUEVSVFlfSUQob2JqZWN0LCBwcm9wSWQsIHBhcmFtU3BlYyk7CiAgICAgICAgIGJyZWFr
OwpAQCAtMTI0Miw2ICsxMjQ5LDI2IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9zZXR0aW5nc19jbGFz
c19pbml0KFdlYktpdFNldHRpbmdzQ2xhc3MqIGtsYXNzKQogICAgICAgICAgICAgXygiV2hldGhl
ciBmaWxlIGFjY2VzcyBpcyBhbGxvd2VkIGZyb20gZmlsZSBVUkxzLiIpLAogICAgICAgICAgICAg
RkFMU0UsCiAgICAgICAgICAgICByZWFkV3JpdGVDb25zdHJ1Y3RQYXJhbUZsYWdzKSk7CisKKyAg
ICAvKioKKyAgICAgKiBXZWJLaXRTZXR0aW5nczphbGxvdy11bml2ZXJzYWwtYWNjZXNzLWZyb20t
ZmlsZS11cmxzOgorICAgICAqCisgICAgICogV2hldGhlciBvciBub3QgSmF2YVNjcmlwdCBydW5u
aW5nIGluIHRoZSBjb250ZXh0IG9mIGEgZmlsZSBzY2hlbWUgVVJMCisgICAgICogc2hvdWxkIGJl
IGFsbG93ZWQgdG8gYWNjZXNzIGNvbnRlbnQgZnJvbSBhbnkgb3JpZ2luLiAgQnkgZGVmYXVsdCwg
d2hlbgorICAgICAqIHNvbWV0aGluZyBpcyBsb2FkZWQgaW4gYSAjV2ViS2l0V2ViVmlldyB1c2lu
ZyBhIGZpbGUgc2NoZW1lIFVSTCwKKyAgICAgKiBhY2Nlc3MgdG8gdGhlIGxvY2FsIGZpbGUgc3lz
dGVtIGFuZCBhcmJpdHJhcnkgbG9jYWwgc3RvcmFnZSBpcyBub3QKKyAgICAgKiBhbGxvd2VkLiBU
aGlzIHNldHRpbmcgYWxsb3dzIHlvdSB0byBjaGFuZ2UgdGhhdCBiZWhhdmlvdXIsIHNvIHRoYXQK
KyAgICAgKiBpdCB3b3VsZCBiZSBwb3NzaWJsZSB0byB1c2UgbG9jYWwgc3RvcmFnZSwgZm9yIGV4
YW1wbGUuCisgICAgICoKKyAgICAgKiBTaW5jZTogMi4xMi4yCisgICAgICovCisgICAgZ19vYmpl
Y3RfY2xhc3NfaW5zdGFsbF9wcm9wZXJ0eShnT2JqZWN0Q2xhc3MsCisgICAgICAgIFBST1BfQUxM
T1dfVU5JVkVSU0FMX0FDQ0VTU19GUk9NX0ZJTEVfVVJMUywKKyAgICAgICAgZ19wYXJhbV9zcGVj
X2Jvb2xlYW4oImFsbG93LXVuaXZlcnNhbC1hY2Nlc3MtZnJvbS1maWxlLXVybHMiLAorICAgICAg
ICAgICAgXygiQWxsb3cgdW5pdmVyc2FsIGFjY2VzcyBmcm9tIHRoZSBjb250ZXh0IG9mIGZpbGUg
c2NoZW1lIFVSTHMiKSwKKyAgICAgICAgICAgIF8oIldoZXRoZXIgb3Igbm90IHVuaXZlcnNhbCBh
Y2Nlc3MgaXMgYWxsb3dlZCBmcm9tIHRoZSBjb250ZXh0IG9mIGZpbGUgc2NoZW1lIFVSTHMiKSwK
KyAgICAgICAgICAgIEZBTFNFLAorICAgICAgICAgICAgcmVhZFdyaXRlQ29uc3RydWN0UGFyYW1G
bGFncykpOwogfQogCiBXZWJQcmVmZXJlbmNlcyogd2Via2l0U2V0dGluZ3NHZXRQcmVmZXJlbmNl
cyhXZWJLaXRTZXR0aW5ncyogc2V0dGluZ3MpCkBAIC0zMDYyLDMgKzMwODksNDEgQEAgdm9pZCB3
ZWJraXRfc2V0dGluZ3Nfc2V0X2FsbG93X2ZpbGVfYWNjZXNzX2Zyb21fZmlsZV91cmxzKFdlYktp
dFNldHRpbmdzKiBzZXR0aW4KICAgICBwcml2LT5wcmVmZXJlbmNlcy0+c2V0QWxsb3dGaWxlQWNj
ZXNzRnJvbUZpbGVVUkxzKGFsbG93ZWQpOwogICAgIGdfb2JqZWN0X25vdGlmeShHX09CSkVDVChz
ZXR0aW5ncyksICJhbGxvdy1maWxlLWFjY2Vzcy1mcm9tLWZpbGUtdXJscyIpOwogfQorCisvKioK
KyAqIHdlYmtpdF9zZXR0aW5nc19nZXRfYWxsb3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVf
dXJsczoKKyAqIEBzZXR0aW5nczogYSAjV2ViS2l0U2V0dGluZ3MKKyAqCisgKiBHZXQgdGhlICNX
ZWJLaXRTZXR0aW5nczphbGxvdy11bml2ZXJzYWwtYWNjZXNzLWZyb20tZmlsZS11cmxzIHByb3Bl
cnR5LgorICoKKyAqIFJldHVybnM6ICVUUlVFIElmIHVuaXZlcnNhbCBhY2Nlc3MgZnJvbSBmaWxl
IFVSTHMgaXMgYWxsb3dlZCBvciAlRkFMU0Ugb3RoZXJ3aXNlLgorICoKKyAqIFNpbmNlOiAyLjEy
LjIKKyAqLworZ2Jvb2xlYW4gd2Via2l0X3NldHRpbmdzX2dldF9hbGxvd191bml2ZXJzYWxfYWNj
ZXNzX2Zyb21fZmlsZV91cmxzKFdlYktpdFNldHRpbmdzKiBzZXR0aW5ncykKK3sKKyAgICBnX3Jl
dHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfU0VUVElOR1Moc2V0dGluZ3MpLCBGQUxTRSk7CisK
KyAgICByZXR1cm4gc2V0dGluZ3MtPnByaXYtPnByZWZlcmVuY2VzLT5hbGxvd1VuaXZlcnNhbEFj
Y2Vzc0Zyb21GaWxlVVJMcygpOworfQorCisvKioKKyAqIHdlYmtpdF9zZXR0aW5nc19zZXRfYWxs
b3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJsczoKKyAqIEBzZXR0aW5nczogYSAjV2Vi
S2l0U2V0dGluZ3MKKyAqIEBhbGxvd2VkOiBWYWx1ZSB0byBiZSBzZXQKKyAqCisgKiBTZXQgdGhl
ICNXZWJLaXRTZXR0aW5nczphbGxvdy11bml2ZXJzYWwtYWNjZXNzLWZyb20tZmlsZS11cmxzIHBy
b3BlcnR5LgorICoKKyAqIFNpbmNlOiAyLjEyLjIKKyAqLwordm9pZCB3ZWJraXRfc2V0dGluZ3Nf
c2V0X2FsbG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxlX3VybHMoV2ViS2l0U2V0dGluZ3Mq
IHNldHRpbmdzLCBnYm9vbGVhbiBhbGxvd2VkKQoreworICAgIGdfcmV0dXJuX2lmX2ZhaWwoV0VC
S0lUX0lTX1NFVFRJTkdTKHNldHRpbmdzKSk7CisKKyAgICBXZWJLaXRTZXR0aW5nc1ByaXZhdGUq
IHByaXYgPSBzZXR0aW5ncy0+cHJpdjsKKyAgICBpZiAocHJpdi0+cHJlZmVyZW5jZXMtPmFsbG93
VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzKCkgPT0gYWxsb3dlZCkKKyAgICAgICAgcmV0dXJu
OworCisgICAgcHJpdi0+cHJlZmVyZW5jZXMtPnNldEFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZp
bGVVUkxzKGFsbG93ZWQpOworICAgIGdfb2JqZWN0X25vdGlmeShHX09CSkVDVChzZXR0aW5ncyks
ICJhbGxvdy11bml2ZXJzYWwtYWNjZXNzLWZyb20tZmlsZS11cmxzIik7Cit9CmRpZmYgLS1naXQg
YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRTZXR0aW5ncy5oIGIvU291
cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGluZ3MuaAppbmRleCBkOWVj
NDgwMzQ1MGIxYWQxNDJlNDM5ODg3ZmVhYWNlNDU4YzRiNmFkLi5lNjQ3M2YyYjYwN2JlNDIzYWNm
YTc0MjcyMmE1ZGViMTI1ZDc2NDcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl
c3MvQVBJL2d0ay9XZWJLaXRTZXR0aW5ncy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz
cy9BUEkvZ3RrL1dlYktpdFNldHRpbmdzLmgKQEAgLTQyMSw2ICs0MjEsMTMgQEAgV0VCS0lUX0FQ
SSB2b2lkCiB3ZWJraXRfc2V0dGluZ3Nfc2V0X2FsbG93X2ZpbGVfYWNjZXNzX2Zyb21fZmlsZV91
cmxzICAgICAgICAgICAoV2ViS2l0U2V0dGluZ3MgKnNldHRpbmdzLAogICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdib29sZWFu
ICAgICAgICBhbGxvd2VkKTsKIAorV0VCS0lUX0FQSSBnYm9vbGVhbgord2Via2l0X3NldHRpbmdz
X2dldF9hbGxvd191bml2ZXJzYWxfYWNjZXNzX2Zyb21fZmlsZV91cmxzICAgICAgKFdlYktpdFNl
dHRpbmdzICpzZXR0aW5ncyk7CisKK1dFQktJVF9BUEkgdm9pZAord2Via2l0X3NldHRpbmdzX3Nl
dF9hbGxvd191bml2ZXJzYWxfYWNjZXNzX2Zyb21fZmlsZV91cmxzICAgICAgKFdlYktpdFNldHRp
bmdzICpzZXR0aW5ncywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICBnYm9vbGVhbiAgICAgICAgYWxsb3dlZCk7CisKIEdfRU5E
X0RFQ0xTCiAKICNlbmRpZiAvKiBXZWJLaXRTZXR0aW5nc19oICovCmRpZmYgLS1naXQgYS9Tb3Vy
Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGstNC4wLXNlY3Rpb25z
LnR4dCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay00
LjAtc2VjdGlvbnMudHh0CmluZGV4IDI0NWViNTQzZTk1ZjBkZmYyZDQ4N2VlNGY5OTEwNTNkZGQy
MGEwOTIuLjAwMmVmMzNhYTc5MmMyNWVhNjUzYjMxNjY0MTYyMmUzNDE4NDBkZGMgMTAwNjQ0Ci0t
LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay00LjAt
c2VjdGlvbnMudHh0CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mv
d2Via2l0Mmd0ay00LjAtc2VjdGlvbnMudHh0CkBAIC00NTMsNiArNDUzLDggQEAgd2Via2l0X3Nl
dHRpbmdzX2dldF9lbmFibGVfbWVkaWFzb3VyY2UKIHdlYmtpdF9zZXR0aW5nc19zZXRfZW5hYmxl
X21lZGlhc291cmNlCiB3ZWJraXRfc2V0dGluZ3NfZ2V0X2FsbG93X2ZpbGVfYWNjZXNzX2Zyb21f
ZmlsZV91cmxzCiB3ZWJraXRfc2V0dGluZ3Nfc2V0X2FsbG93X2ZpbGVfYWNjZXNzX2Zyb21fZmls
ZV91cmxzCit3ZWJraXRfc2V0dGluZ3NfZ2V0X2FsbG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9m
aWxlX3VybHMKK3dlYmtpdF9zZXR0aW5nc19zZXRfYWxsb3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9t
X2ZpbGVfdXJscwogCiA8U1VCU0VDVElPTiBTdGFuZGFyZD4KIFdlYktpdFNldHRpbmdzQ2xhc3MK
ZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0V2Vi
S2l0U2V0dGluZ3MuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rl
c3RXZWJLaXRTZXR0aW5ncy5jcHAKaW5kZXggYjNhMzc3MjcwZDUyMmU5YzM2NTIxNTlmYTU1YzYz
ZjIyMThmYzRlYS4uYTY3NjZmYWI0OWUzMGNhYWI0ZWY3YmEzZGFlODY0ZmIwNDVmYzM0ZSAxMDA2
NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3RXZWJLaXRT
ZXR0aW5ncy5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rl
c3RXZWJLaXRTZXR0aW5ncy5jcHAKQEAgLTI3OCw2ICsyNzgsMTEgQEAgc3RhdGljIHZvaWQgdGVz
dFdlYktpdFNldHRpbmdzKFRlc3QqLCBnY29uc3Rwb2ludGVyKQogICAgIHdlYmtpdF9zZXR0aW5n
c19zZXRfYWxsb3dfZmlsZV9hY2Nlc3NfZnJvbV9maWxlX3VybHMoc2V0dGluZ3MsIFRSVUUpOwog
ICAgIGdfYXNzZXJ0KHdlYmtpdF9zZXR0aW5nc19nZXRfYWxsb3dfZmlsZV9hY2Nlc3NfZnJvbV9m
aWxlX3VybHMoc2V0dGluZ3MpKTsKIAorICAgIC8vIFVuaXZlcnNhbCBhY2Nlc3MgZnJvbSBmaWxl
IFVSTHMgaXMgbm90IGFsbG93ZWQgYnkgZGVmYXVsdC4KKyAgICBnX2Fzc2VydCghd2Via2l0X3Nl
dHRpbmdzX2dldF9hbGxvd191bml2ZXJzYWxfYWNjZXNzX2Zyb21fZmlsZV91cmxzKHNldHRpbmdz
KSk7CisgICAgd2Via2l0X3NldHRpbmdzX3NldF9hbGxvd191bml2ZXJzYWxfYWNjZXNzX2Zyb21f
ZmlsZV91cmxzKHNldHRpbmdzLCBUUlVFKTsKKyAgICBnX2Fzc2VydCh3ZWJraXRfc2V0dGluZ3Nf
Z2V0X2FsbG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxlX3VybHMoc2V0dGluZ3MpKTsKKwog
ICAgIGdfb2JqZWN0X3VucmVmKEdfT0JKRUNUKHNldHRpbmdzKSk7CiB9CiAK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>276594</attachid>
            <date>2016-04-17 10:34:28 -0700</date>
            <delta_ts>2016-04-20 14:31:09 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-156651-20160417123444.patch</filename>
            <type>text/plain</type>
            <size>9624</size>
            <attacher name="Dustin Falgout">dustin</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5NjM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjM0MGUxZDFjYTFkMDA1
NDI4ZDI4YWUyOGZjZTA5M2ZjNjIxM2RkNi4uNjUzZTc0YTAyY2ViYWQzYzUzNjQ3MzkxOTAwMjcw
YzY1NGY4ZDk3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE2LTA0LTE3ICBEdXN0
aW4gRmFsZ291dCAgPGR1c3RpbkBmYWxnb3V0LnVzPgorCisgICAgICAgIFtHVEtdIEV4cG9zZSBB
bGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMcyBwcmVmZXJlbmNlIG5vdyB0aGF0IGNhbGxp
bmcgbG9jYWxTdG9yYWdlLmdldEl0ZW0oKSByZXN1bHRzIGluIFNlY3VyaXR5RXJyb3I6IERPTSBF
eGNlcHRpb24gMTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg
ICAgICBBcyBvZiByMTk3ODU4IEphdmFTY3JpcHQgbG9hZGVkIGluIHRoZSBjb250ZXh0IG9mIGEg
ZmlsZSBzY2hlbWUgdXJsIGNhbm5vdCBhY2Nlc3MgbG9jYWwgc3RvcmFnZS4gVGhhdCBpcyBhIG1h
am9yIAorICAgICAgICBicmVha2luZyBjaGFuZ2UgYXMgbWFueSBhcHBsaWNhdGlvbnMgdGhhdCBz
ZXJ2ZSBmaWxlcyBsb2NhbGx5IHJlbHkgb24gaGF2aW5nIGFjY2VzcyB0byBsb2NhbCBzdG9yYWdl
LiBUaGUgcG9pbnQgIAorICAgICAgICBvZiB0aGF0IHNlY3VyaXR5IGZpeCBpcyB0byBhdm9pZCBj
YXNlcyBvZiBkb3dubG9hZGVkIEhUTUwgY29udGVudCAoc3VjaCBhcyBlLW1haWwgYXR0YWNobWVu
dHMgb3IgSlMgaW5qZWN0ZWQKKyAgICAgICAgaW50byBsb2NhbCBjb250ZXh0cykgZnJvbSBoYXZp
bmcgYWNjZXNzIHRvIHlvdXIgbG9jYWwgZmlsZSBzeXN0ZW0gYW5kIGFyYml0cmFyeSBsb2NhbCBz
dG9yYWdlLiBJZiB5b3UgYXJlIHNlcnZpbmcgCisgICAgICAgIGxvY2FsIGZpbGVzIGluIHlvdXIg
YXBwbGljYXRpb25zLCB5b3UgY2FuIHVzZSB0aGUgV2ViS2l0QWxsb3dVbml2ZXJzYWxBY2Nlc3NG
cm9tRmlsZVVSTHMgcHJlZmVyZW5jZSBrZXkgdG8gdGVsbCAKKyAgICAgICAgV2Via2l0IHRoYXQg
eW91IGFyZSBhcHByb3ZlIG9mIHRoZXNlIGtpbmRzIG9mIGludGVyYWN0aW9ucy4KKworICAgICAg
ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU2NjUxCisgICAgICAg
IAorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFNldHRpbmdzLmNwcDoKKyAgICAg
ICAgKHdlYktpdFNldHRpbmdzU2V0UHJvcGVydHkpOgorICAgICAgICAod2ViS2l0U2V0dGluZ3NH
ZXRQcm9wZXJ0eSk6CisgICAgICAgICh3ZWJraXRfc2V0dGluZ3NfY2xhc3NfaW5pdCk6CisgICAg
ICAgICh3ZWJraXRfc2V0dGluZ3NfZ2V0X2FsbG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxl
X3VybHMpOgorICAgICAgICAod2Via2l0X3NldHRpbmdzX3NldF9hbGxvd191bml2ZXJzYWxfYWNj
ZXNzX2Zyb21fZmlsZV91cmxzKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRT
ZXR0aW5ncy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay00
LjAtc2VjdGlvbnMudHh0OgorCiAyMDE2LTA0LTE2ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBs
ZS5jb20+CiAKICAgICAgICAgW01hY10gV2ViIENvbnRlbnQgc2VydmljZSB3aXRoIGEgcmVzdHJp
Y3RlZCBlbnRpdGxlbWVudCBtYXkgbG9hZCBhcmJpdHJhcnkgZHlsaWJzCmRpZmYgLS1naXQgYS9T
b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRTZXR0aW5ncy5jcHAgYi9Tb3Vy
Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRTZXR0aW5ncy5jcHAKaW5kZXggNDA5
YWJjZGViOTBjYmQ3NWYyYjFmZDFjZTY3OGNhODE2YzE2ZGUzNi4uNjE2YjQ2MTU5OTNmM2Q4YzUy
YTE5NTFmZTAxNDVhMjMzMjMzYWJkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j
ZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGluZ3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv
Y2Vzcy9BUEkvZ3RrL1dlYktpdFNldHRpbmdzLmNwcApAQCAtMTQ0LDcgKzE0NCw4IEBAIGVudW0g
ewogICAgIFBST1BfRU5BQkxFX01FRElBX1NUUkVBTSwKICAgICBQUk9QX0VOQUJMRV9TUEFUSUFM
X05BVklHQVRJT04sCiAgICAgUFJPUF9FTkFCTEVfTUVESUFTT1VSQ0UsCi0gICAgUFJPUF9BTExP
V19GSUxFX0FDQ0VTU19GUk9NX0ZJTEVfVVJMUworICAgIFBST1BfQUxMT1dfRklMRV9BQ0NFU1Nf
RlJPTV9GSUxFX1VSTFMsCisgICAgUFJPUF9BTExPV19VTklWRVJTQUxfQUNDRVNTX0ZST01fRklM
RV9VUkxTCiB9OwogCiBzdGF0aWMgdm9pZCB3ZWJLaXRTZXR0aW5nc0NvbnN0cnVjdGVkKEdPYmpl
Y3QqIG9iamVjdCkKQEAgLTMxMyw2ICszMTQsOSBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRTZXR0aW5n
c1NldFByb3BlcnR5KEdPYmplY3QqIG9iamVjdCwgZ3VpbnQgcHJvcElkLCBjb25zdCBHVmFsdQog
ICAgIGNhc2UgUFJPUF9BTExPV19GSUxFX0FDQ0VTU19GUk9NX0ZJTEVfVVJMUzoKICAgICAgICAg
d2Via2l0X3NldHRpbmdzX3NldF9hbGxvd19maWxlX2FjY2Vzc19mcm9tX2ZpbGVfdXJscyhzZXR0
aW5ncywgZ192YWx1ZV9nZXRfYm9vbGVhbih2YWx1ZSkpOwogICAgICAgICBicmVhazsKKyAgICBj
YXNlIFBST1BfQUxMT1dfVU5JVkVSU0FMX0FDQ0VTU19GUk9NX0ZJTEVfVVJMUzoKKyAgICAgICAg
d2Via2l0X3NldHRpbmdzX3NldF9hbGxvd191bml2ZXJzYWxfYWNjZXNzX2Zyb21fZmlsZV91cmxz
KHNldHRpbmdzLCBnX3ZhbHVlX2dldF9ib29sZWFuKHZhbHVlKSk7CisgICAgICAgIGJyZWFrOwog
ICAgIGRlZmF1bHQ6CiAgICAgICAgIEdfT0JKRUNUX1dBUk5fSU5WQUxJRF9QUk9QRVJUWV9JRChv
YmplY3QsIHByb3BJZCwgcGFyYW1TcGVjKTsKICAgICAgICAgYnJlYWs7CkBAIC00NzEsNiArNDc1
LDkgQEAgc3RhdGljIHZvaWQgd2ViS2l0U2V0dGluZ3NHZXRQcm9wZXJ0eShHT2JqZWN0KiBvYmpl
Y3QsIGd1aW50IHByb3BJZCwgR1ZhbHVlKiB2YWwKICAgICBjYXNlIFBST1BfQUxMT1dfRklMRV9B
Q0NFU1NfRlJPTV9GSUxFX1VSTFM6CiAgICAgICAgIGdfdmFsdWVfc2V0X2Jvb2xlYW4odmFsdWUs
IHdlYmtpdF9zZXR0aW5nc19nZXRfYWxsb3dfZmlsZV9hY2Nlc3NfZnJvbV9maWxlX3VybHMoc2V0
dGluZ3MpKTsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBQUk9QX0FMTE9XX1VOSVZFUlNBTF9B
Q0NFU1NfRlJPTV9GSUxFX1VSTFM6CisgICAgICAgIGdfdmFsdWVfc2V0X2Jvb2xlYW4odmFsdWUs
IHdlYmtpdF9zZXR0aW5nc19nZXRfYWxsb3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJs
cyhzZXR0aW5ncykpOworICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBHX09C
SkVDVF9XQVJOX0lOVkFMSURfUFJPUEVSVFlfSUQob2JqZWN0LCBwcm9wSWQsIHBhcmFtU3BlYyk7
CiAgICAgICAgIGJyZWFrOwpAQCAtMTI0Miw2ICsxMjQ5LDI2IEBAIHN0YXRpYyB2b2lkIHdlYmtp
dF9zZXR0aW5nc19jbGFzc19pbml0KFdlYktpdFNldHRpbmdzQ2xhc3MqIGtsYXNzKQogICAgICAg
ICAgICAgXygiV2hldGhlciBmaWxlIGFjY2VzcyBpcyBhbGxvd2VkIGZyb20gZmlsZSBVUkxzLiIp
LAogICAgICAgICAgICAgRkFMU0UsCiAgICAgICAgICAgICByZWFkV3JpdGVDb25zdHJ1Y3RQYXJh
bUZsYWdzKSk7CisKKyAgICAvKioKKyAgICAgKiBXZWJLaXRTZXR0aW5nczphbGxvdy11bml2ZXJz
YWwtYWNjZXNzLWZyb20tZmlsZS11cmxzOgorICAgICAqCisgICAgICogV2hldGhlciBvciBub3Qg
SmF2YVNjcmlwdCBydW5uaW5nIGluIHRoZSBjb250ZXh0IG9mIGEgZmlsZSBzY2hlbWUgVVJMCisg
ICAgICogc2hvdWxkIGJlIGFsbG93ZWQgdG8gYWNjZXNzIGNvbnRlbnQgZnJvbSBhbnkgb3JpZ2lu
LiAgQnkgZGVmYXVsdCwgd2hlbgorICAgICAqIHNvbWV0aGluZyBpcyBsb2FkZWQgaW4gYSAjV2Vi
S2l0V2ViVmlldyB1c2luZyBhIGZpbGUgc2NoZW1lIFVSTCwKKyAgICAgKiBhY2Nlc3MgdG8gdGhl
IGxvY2FsIGZpbGUgc3lzdGVtIGFuZCBhcmJpdHJhcnkgbG9jYWwgc3RvcmFnZSBpcyBub3QKKyAg
ICAgKiBhbGxvd2VkLiBUaGlzIHNldHRpbmcgYWxsb3dzIHlvdSB0byBjaGFuZ2UgdGhhdCBiZWhh
dmlvdXIsIHNvIHRoYXQKKyAgICAgKiBpdCB3b3VsZCBiZSBwb3NzaWJsZSB0byB1c2UgbG9jYWwg
c3RvcmFnZSwgZm9yIGV4YW1wbGUuCisgICAgICoKKyAgICAgKiBTaW5jZTogMi4xMi4yCisgICAg
ICovCisgICAgZ19vYmplY3RfY2xhc3NfaW5zdGFsbF9wcm9wZXJ0eShnT2JqZWN0Q2xhc3MsCisg
ICAgICAgIFBST1BfQUxMT1dfVU5JVkVSU0FMX0FDQ0VTU19GUk9NX0ZJTEVfVVJMUywKKyAgICAg
ICAgZ19wYXJhbV9zcGVjX2Jvb2xlYW4oImFsbG93LXVuaXZlcnNhbC1hY2Nlc3MtZnJvbS1maWxl
LXVybHMiLAorICAgICAgICAgICAgXygiQWxsb3cgdW5pdmVyc2FsIGFjY2VzcyBmcm9tIHRoZSBj
b250ZXh0IG9mIGZpbGUgc2NoZW1lIFVSTHMiKSwKKyAgICAgICAgICAgIF8oIldoZXRoZXIgb3Ig
bm90IHVuaXZlcnNhbCBhY2Nlc3MgaXMgYWxsb3dlZCBmcm9tIHRoZSBjb250ZXh0IG9mIGZpbGUg
c2NoZW1lIFVSTHMiKSwKKyAgICAgICAgICAgIEZBTFNFLAorICAgICAgICAgICAgcmVhZFdyaXRl
Q29uc3RydWN0UGFyYW1GbGFncykpOwogfQogCiBXZWJQcmVmZXJlbmNlcyogd2Via2l0U2V0dGlu
Z3NHZXRQcmVmZXJlbmNlcyhXZWJLaXRTZXR0aW5ncyogc2V0dGluZ3MpCkBAIC0zMDYyLDMgKzMw
ODksNDEgQEAgdm9pZCB3ZWJraXRfc2V0dGluZ3Nfc2V0X2FsbG93X2ZpbGVfYWNjZXNzX2Zyb21f
ZmlsZV91cmxzKFdlYktpdFNldHRpbmdzKiBzZXR0aW4KICAgICBwcml2LT5wcmVmZXJlbmNlcy0+
c2V0QWxsb3dGaWxlQWNjZXNzRnJvbUZpbGVVUkxzKGFsbG93ZWQpOwogICAgIGdfb2JqZWN0X25v
dGlmeShHX09CSkVDVChzZXR0aW5ncyksICJhbGxvdy1maWxlLWFjY2Vzcy1mcm9tLWZpbGUtdXJs
cyIpOwogfQorCisvKioKKyAqIHdlYmtpdF9zZXR0aW5nc19nZXRfYWxsb3dfdW5pdmVyc2FsX2Fj
Y2Vzc19mcm9tX2ZpbGVfdXJsczoKKyAqIEBzZXR0aW5nczogYSAjV2ViS2l0U2V0dGluZ3MKKyAq
CisgKiBHZXQgdGhlICNXZWJLaXRTZXR0aW5nczphbGxvdy11bml2ZXJzYWwtYWNjZXNzLWZyb20t
ZmlsZS11cmxzIHByb3BlcnR5LgorICoKKyAqIFJldHVybnM6ICVUUlVFIElmIHVuaXZlcnNhbCBh
Y2Nlc3MgZnJvbSBmaWxlIFVSTHMgaXMgYWxsb3dlZCBvciAlRkFMU0Ugb3RoZXJ3aXNlLgorICoK
KyAqIFNpbmNlOiAyLjEyLjIKKyAqLworZ2Jvb2xlYW4gd2Via2l0X3NldHRpbmdzX2dldF9hbGxv
d191bml2ZXJzYWxfYWNjZXNzX2Zyb21fZmlsZV91cmxzKFdlYktpdFNldHRpbmdzKiBzZXR0aW5n
cykKK3sKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfU0VUVElOR1Moc2V0dGlu
Z3MpLCBGQUxTRSk7CisKKyAgICByZXR1cm4gc2V0dGluZ3MtPnByaXYtPnByZWZlcmVuY2VzLT5h
bGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMcygpOworfQorCisvKioKKyAqIHdlYmtpdF9z
ZXR0aW5nc19zZXRfYWxsb3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJsczoKKyAqIEBz
ZXR0aW5nczogYSAjV2ViS2l0U2V0dGluZ3MKKyAqIEBhbGxvd2VkOiBWYWx1ZSB0byBiZSBzZXQK
KyAqCisgKiBTZXQgdGhlICNXZWJLaXRTZXR0aW5nczphbGxvdy11bml2ZXJzYWwtYWNjZXNzLWZy
b20tZmlsZS11cmxzIHByb3BlcnR5LgorICoKKyAqIFNpbmNlOiAyLjEyLjIKKyAqLwordm9pZCB3
ZWJraXRfc2V0dGluZ3Nfc2V0X2FsbG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxlX3VybHMo
V2ViS2l0U2V0dGluZ3MqIHNldHRpbmdzLCBnYm9vbGVhbiBhbGxvd2VkKQoreworICAgIGdfcmV0
dXJuX2lmX2ZhaWwoV0VCS0lUX0lTX1NFVFRJTkdTKHNldHRpbmdzKSk7CisKKyAgICBXZWJLaXRT
ZXR0aW5nc1ByaXZhdGUqIHByaXYgPSBzZXR0aW5ncy0+cHJpdjsKKyAgICBpZiAocHJpdi0+cHJl
ZmVyZW5jZXMtPmFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzKCkgPT0gYWxsb3dlZCkK
KyAgICAgICAgcmV0dXJuOworCisgICAgcHJpdi0+cHJlZmVyZW5jZXMtPnNldEFsbG93VW5pdmVy
c2FsQWNjZXNzRnJvbUZpbGVVUkxzKGFsbG93ZWQpOworICAgIGdfb2JqZWN0X25vdGlmeShHX09C
SkVDVChzZXR0aW5ncyksICJhbGxvdy11bml2ZXJzYWwtYWNjZXNzLWZyb20tZmlsZS11cmxzIik7
Cit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRT
ZXR0aW5ncy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGlu
Z3MuaAppbmRleCBkOWVjNDgwMzQ1MGIxYWQxNDJlNDM5ODg3ZmVhYWNlNDU4YzRiNmFkLi5lNjQ3
M2YyYjYwN2JlNDIzYWNmYTc0MjcyMmE1ZGViMTI1ZDc2NDcxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv
V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRTZXR0aW5ncy5oCisrKyBiL1NvdXJjZS9X
ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFNldHRpbmdzLmgKQEAgLTQyMSw2ICs0MjEs
MTMgQEAgV0VCS0lUX0FQSSB2b2lkCiB3ZWJraXRfc2V0dGluZ3Nfc2V0X2FsbG93X2ZpbGVfYWNj
ZXNzX2Zyb21fZmlsZV91cmxzICAgICAgICAgICAoV2ViS2l0U2V0dGluZ3MgKnNldHRpbmdzLAog
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgIGdib29sZWFuICAgICAgICBhbGxvd2VkKTsKIAorV0VCS0lUX0FQSSBnYm9vbGVhbgor
d2Via2l0X3NldHRpbmdzX2dldF9hbGxvd191bml2ZXJzYWxfYWNjZXNzX2Zyb21fZmlsZV91cmxz
ICAgICAgKFdlYktpdFNldHRpbmdzICpzZXR0aW5ncyk7CisKK1dFQktJVF9BUEkgdm9pZAord2Vi
a2l0X3NldHRpbmdzX3NldF9hbGxvd191bml2ZXJzYWxfYWNjZXNzX2Zyb21fZmlsZV91cmxzICAg
ICAgKFdlYktpdFNldHRpbmdzICpzZXR0aW5ncywKKyAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnYm9vbGVhbiAgICAgICAgYWxs
b3dlZCk7CisKIEdfRU5EX0RFQ0xTCiAKICNlbmRpZiAvKiBXZWJLaXRTZXR0aW5nc19oICovCmRp
ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJn
dGstNC4wLXNlY3Rpb25zLnR4dCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL2Rv
Y3Mvd2Via2l0Mmd0ay00LjAtc2VjdGlvbnMudHh0CmluZGV4IDI0NWViNTQzZTk1ZjBkZmYyZDQ4
N2VlNGY5OTEwNTNkZGQyMGEwOTIuLjAwMmVmMzNhYTc5MmMyNWVhNjUzYjMxNjY0MTYyMmUzNDE4
NDBkZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mv
d2Via2l0Mmd0ay00LjAtc2VjdGlvbnMudHh0CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz
cy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay00LjAtc2VjdGlvbnMudHh0CkBAIC00NTMsNiArNDUz
LDggQEAgd2Via2l0X3NldHRpbmdzX2dldF9lbmFibGVfbWVkaWFzb3VyY2UKIHdlYmtpdF9zZXR0
aW5nc19zZXRfZW5hYmxlX21lZGlhc291cmNlCiB3ZWJraXRfc2V0dGluZ3NfZ2V0X2FsbG93X2Zp
bGVfYWNjZXNzX2Zyb21fZmlsZV91cmxzCiB3ZWJraXRfc2V0dGluZ3Nfc2V0X2FsbG93X2ZpbGVf
YWNjZXNzX2Zyb21fZmlsZV91cmxzCit3ZWJraXRfc2V0dGluZ3NfZ2V0X2FsbG93X3VuaXZlcnNh
bF9hY2Nlc3NfZnJvbV9maWxlX3VybHMKK3dlYmtpdF9zZXR0aW5nc19zZXRfYWxsb3dfdW5pdmVy
c2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJscwogCiA8U1VCU0VDVElPTiBTdGFuZGFyZD4KIFdlYktp
dFNldHRpbmdzQ2xhc3MKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5n
ZUxvZwppbmRleCAyYzg3NWUzNjAzZGJjNGVkNWUwZDYyN2UzODJmMzJmMjVlMzNkZGFjLi5hZmFl
YWIwNWVhNTM2Y2E0NTMyNGE2YWZhMWY5M2Y4ZTI4ZGYzYzhlIDEwMDY0NAotLS0gYS9Ub29scy9D
aGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTYtMDQt
MTcgIER1c3RpbiBGYWxnb3V0ICA8ZHVzdGluQGZhbGdvdXQudXM+CisKKyAgICAgICAgW0dUS10g
RXhwb3NlIEFsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzIHByZWZlcmVuY2Ugbm93IHRo
YXQgY2FsbGluZyBsb2NhbFN0b3JhZ2UuZ2V0SXRlbSgpIHJlc3VsdHMgaW4gU2VjdXJpdHlFcnJv
cjogRE9NIEV4Y2VwdGlvbiAxOAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93
X2J1Zy5jZ2k/aWQ9MTU2NjUxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku
CisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsvVGVzdFdlYktpdFNl
dHRpbmdzLmNwcDoKKyAgICAgICAgKHRlc3RXZWJLaXRTZXR0aW5ncyk6CisKIDIwMTYtMDQtMTYg
IFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBNb3JlIGJ1aWxkIGZpeGlu
Zy4KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0
V2ViS2l0U2V0dGluZ3MuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3Rr
L1Rlc3RXZWJLaXRTZXR0aW5ncy5jcHAKaW5kZXggYjNhMzc3MjcwZDUyMmU5YzM2NTIxNTlmYTU1
YzYzZjIyMThmYzRlYS4uYTY3NjZmYWI0OWUzMGNhYWI0ZWY3YmEzZGFlODY0ZmIwNDVmYzM0ZSAx
MDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3RXZWJL
aXRTZXR0aW5ncy5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3Rr
L1Rlc3RXZWJLaXRTZXR0aW5ncy5jcHAKQEAgLTI3OCw2ICsyNzgsMTEgQEAgc3RhdGljIHZvaWQg
dGVzdFdlYktpdFNldHRpbmdzKFRlc3QqLCBnY29uc3Rwb2ludGVyKQogICAgIHdlYmtpdF9zZXR0
aW5nc19zZXRfYWxsb3dfZmlsZV9hY2Nlc3NfZnJvbV9maWxlX3VybHMoc2V0dGluZ3MsIFRSVUUp
OwogICAgIGdfYXNzZXJ0KHdlYmtpdF9zZXR0aW5nc19nZXRfYWxsb3dfZmlsZV9hY2Nlc3NfZnJv
bV9maWxlX3VybHMoc2V0dGluZ3MpKTsKIAorICAgIC8vIFVuaXZlcnNhbCBhY2Nlc3MgZnJvbSBm
aWxlIFVSTHMgaXMgbm90IGFsbG93ZWQgYnkgZGVmYXVsdC4KKyAgICBnX2Fzc2VydCghd2Via2l0
X3NldHRpbmdzX2dldF9hbGxvd191bml2ZXJzYWxfYWNjZXNzX2Zyb21fZmlsZV91cmxzKHNldHRp
bmdzKSk7CisgICAgd2Via2l0X3NldHRpbmdzX3NldF9hbGxvd191bml2ZXJzYWxfYWNjZXNzX2Zy
b21fZmlsZV91cmxzKHNldHRpbmdzLCBUUlVFKTsKKyAgICBnX2Fzc2VydCh3ZWJraXRfc2V0dGlu
Z3NfZ2V0X2FsbG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxlX3VybHMoc2V0dGluZ3MpKTsK
KwogICAgIGdfb2JqZWN0X3VucmVmKEdfT0JKRUNUKHNldHRpbmdzKSk7CiB9CiAK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>276852</attachid>
            <date>2016-04-20 14:31:17 -0700</date>
            <delta_ts>2016-04-20 15:56:23 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-156651-20160420163138.patch</filename>
            <type>text/plain</type>
            <size>9680</size>
            <attacher name="Dustin Falgout">dustin</attacher>
            
              <data encoding="base64">U3VidmVyc2lvbiBSZXZpc2lvbjogMTk5NjM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D
aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMjM0MGUxZDFjYTFkMDA1
NDI4ZDI4YWUyOGZjZTA5M2ZjNjIxM2RkNi4uMGVkYWViZWI5ZTU4YmRjNjE5YTMxZmJlY2Y2ZDRl
MWRkNzUzMGUyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv
dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE2LTA0LTIwICBEdXN0
aW4gRmFsZ291dCAgPGR1c3RpbkBmYWxnb3V0LnVzPgorCisgICAgICAgIFtHVEtdIEV4cG9zZSBB
bGxvd1VuaXZlcnNhbEFjY2Vzc0Zyb21GaWxlVVJMcyBwcmVmZXJlbmNlIG5vdyB0aGF0IGNhbGxp
bmcgbG9jYWxTdG9yYWdlLmdldEl0ZW0oKSByZXN1bHRzIGluIFNlY3VyaXR5RXJyb3I6IERPTSBF
eGNlcHRpb24gMTgKKyAgICAgICAgCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp
LgorICAgICAgICAgICAgICAgIAorICAgICAgICBBcyBvZiByMTk3ODU4IEphdmFTY3JpcHQgbG9h
ZGVkIGluIHRoZSBjb250ZXh0IG9mIGEgZmlsZSBzY2hlbWUgdXJsIGNhbm5vdCBhY2Nlc3MgbG9j
YWwgc3RvcmFnZS4gVGhhdCBpcyBhIG1ham9yIAorICAgICAgICBicmVha2luZyBjaGFuZ2UgYXMg
bWFueSBhcHBsaWNhdGlvbnMgdGhhdCBzZXJ2ZSBmaWxlcyBsb2NhbGx5IHJlbHkgb24gaGF2aW5n
IGFjY2VzcyB0byBsb2NhbCBzdG9yYWdlLiBUaGUgcG9pbnQgIAorICAgICAgICBvZiB0aGF0IHNl
Y3VyaXR5IGZpeCBpcyB0byBhdm9pZCBjYXNlcyBvZiBkb3dubG9hZGVkIEhUTUwgY29udGVudCAo
c3VjaCBhcyBlLW1haWwgYXR0YWNobWVudHMgb3IgSlMgaW5qZWN0ZWQKKyAgICAgICAgaW50byBs
b2NhbCBjb250ZXh0cykgZnJvbSBoYXZpbmcgYWNjZXNzIHRvIHlvdXIgbG9jYWwgZmlsZSBzeXN0
ZW0gYW5kIGFyYml0cmFyeSBsb2NhbCBzdG9yYWdlLiBJZiB5b3UgYXJlIHNlcnZpbmcgCisgICAg
ICAgIGxvY2FsIGZpbGVzIGluIHlvdXIgYXBwbGljYXRpb25zLCB5b3UgY2FuIHVzZSB0aGUgV2Vi
S2l0QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMgcHJlZmVyZW5jZSBrZXkgdG8gdGVs
bCAKKyAgICAgICAgV2Via2l0IHRoYXQgeW91IGFyZSBhcHByb3ZlIG9mIHRoZXNlIGtpbmRzIG9m
IGludGVyYWN0aW9ucy4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1
NjY1MQorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGluZ3MuY3BwOgor
ICAgICAgICAod2ViS2l0U2V0dGluZ3NTZXRQcm9wZXJ0eSk6CisgICAgICAgICh3ZWJLaXRTZXR0
aW5nc0dldFByb3BlcnR5KToKKyAgICAgICAgKHdlYmtpdF9zZXR0aW5nc19jbGFzc19pbml0KToK
KyAgICAgICAgKHdlYmtpdF9zZXR0aW5nc19nZXRfYWxsb3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9t
X2ZpbGVfdXJscyk6CisgICAgICAgICh3ZWJraXRfc2V0dGluZ3Nfc2V0X2FsbG93X3VuaXZlcnNh
bF9hY2Nlc3NfZnJvbV9maWxlX3VybHMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dl
YktpdFNldHRpbmdzLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvZG9jcy93ZWJraXQy
Z3RrLTQuMC1zZWN0aW9ucy50eHQ6CisKIDIwMTYtMDQtMTYgIERhbiBCZXJuc3RlaW4gIDxtaXR6
QGFwcGxlLmNvbT4KIAogICAgICAgICBbTWFjXSBXZWIgQ29udGVudCBzZXJ2aWNlIHdpdGggYSBy
ZXN0cmljdGVkIGVudGl0bGVtZW50IG1heSBsb2FkIGFyYml0cmFyeSBkeWxpYnMKZGlmZiAtLWdp
dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFNldHRpbmdzLmNwcCBi
L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFNldHRpbmdzLmNwcAppbmRl
eCA0MDlhYmNkZWI5MGNiZDc1ZjJiMWZkMWNlNjc4Y2E4MTZjMTZkZTM2Li5iMjkwYTY1OTYwN2M2
ZmQ2MDAwZjAzYzgwZTZkZDc3MGZlOGZkOGZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V
SVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRTZXR0aW5ncy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv
VUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGluZ3MuY3BwCkBAIC0xNDQsNyArMTQ0LDggQEAg
ZW51bSB7CiAgICAgUFJPUF9FTkFCTEVfTUVESUFfU1RSRUFNLAogICAgIFBST1BfRU5BQkxFX1NQ
QVRJQUxfTkFWSUdBVElPTiwKICAgICBQUk9QX0VOQUJMRV9NRURJQVNPVVJDRSwKLSAgICBQUk9Q
X0FMTE9XX0ZJTEVfQUNDRVNTX0ZST01fRklMRV9VUkxTCisgICAgUFJPUF9BTExPV19GSUxFX0FD
Q0VTU19GUk9NX0ZJTEVfVVJMUywKKyAgICBQUk9QX0FMTE9XX1VOSVZFUlNBTF9BQ0NFU1NfRlJP
TV9GSUxFX1VSTFMKIH07CiAKIHN0YXRpYyB2b2lkIHdlYktpdFNldHRpbmdzQ29uc3RydWN0ZWQo
R09iamVjdCogb2JqZWN0KQpAQCAtMzEzLDYgKzMxNCw5IEBAIHN0YXRpYyB2b2lkIHdlYktpdFNl
dHRpbmdzU2V0UHJvcGVydHkoR09iamVjdCogb2JqZWN0LCBndWludCBwcm9wSWQsIGNvbnN0IEdW
YWx1CiAgICAgY2FzZSBQUk9QX0FMTE9XX0ZJTEVfQUNDRVNTX0ZST01fRklMRV9VUkxTOgogICAg
ICAgICB3ZWJraXRfc2V0dGluZ3Nfc2V0X2FsbG93X2ZpbGVfYWNjZXNzX2Zyb21fZmlsZV91cmxz
KHNldHRpbmdzLCBnX3ZhbHVlX2dldF9ib29sZWFuKHZhbHVlKSk7CiAgICAgICAgIGJyZWFrOwor
ICAgIGNhc2UgUFJPUF9BTExPV19VTklWRVJTQUxfQUNDRVNTX0ZST01fRklMRV9VUkxTOgorICAg
ICAgICB3ZWJraXRfc2V0dGluZ3Nfc2V0X2FsbG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxl
X3VybHMoc2V0dGluZ3MsIGdfdmFsdWVfZ2V0X2Jvb2xlYW4odmFsdWUpKTsKKyAgICAgICAgYnJl
YWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgR19PQkpFQ1RfV0FSTl9JTlZBTElEX1BST1BFUlRZ
X0lEKG9iamVjdCwgcHJvcElkLCBwYXJhbVNwZWMpOwogICAgICAgICBicmVhazsKQEAgLTQ3MSw2
ICs0NzUsOSBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRTZXR0aW5nc0dldFByb3BlcnR5KEdPYmplY3Qq
IG9iamVjdCwgZ3VpbnQgcHJvcElkLCBHVmFsdWUqIHZhbAogICAgIGNhc2UgUFJPUF9BTExPV19G
SUxFX0FDQ0VTU19GUk9NX0ZJTEVfVVJMUzoKICAgICAgICAgZ192YWx1ZV9zZXRfYm9vbGVhbih2
YWx1ZSwgd2Via2l0X3NldHRpbmdzX2dldF9hbGxvd19maWxlX2FjY2Vzc19mcm9tX2ZpbGVfdXJs
cyhzZXR0aW5ncykpOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIFBST1BfQUxMT1dfVU5JVkVS
U0FMX0FDQ0VTU19GUk9NX0ZJTEVfVVJMUzoKKyAgICAgICAgZ192YWx1ZV9zZXRfYm9vbGVhbih2
YWx1ZSwgd2Via2l0X3NldHRpbmdzX2dldF9hbGxvd191bml2ZXJzYWxfYWNjZXNzX2Zyb21fZmls
ZV91cmxzKHNldHRpbmdzKSk7CisgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAg
IEdfT0JKRUNUX1dBUk5fSU5WQUxJRF9QUk9QRVJUWV9JRChvYmplY3QsIHByb3BJZCwgcGFyYW1T
cGVjKTsKICAgICAgICAgYnJlYWs7CkBAIC0xMjQyLDYgKzEyNDksMjYgQEAgc3RhdGljIHZvaWQg
d2Via2l0X3NldHRpbmdzX2NsYXNzX2luaXQoV2ViS2l0U2V0dGluZ3NDbGFzcyoga2xhc3MpCiAg
ICAgICAgICAgICBfKCJXaGV0aGVyIGZpbGUgYWNjZXNzIGlzIGFsbG93ZWQgZnJvbSBmaWxlIFVS
THMuIiksCiAgICAgICAgICAgICBGQUxTRSwKICAgICAgICAgICAgIHJlYWRXcml0ZUNvbnN0cnVj
dFBhcmFtRmxhZ3MpKTsKKworICAgIC8qKgorICAgICAqIFdlYktpdFNldHRpbmdzOmFsbG93LXVu
aXZlcnNhbC1hY2Nlc3MtZnJvbS1maWxlLXVybHM6CisgICAgICoKKyAgICAgKiBXaGV0aGVyIG9y
IG5vdCBKYXZhU2NyaXB0IHJ1bm5pbmcgaW4gdGhlIGNvbnRleHQgb2YgYSBmaWxlIHNjaGVtZSBV
UkwKKyAgICAgKiBzaG91bGQgYmUgYWxsb3dlZCB0byBhY2Nlc3MgY29udGVudCBmcm9tIGFueSBv
cmlnaW4uICBCeSBkZWZhdWx0LCB3aGVuCisgICAgICogc29tZXRoaW5nIGlzIGxvYWRlZCBpbiBh
ICNXZWJLaXRXZWJWaWV3IHVzaW5nIGEgZmlsZSBzY2hlbWUgVVJMLAorICAgICAqIGFjY2VzcyB0
byB0aGUgbG9jYWwgZmlsZSBzeXN0ZW0gYW5kIGFyYml0cmFyeSBsb2NhbCBzdG9yYWdlIGlzIG5v
dAorICAgICAqIGFsbG93ZWQuIFRoaXMgc2V0dGluZyBhbGxvd3MgeW91IHRvIGNoYW5nZSB0aGF0
IGJlaGF2aW91ciwgc28gdGhhdAorICAgICAqIGl0IHdvdWxkIGJlIHBvc3NpYmxlIHRvIHVzZSBs
b2NhbCBzdG9yYWdlLCBmb3IgZXhhbXBsZS4KKyAgICAgKgorICAgICAqIFNpbmNlOiAyLjE0Cisg
ICAgICovCisgICAgZ19vYmplY3RfY2xhc3NfaW5zdGFsbF9wcm9wZXJ0eShnT2JqZWN0Q2xhc3Ms
CisgICAgICAgIFBST1BfQUxMT1dfVU5JVkVSU0FMX0FDQ0VTU19GUk9NX0ZJTEVfVVJMUywKKyAg
ICAgICAgZ19wYXJhbV9zcGVjX2Jvb2xlYW4oImFsbG93LXVuaXZlcnNhbC1hY2Nlc3MtZnJvbS1m
aWxlLXVybHMiLAorICAgICAgICAgICAgXygiQWxsb3cgdW5pdmVyc2FsIGFjY2VzcyBmcm9tIHRo
ZSBjb250ZXh0IG9mIGZpbGUgc2NoZW1lIFVSTHMiKSwKKyAgICAgICAgICAgIF8oIldoZXRoZXIg
b3Igbm90IHVuaXZlcnNhbCBhY2Nlc3MgaXMgYWxsb3dlZCBmcm9tIHRoZSBjb250ZXh0IG9mIGZp
bGUgc2NoZW1lIFVSTHMiKSwKKyAgICAgICAgICAgIEZBTFNFLAorICAgICAgICAgICAgcmVhZFdy
aXRlQ29uc3RydWN0UGFyYW1GbGFncykpOwogfQogCiBXZWJQcmVmZXJlbmNlcyogd2Via2l0U2V0
dGluZ3NHZXRQcmVmZXJlbmNlcyhXZWJLaXRTZXR0aW5ncyogc2V0dGluZ3MpCkBAIC0zMDYyLDMg
KzMwODksNDEgQEAgdm9pZCB3ZWJraXRfc2V0dGluZ3Nfc2V0X2FsbG93X2ZpbGVfYWNjZXNzX2Zy
b21fZmlsZV91cmxzKFdlYktpdFNldHRpbmdzKiBzZXR0aW4KICAgICBwcml2LT5wcmVmZXJlbmNl
cy0+c2V0QWxsb3dGaWxlQWNjZXNzRnJvbUZpbGVVUkxzKGFsbG93ZWQpOwogICAgIGdfb2JqZWN0
X25vdGlmeShHX09CSkVDVChzZXR0aW5ncyksICJhbGxvdy1maWxlLWFjY2Vzcy1mcm9tLWZpbGUt
dXJscyIpOwogfQorCisvKioKKyAqIHdlYmtpdF9zZXR0aW5nc19nZXRfYWxsb3dfdW5pdmVyc2Fs
X2FjY2Vzc19mcm9tX2ZpbGVfdXJsczoKKyAqIEBzZXR0aW5nczogYSAjV2ViS2l0U2V0dGluZ3MK
KyAqCisgKiBHZXQgdGhlICNXZWJLaXRTZXR0aW5nczphbGxvdy11bml2ZXJzYWwtYWNjZXNzLWZy
b20tZmlsZS11cmxzIHByb3BlcnR5LgorICoKKyAqIFJldHVybnM6ICVUUlVFIElmIHVuaXZlcnNh
bCBhY2Nlc3MgZnJvbSBmaWxlIFVSTHMgaXMgYWxsb3dlZCBvciAlRkFMU0Ugb3RoZXJ3aXNlLgor
ICoKKyAqIFNpbmNlOiAyLjE0CisgKi8KK2dib29sZWFuIHdlYmtpdF9zZXR0aW5nc19nZXRfYWxs
b3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJscyhXZWJLaXRTZXR0aW5ncyogc2V0dGlu
Z3MpCit7CisgICAgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoV0VCS0lUX0lTX1NFVFRJTkdTKHNldHRp
bmdzKSwgRkFMU0UpOworCisgICAgcmV0dXJuIHNldHRpbmdzLT5wcml2LT5wcmVmZXJlbmNlcy0+
YWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMoKTsKK30KKworLyoqCisgKiB3ZWJraXRf
c2V0dGluZ3Nfc2V0X2FsbG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxlX3VybHM6CisgKiBA
c2V0dGluZ3M6IGEgI1dlYktpdFNldHRpbmdzCisgKiBAYWxsb3dlZDogVmFsdWUgdG8gYmUgc2V0
CisgKgorICogU2V0IHRoZSAjV2ViS2l0U2V0dGluZ3M6YWxsb3ctdW5pdmVyc2FsLWFjY2Vzcy1m
cm9tLWZpbGUtdXJscyBwcm9wZXJ0eS4KKyAqCisgKiBTaW5jZTogMi4xNAorICovCit2b2lkIHdl
YmtpdF9zZXR0aW5nc19zZXRfYWxsb3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJscyhX
ZWJLaXRTZXR0aW5ncyogc2V0dGluZ3MsIGdib29sZWFuIGFsbG93ZWQpCit7CisgICAgZ19yZXR1
cm5faWZfZmFpbChXRUJLSVRfSVNfU0VUVElOR1Moc2V0dGluZ3MpKTsKKworICAgIFdlYktpdFNl
dHRpbmdzUHJpdmF0ZSogcHJpdiA9IHNldHRpbmdzLT5wcml2OworICAgIGlmIChwcml2LT5wcmVm
ZXJlbmNlcy0+YWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMoKSA9PSBhbGxvd2VkKQor
ICAgICAgICByZXR1cm47CisKKyAgICBwcml2LT5wcmVmZXJlbmNlcy0+c2V0QWxsb3dVbml2ZXJz
YWxBY2Nlc3NGcm9tRmlsZVVSTHMoYWxsb3dlZCk7CisgICAgZ19vYmplY3Rfbm90aWZ5KEdfT0JK
RUNUKHNldHRpbmdzKSwgImFsbG93LXVuaXZlcnNhbC1hY2Nlc3MtZnJvbS1maWxlLXVybHMiKTsK
K30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFNl
dHRpbmdzLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRTZXR0aW5n
cy5oCmluZGV4IGQ5ZWM0ODAzNDUwYjFhZDE0MmU0Mzk4ODdmZWFhY2U0NThjNGI2YWQuLmU2NDcz
ZjJiNjA3YmU0MjNhY2ZhNzQyNzIyYTVkZWIxMjVkNzY0NzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X
ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFNldHRpbmdzLmgKKysrIGIvU291cmNlL1dl
YktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0U2V0dGluZ3MuaApAQCAtNDIxLDYgKzQyMSwx
MyBAQCBXRUJLSVRfQVBJIHZvaWQKIHdlYmtpdF9zZXR0aW5nc19zZXRfYWxsb3dfZmlsZV9hY2Nl
c3NfZnJvbV9maWxlX3VybHMgICAgICAgICAgIChXZWJLaXRTZXR0aW5ncyAqc2V0dGluZ3MsCiAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgZ2Jvb2xlYW4gICAgICAgIGFsbG93ZWQpOwogCitXRUJLSVRfQVBJIGdib29sZWFuCit3
ZWJraXRfc2V0dGluZ3NfZ2V0X2FsbG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxlX3VybHMg
ICAgICAoV2ViS2l0U2V0dGluZ3MgKnNldHRpbmdzKTsKKworV0VCS0lUX0FQSSB2b2lkCit3ZWJr
aXRfc2V0dGluZ3Nfc2V0X2FsbG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxlX3VybHMgICAg
ICAoV2ViS2l0U2V0dGluZ3MgKnNldHRpbmdzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdib29sZWFuICAgICAgICBhbGxv
d2VkKTsKKwogR19FTkRfREVDTFMKIAogI2VuZGlmIC8qIFdlYktpdFNldHRpbmdzX2ggKi8KZGlm
ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0
ay00LjAtc2VjdGlvbnMudHh0IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvZG9j
cy93ZWJraXQyZ3RrLTQuMC1zZWN0aW9ucy50eHQKaW5kZXggMjQ1ZWI1NDNlOTVmMGRmZjJkNDg3
ZWU0Zjk5MTA1M2RkZDIwYTA5Mi4uMDAyZWYzM2FhNzkyYzI1ZWE2NTNiMzE2NjQxNjIyZTM0MTg0
MGRkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvZG9jcy93
ZWJraXQyZ3RrLTQuMC1zZWN0aW9ucy50eHQKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz
L0FQSS9ndGsvZG9jcy93ZWJraXQyZ3RrLTQuMC1zZWN0aW9ucy50eHQKQEAgLTQ1Myw2ICs0NTMs
OCBAQCB3ZWJraXRfc2V0dGluZ3NfZ2V0X2VuYWJsZV9tZWRpYXNvdXJjZQogd2Via2l0X3NldHRp
bmdzX3NldF9lbmFibGVfbWVkaWFzb3VyY2UKIHdlYmtpdF9zZXR0aW5nc19nZXRfYWxsb3dfZmls
ZV9hY2Nlc3NfZnJvbV9maWxlX3VybHMKIHdlYmtpdF9zZXR0aW5nc19zZXRfYWxsb3dfZmlsZV9h
Y2Nlc3NfZnJvbV9maWxlX3VybHMKK3dlYmtpdF9zZXR0aW5nc19nZXRfYWxsb3dfdW5pdmVyc2Fs
X2FjY2Vzc19mcm9tX2ZpbGVfdXJscword2Via2l0X3NldHRpbmdzX3NldF9hbGxvd191bml2ZXJz
YWxfYWNjZXNzX2Zyb21fZmlsZV91cmxzCiAKIDxTVUJTRUNUSU9OIFN0YW5kYXJkPgogV2ViS2l0
U2V0dGluZ3NDbGFzcwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdl
TG9nCmluZGV4IDJjODc1ZTM2MDNkYmM0ZWQ1ZTBkNjI3ZTM4MmYzMmYyNWUzM2RkYWMuLjNhZTM0
NjZlMTg5NDE4OWE2YjNkNmEzY2NlYjdhMjNjY2ZhOTM4YTAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0No
YW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxNi0wNC0y
MCAgRHVzdGluIEZhbGdvdXQgIDxkdXN0aW5AZmFsZ291dC51cz4KKworICAgICAgICBbR1RLXSBF
eHBvc2UgQWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMgcHJlZmVyZW5jZSBub3cgdGhh
dCBjYWxsaW5nIGxvY2FsU3RvcmFnZS5nZXRJdGVtKCkgcmVzdWx0cyBpbiBTZWN1cml0eUVycm9y
OiBET00gRXhjZXB0aW9uIDE4CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df
YnVnLmNnaT9pZD0xNTY2NTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0V2ViS2l0U2V0
dGluZ3MuY3BwOgorICAgICAgICAodGVzdFdlYktpdFNldHRpbmdzKToKKwogMjAxNi0wNC0xNiAg
U2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIE1vcmUgYnVpbGQgZml4aW5n
LgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3RX
ZWJLaXRTZXR0aW5ncy5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsv
VGVzdFdlYktpdFNldHRpbmdzLmNwcAppbmRleCBiM2EzNzcyNzBkNTIyZTljMzY1MjE1OWZhNTVj
NjNmMjIxOGZjNGVhLi5hNjc2NmZhYjQ5ZTMwY2FhYjRlZjdiYTNkYWU4NjRmYjA0NWZjMzRlIDEw
MDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsvVGVzdFdlYktp
dFNldHRpbmdzLmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsv
VGVzdFdlYktpdFNldHRpbmdzLmNwcApAQCAtMjc4LDYgKzI3OCwxMSBAQCBzdGF0aWMgdm9pZCB0
ZXN0V2ViS2l0U2V0dGluZ3MoVGVzdCosIGdjb25zdHBvaW50ZXIpCiAgICAgd2Via2l0X3NldHRp
bmdzX3NldF9hbGxvd19maWxlX2FjY2Vzc19mcm9tX2ZpbGVfdXJscyhzZXR0aW5ncywgVFJVRSk7
CiAgICAgZ19hc3NlcnQod2Via2l0X3NldHRpbmdzX2dldF9hbGxvd19maWxlX2FjY2Vzc19mcm9t
X2ZpbGVfdXJscyhzZXR0aW5ncykpOwogCisgICAgLy8gVW5pdmVyc2FsIGFjY2VzcyBmcm9tIGZp
bGUgVVJMcyBpcyBub3QgYWxsb3dlZCBieSBkZWZhdWx0LgorICAgIGdfYXNzZXJ0KCF3ZWJraXRf
c2V0dGluZ3NfZ2V0X2FsbG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJvbV9maWxlX3VybHMoc2V0dGlu
Z3MpKTsKKyAgICB3ZWJraXRfc2V0dGluZ3Nfc2V0X2FsbG93X3VuaXZlcnNhbF9hY2Nlc3NfZnJv
bV9maWxlX3VybHMoc2V0dGluZ3MsIFRSVUUpOworICAgIGdfYXNzZXJ0KHdlYmtpdF9zZXR0aW5n
c19nZXRfYWxsb3dfdW5pdmVyc2FsX2FjY2Vzc19mcm9tX2ZpbGVfdXJscyhzZXR0aW5ncykpOwor
CiAgICAgZ19vYmplY3RfdW5yZWYoR19PQkpFQ1Qoc2V0dGluZ3MpKTsKIH0KIAo=
</data>

          </attachment>
      

    </bug>

</bugzilla>