<?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>182553</bug_id>
          
          <creation_ts>2018-02-06 15:39:09 -0800</creation_ts>
          <short_desc>Assert that NSApp is not running in the WebProcess.</short_desc>
          <delta_ts>2018-02-09 14:13:07 -0800</delta_ts>
          <reporter_accessible>1</reporter_accessible>
          <cclist_accessible>1</cclist_accessible>
          <classification_id>1</classification_id>
          <classification>Unclassified</classification>
          <product>WebKit</product>
          <component>WebKit Misc.</component>
          <version>WebKit Nightly Build</version>
          <rep_platform>Unspecified</rep_platform>
          <op_sys>Unspecified</op_sys>
          <bug_status>RESOLVED</bug_status>
          <resolution>FIXED</resolution>
          
          
          <bug_file_loc></bug_file_loc>
          <status_whiteboard></status_whiteboard>
          <keywords>InRadar</keywords>
          <priority>P2</priority>
          <bug_severity>Normal</bug_severity>
          <target_milestone>---</target_milestone>
          
          
          <everconfirmed>1</everconfirmed>
          <reporter name="Per Arne Vollan">pvollan</reporter>
          <assigned_to name="Per Arne Vollan">pvollan</assigned_to>
          <cc>ap</cc>
    
    <cc>bfulgham</cc>
    
    <cc>commit-queue</cc>
    
    <cc>ryanhaddad</cc>
    
    <cc>simon.fraser</cc>
    
    <cc>webkit-bug-importer</cc>
    
    <cc>wenson_hsieh</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1396983</commentid>
    <comment_count>0</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2018-02-06 15:39:09 -0800</bug_when>
    <thetext>There are multiple places where NSApp is used in WebCore. Since we have switched to using NSRunLoop instead of the NSApplication run loop for the WebContent process, we should assert that NSApp is not used in the WebContent process.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1396985</commentid>
    <comment_count>1</comment_count>
      <attachid>333231</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2018-02-06 15:41:28 -0800</bug_when>
    <thetext>Created attachment 333231
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1397045</commentid>
    <comment_count>2</comment_count>
      <attachid>333252</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2018-02-06 18:48:08 -0800</bug_when>
    <thetext>Created attachment 333252
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1397053</commentid>
    <comment_count>3</comment_count>
      <attachid>333253</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2018-02-06 19:10:18 -0800</bug_when>
    <thetext>Created attachment 333253
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1397192</commentid>
    <comment_count>4</comment_count>
      <attachid>333290</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2018-02-07 09:06:56 -0800</bug_when>
    <thetext>Created attachment 333290
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1397203</commentid>
    <comment_count>5</comment_count>
    <who name="Radar WebKit Bug Importer">webkit-bug-importer</who>
    <bug_when>2018-02-07 09:30:04 -0800</bug_when>
    <thetext>&lt;rdar://problem/37316144&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1397206</commentid>
    <comment_count>6</comment_count>
      <attachid>333295</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2018-02-07 09:31:56 -0800</bug_when>
    <thetext>Created attachment 333295
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1397227</commentid>
    <comment_count>7</comment_count>
      <attachid>333295</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2018-02-07 10:30:44 -0800</bug_when>
    <thetext>Comment on attachment 333295
Patch

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

&gt; Source/WebCore/ChangeLog:14
&gt; +        In WebCore, there are a few places where NSApp is referenced. Since the WebContent process
&gt; +        is no longer using the NSApplication run loop, and NSApp is no longer guaranteed to be
&gt; +        valid, we should make sure that the NSApp is not referenced by the WebContent process or
&gt; +        the Network process, by asserting that the NSApplication event loop is running when NSApp
&gt; +        is referenced. It is still ok for the UIProcess to reference NSApp. Adding these assert
&gt; +        will help catch references to NSApp when the NSApplication run loop is not used.

It&apos;s not clear to me that all these places are code that never runs in the WebProcess. Is that true? Are these using NSApp because they are for WK1?</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1397251</commentid>
    <comment_count>8</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2018-02-07 11:32:13 -0800</bug_when>
    <thetext>(In reply to Simon Fraser (smfr) from comment #7)
&gt; Comment on attachment 333295 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=333295&amp;action=review
&gt; 
&gt; &gt; Source/WebCore/ChangeLog:14
&gt; &gt; +        In WebCore, there are a few places where NSApp is referenced. Since the WebContent process
&gt; &gt; +        is no longer using the NSApplication run loop, and NSApp is no longer guaranteed to be
&gt; &gt; +        valid, we should make sure that the NSApp is not referenced by the WebContent process or
&gt; &gt; +        the Network process, by asserting that the NSApplication event loop is running when NSApp
&gt; &gt; +        is referenced. It is still ok for the UIProcess to reference NSApp. Adding these assert
&gt; &gt; +        will help catch references to NSApp when the NSApplication run loop is not used.
&gt; 
&gt; It&apos;s not clear to me that all these places are code that never runs in the
&gt; WebProcess. Is that true? Are these using NSApp because they are for WK1?

Yes, I believe these are for WK1.

EventHandlerMac.mm:
* lastEventIsMouseUp() is only called by WK1, early return in EventHandler::passMouseDownEventToWidget for WK2.
* sendFakeEventsAfterWidgetTracking() is only called by PoupMenuMac.mm in WK1.

WebVideoFullscreenController.mm:
* only used by WebView.mm in WK1.

WebWindowAnimation.mm:
* only used by WebVideoFullscreenController.mm (previous comment).

PasteboardMac.mm:
* I am not quite sure about this one. I will need to dig further.

Thanks for reviewing, Simon!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1397263</commentid>
    <comment_count>9</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2018-02-07 12:09:24 -0800</bug_when>
    <thetext>(In reply to Per Arne Vollan from comment #8)
&gt; (In reply to Simon Fraser (smfr) from comment #7)
&gt; &gt; Comment on attachment 333295 [details]
&gt; &gt; Patch
&gt; &gt; 
&gt; &gt; View in context:
&gt; &gt; https://bugs.webkit.org/attachment.cgi?id=333295&amp;action=review
&gt; &gt; 
&gt; &gt; &gt; Source/WebCore/ChangeLog:14
&gt; &gt; &gt; +        In WebCore, there are a few places where NSApp is referenced. Since the WebContent process
&gt; &gt; &gt; +        is no longer using the NSApplication run loop, and NSApp is no longer guaranteed to be
&gt; &gt; &gt; +        valid, we should make sure that the NSApp is not referenced by the WebContent process or
&gt; &gt; &gt; +        the Network process, by asserting that the NSApplication event loop is running when NSApp
&gt; &gt; &gt; +        is referenced. It is still ok for the UIProcess to reference NSApp. Adding these assert
&gt; &gt; &gt; +        will help catch references to NSApp when the NSApplication run loop is not used.
&gt; &gt; 
&gt; &gt; It&apos;s not clear to me that all these places are code that never runs in the
&gt; &gt; WebProcess. Is that true? Are these using NSApp because they are for WK1?
&gt; 
&gt; Yes, I believe these are for WK1.
&gt; 
&gt; EventHandlerMac.mm:
&gt; * lastEventIsMouseUp() is only called by WK1, early return in
&gt; EventHandler::passMouseDownEventToWidget for WK2.
&gt; * sendFakeEventsAfterWidgetTracking() is only called by PoupMenuMac.mm in
&gt; WK1.
&gt; 
&gt; WebVideoFullscreenController.mm:
&gt; * only used by WebView.mm in WK1.
&gt; 
&gt; WebWindowAnimation.mm:
&gt; * only used by WebVideoFullscreenController.mm (previous comment).
&gt; 
&gt; PasteboardMac.mm:
&gt; * I am not quite sure about this one. I will need to dig further.
&gt; 
&gt; Thanks for reviewing, Simon!

It seems the Pasteboard::setDragImage can be called in the WebProcess as well, but its call to [NSApp postEvent] was added a long time ago, and is not relevant in WK2.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1397266</commentid>
    <comment_count>10</comment_count>
      <attachid>333307</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2018-02-07 12:33:09 -0800</bug_when>
    <thetext>Created attachment 333307
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1397269</commentid>
    <comment_count>11</comment_count>
      <attachid>333307</attachid>
    <who name="Simon Fraser (smfr)">simon.fraser</who>
    <bug_when>2018-02-07 13:16:03 -0800</bug_when>
    <thetext>Comment on attachment 333307
Patch

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

We need a long-term plan to move all these bits of code out of WebCore.

&gt; Source/WebCore/platform/mac/PasteboardMac.mm:661
&gt;      // This is the most innocuous event to use, per Kristen Forster.

Her name is Kristin.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1397271</commentid>
    <comment_count>12</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2018-02-07 13:21:20 -0800</bug_when>
    <thetext>(In reply to Simon Fraser (smfr) from comment #11)
&gt; Comment on attachment 333307 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=333307&amp;action=review
&gt; 
&gt; We need a long-term plan to move all these bits of code out of WebCore.
&gt; 
&gt; &gt; Source/WebCore/platform/mac/PasteboardMac.mm:661
&gt; &gt;      // This is the most innocuous event to use, per Kristen Forster.
&gt; 
&gt; Her name is Kristin.

Thanks, Simon! I&apos;ll update before landing :)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1397303</commentid>
    <comment_count>13</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2018-02-07 14:34:26 -0800</bug_when>
    <thetext>Committed r228243: &lt;https://trac.webkit.org/changeset/228243/webkit&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1397307</commentid>
    <comment_count>14</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2018-02-07 14:35:53 -0800</bug_when>
    <thetext>(In reply to Simon Fraser (smfr) from comment #11)
&gt; Comment on attachment 333307 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=333307&amp;action=review
&gt; 
&gt; We need a long-term plan to move all these bits of code out of WebCore.
&gt; 

I think this can be done as part of https://bugs.webkit.org/show_bug.cgi?id=182546.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1397399</commentid>
    <comment_count>15</comment_count>
    <who name="Ryan Haddad">ryanhaddad</who>
    <bug_when>2018-02-07 17:32:12 -0800</bug_when>
    <thetext>(In reply to Per Arne Vollan from comment #13)
&gt; Committed r228243: &lt;https://trac.webkit.org/changeset/228243/webkit&gt;

This change seems to have introduced an assertion failure with API test FullscreenZoomInitialFrame.WebKit:

UNEXPECTEDLY EXITED FullscreenZoomInitialFrame.WebKit
ASSERTION FAILED: [NSApp isRunning]
./platform/mac/WebWindowAnimation.mm(41) : NSTimeInterval WebCore::WebWindowAnimationDurationFromDuration(NSTimeInterval)
1   0x10c52798d WTFCrash
2   0x1145c6172 WebCore::WebWindowAnimationDurationFromDuration(double)
3   0x1145c60f7 -[WebWindowScaleAnimation setDuration:]
4   0x1145c7b27 -[WebWindowScaleAnimation startAnimation]
5   0x1084b5a10 -[WebFullScreenController _startEnterFullScreenAnimationWithDuration:]
6   0x1084b3ff0 -[WebFullScreenController enterFullScreen:]
7   0x1085d407e -[WebView(WebViewInternal) _enterFullScreenForElement:]
8   0x108459531 WebChromeClient::enterFullScreenForElement(WebCore::Element&amp;)
9   0x115960e32 WebCore::Document::requestFullScreenForElement(WebCore::Element*, WebCore::Document::FullScreenCheckType)
10  0x1159f745d WebCore::Element::webkitRequestFullscreen()
11  0x11435977a WebCore::jsElementPrototypeFunctionWebkitRequestFullScreenBody(JSC::ExecState*, WebCore::JSElement*, JSC::ThrowScope&amp;)
12  0x11434831e long long WebCore::IDLOperation&lt;WebCore::JSElement&gt;::call&lt;&amp;(WebCore::jsElementPrototypeFunctionWebkitRequestFullScreenBody(JSC::ExecState*, WebCore::JSElement*, JSC::ThrowScope&amp;)), (WebCore::CastedThisErrorBehavior)0&gt;(JSC::ExecState&amp;, char const*)
13  0x1143480ac WebCore::jsElementPrototypeFunctionWebkitRequestFullScreen(JSC::ExecState*)
14  0x547fdf401178
15  0x10b063815 llint_entry
16  0x10b05b702 vmEntryToJavaScript
17  0x10bdd6cce JSC::JITCode::execute(JSC::VM*, JSC::ProtoCallFrame*)
18  0x10bd7ca15 JSC::Interpreter::executeCall(JSC::ExecState*, JSC::JSObject*, JSC::CallType, JSC::CallData const&amp;, JSC::JSValue, JSC::ArgList const&amp;)
19  0x10bfe4dda JSC::call(JSC::ExecState*, JSC::JSValue, JSC::CallType, JSC::CallData const&amp;, JSC::JSValue, JSC::ArgList const&amp;)
20  0x10bfe4eb9 JSC::call(JSC::ExecState*, JSC::JSValue, JSC::CallType, JSC::CallData const&amp;, JSC::JSValue, JSC::ArgList const&amp;, WTF::NakedPtr&lt;JSC::Exception&gt;&amp;)
21  0x10bfe515d JSC::profiledCall(JSC::ExecState*, JSC::ProfilingReason, JSC::JSValue, JSC::CallType, JSC::CallData const&amp;, JSC::JSValue, JSC::ArgList const&amp;, WTF::NakedPtr&lt;JSC::Exception&gt;&amp;)
22  0x115468fbb WebCore::JSMainThreadExecState::profiledCall(JSC::ExecState*, JSC::ProfilingReason, JSC::JSValue, JSC::CallType, JSC::CallData const&amp;, JSC::JSValue, JSC::ArgList const&amp;, WTF::NakedPtr&lt;JSC::Exception&gt;&amp;)
23  0x1154a5382 WebCore::JSEventListener::handleEvent(WebCore::ScriptExecutionContext&amp;, WebCore::Event&amp;)
24  0x115a14372 WebCore::EventTarget::fireEventListeners(WebCore::Event&amp;, WTF::Vector&lt;WTF::RefPtr&lt;WebCore::RegisteredEventListener, WTF::DumbPtrTraits&lt;WebCore::RegisteredEventListener&gt; &gt;, 1ul, WTF::CrashOnOverflow, 16ul, WTF::FastMalloc&gt;)
25  0x115a0bd6a WebCore::EventTarget::fireEventListeners(WebCore::Event&amp;)
26  0x115a6cbd4 WebCore::Node::handleLocalEvents(WebCore::Event&amp;)
27  0x115a0bbdd WebCore::EventContext::handleLocalEvents(WebCore::Event&amp;) const
28  0x115a0c094 WebCore::MouseOrFocusEventContext::handleLocalEvents(WebCore::Event&amp;) const
29  0x115a0ca02 WebCore::dispatchEventInDOM(WebCore::Event&amp;, WebCore::EventPath const&amp;)
30  0x115a0c458 WebCore::EventDispatcher::dispatchEvent(WebCore::Node&amp;, WebCore::Event&amp;)
31  0x115a6cc2d WebCore::Node::dispatchEvent(WebCore::Event&amp;)

https://build.webkit.org/builders/Apple%20High%20Sierra%20Debug%20WK1%20(Tests)/builds/2287</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1397413</commentid>
    <comment_count>16</comment_count>
    <who name="Ryan Haddad">ryanhaddad</who>
    <bug_when>2018-02-07 18:25:42 -0800</bug_when>
    <thetext>Reverted r228243 for reason:

Introduced an assertion failure with API test FullscreenZoomInitialFrame.WebKit

Committed r228254: &lt;https://trac.webkit.org/changeset/228254&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1397542</commentid>
    <comment_count>17</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2018-02-08 08:52:15 -0800</bug_when>
    <thetext>I believe this is a WK1 API test.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1397575</commentid>
    <comment_count>18</comment_count>
      <attachid>333387</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2018-02-08 10:21:18 -0800</bug_when>
    <thetext>Created attachment 333387
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1397576</commentid>
    <comment_count>19</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2018-02-08 10:22:02 -0800</bug_when>
    <thetext>(In reply to Per Arne Vollan from comment #18)
&gt; Created attachment 333387 [details]
&gt; Patch

I will work on moving these bits of code into WebKitLegacy, next.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1397591</commentid>
    <comment_count>20</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2018-02-08 11:00:59 -0800</bug_when>
    <thetext>(In reply to Per Arne Vollan from comment #18)
&gt; Created attachment 333387 [details]
&gt; Patch

I am not seeing any assert failures locally with the latest patch.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1398035</commentid>
    <comment_count>21</comment_count>
      <attachid>333503</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2018-02-09 11:24:37 -0800</bug_when>
    <thetext>Created attachment 333503
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1398071</commentid>
    <comment_count>22</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2018-02-09 13:35:51 -0800</bug_when>
    <thetext>(In reply to Per Arne Vollan from comment #21)
&gt; Created attachment 333503 [details]
&gt; Patch

Just a rebase, since some of the code now has moved to WebKitLegacy.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1398072</commentid>
    <comment_count>23</comment_count>
      <attachid>333503</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2018-02-09 13:39:31 -0800</bug_when>
    <thetext>Comment on attachment 333503
Patch

Thanks for reviewing, Simon :)</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1398084</commentid>
    <comment_count>24</comment_count>
      <attachid>333503</attachid>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2018-02-09 14:13:05 -0800</bug_when>
    <thetext>Comment on attachment 333503
Patch

Clearing flags on attachment: 333503

Committed r228338: &lt;https://trac.webkit.org/changeset/228338&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1398085</commentid>
    <comment_count>25</comment_count>
    <who name="WebKit Commit Bot">commit-queue</who>
    <bug_when>2018-02-09 14:13:07 -0800</bug_when>
    <thetext>All reviewed patches have been landed.  Closing bug.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>333231</attachid>
            <date>2018-02-06 15:41:28 -0800</date>
            <delta_ts>2018-02-06 18:48:07 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-182553-20180206154127.patch</filename>
            <type>text/plain</type>
            <size>4767</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyODE5NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE4LTAyLTA2ICBQZXIgQXJu
ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBBc3NlcnQgdGhhdCBOU0Fw
cCBpcyBub3QgcnVubmluZyBpbiB0aGUgV2ViUHJvY2Vzcy4KKyAgICAgICAgaHR0cHM6Ly9idWdz
LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjU1MworCisgICAgICAgIFJldmlld2VkIGJ5
IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFzc2VydCB0aGF0IE5TQXBwIGlzIHJ1bm5pbmcg
d2hlcmUgTlNBcHAgaXMgdXNlZCBpbiBXZWJDb3JlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywg
Y292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4gCisKKyAgICAgICAgKiBwYWdlL21hYy9FdmVudEhh
bmRsZXJNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpsYXN0RXZlbnRJc01vdXNlVXApOgorICAg
ICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpzZW5kRmFrZUV2ZW50c0FmdGVyV2lkZ2V0VHJh
Y2tpbmcpOgorICAgICAgICAqIHBsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tOgorICAgICAg
ICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6c2V0RHJhZ0ltYWdlKToKKyAgICAgICAgKiBwbGF0Zm9y
bS9tYWMvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5tbToKKyAgICAgICAgKC1bV2ViVmlk
ZW9GdWxsc2NyZWVuQ29udHJvbGxlciB3aW5kb3dEaWRMb2FkXSk6CisgICAgICAgICgtW1dlYlZp
ZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIgdXBkYXRlTWVudUFuZERvY2tGb3JGdWxsc2NyZWVuXSk6
CisgICAgICAgICogcGxhdGZvcm0vbWFjL1dlYldpbmRvd0FuaW1hdGlvbi5tbToKKyAgICAgICAg
KFdlYkNvcmU6OldlYldpbmRvd0FuaW1hdGlvbkR1cmF0aW9uRnJvbUR1cmF0aW9uKToKKwogMjAx
OC0wMi0wNiAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CiAKICAgICAgICAgW1BheW1l
bnQgUmVxdWVzdF0gc2hvdygpIHNob3VsZCB0YWtlIGFuIG9wdGlvbmFsIFBheW1lbnREZXRhaWxz
VXBkYXRlIHByb21pc2UKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL0V2ZW50SGFuZGxl
ck1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL21hYy9FdmVudEhhbmRs
ZXJNYWMubW0JKHJldmlzaW9uIDIyODE4OSkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL0V2
ZW50SGFuZGxlck1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTk2LDYgKzE5Niw4IEBAIHN0YXRp
YyBib29sIGxhc3RFdmVudElzTW91c2VVcCgpCiAgICAgLy8gdGhhdCBzdGF0ZS4gSGFuZGxpbmcg
dGhpcyB3YXMgY3JpdGljYWwgd2hlbiB3ZSB1c2VkIEFwcEtpdCB3aWRnZXRzIGZvciBmb3JtIGVs
ZW1lbnRzLgogICAgIC8vIEl0J3Mgbm90IGNsZWFyIGluIHdoYXQgY2FzZXMgdGhpcyBpcyBoZWxw
ZnVsIG5vdyAtLSBpdCdzIHBvc3NpYmxlIGl0IGNhbiBiZSByZW1vdmVkLiAKIAorICAgIFJFTEVB
U0VfQVNTRVJUKFtOU0FwcCBpc1J1bm5pbmddKTsKKwogICAgIEJFR0lOX0JMT0NLX09CSkNfRVhD
RVBUSU9OUzsKICAgICBOU0V2ZW50ICpjdXJyZW50RXZlbnRBZnRlckhhbmRsaW5nTW91c2VEb3du
ID0gW05TQXBwIGN1cnJlbnRFdmVudF07CiAgICAgcmV0dXJuIEV2ZW50SGFuZGxlcjo6Y3VycmVu
dE5TRXZlbnQoKSAhPSBjdXJyZW50RXZlbnRBZnRlckhhbmRsaW5nTW91c2VEb3duCkBAIC01NzAs
NiArNTcyLDcgQEAgdm9pZCBFdmVudEhhbmRsZXI6OnNlbmRGYWtlRXZlbnRzQWZ0ZXJXaQogICAg
IG1fc2VuZGluZ0V2ZW50VG9TdWJ2aWV3ID0gZmFsc2U7CiAgICAgaW50IGV2ZW50VHlwZSA9IFtp
bml0aWF0aW5nRXZlbnQgdHlwZV07CiAgICAgaWYgKGV2ZW50VHlwZSA9PSBOU0V2ZW50VHlwZUxl
ZnRNb3VzZURvd24gfHwgZXZlbnRUeXBlID09IE5TRXZlbnRUeXBlS2V5RG93bikgeworICAgICAg
ICBSRUxFQVNFX0FTU0VSVChbTlNBcHAgaXNSdW5uaW5nXSk7CiAgICAgICAgIE5TRXZlbnQgKmZh
a2VFdmVudCA9IG5pbDsKICAgICAgICAgaWYgKGV2ZW50VHlwZSA9PSBOU0V2ZW50VHlwZUxlZnRN
b3VzZURvd24pIHsKICAgICAgICAgICAgIGZha2VFdmVudCA9IFtOU0V2ZW50IG1vdXNlRXZlbnRX
aXRoVHlwZTpOU0V2ZW50VHlwZUxlZnRNb3VzZVVwCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbQkocmV2aXNpb24gMjI4MTg5KQorKysgU291cmNl
L1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Bhc3RlYm9hcmRNYWMubW0JKHdvcmtpbmcgY29weSkKQEAg
LTY1Niw2ICs2NTYsOCBAQCB2b2lkIFBhc3RlYm9hcmQ6OnNldERyYWdJbWFnZShEcmFnSW1hZ2Ug
CiAgICAgLy8gSW5zdGVhZCB3ZSBtdXN0IGRyb3AgZG93biB0byB0aGUgQ29yZUdyYXBoaWNzIEFQ
SS4KICAgICBzZXREcmFnSW1hZ2VJbXBsKGltYWdlLmdldCgpLmdldCgpLCBsb2NhdGlvbik7CiAK
KyAgICBSRUxFQVNFX0FTU0VSVChbTlNBcHAgaXNSdW5uaW5nXSk7CisKICAgICAvLyBIYWNrOiBX
ZSBtdXN0IHBvc3QgYW4gZXZlbnQgdG8gd2FrZSB1cCB0aGUgTlNEcmFnTWFuYWdlciwgd2hpY2gg
aXMgc2l0dGluZyBpbiBhIG5leHRFdmVudCBjYWxsCiAgICAgLy8gdXAgdGhlIHN0YWNrIGZyb20g
dXMgYmVjYXVzZSB0aGUgQ29yZUZvdW5kYXRpb24gZHJhZyBtYW5hZ2VyIGRvZXMgbm90IHVzZSB0
aGUgcnVuIGxvb3AgYnkgaXRzZWxmLgogICAgIC8vIFRoaXMgaXMgdGhlIG1vc3QgaW5ub2N1b3Vz
IGV2ZW50IHRvIHVzZSwgcGVyIEtyaXN0ZW4gRm9yc3Rlci4KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl
L3BsYXRmb3JtL21hYy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyLm1tCj09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K
LS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9s
bGVyLm1tCShyZXZpc2lvbiAyMjgxODkpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMv
V2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5tbQkod29ya2luZyBjb3B5KQpAQCAtMTA5LDYg
KzEwOSw4IEBAIC0gKHZvaWQpd2luZG93RGlkTG9hZAogICAgIFsoTlNWaWV3Kilbd2luZG93IGNv
bnRlbnRWaWV3XSBzZXRMYXllcjpbQ0FMYXllciBsYXllcl1dOwogICAgIFtbd2luZG93IGNvbnRl
bnRWaWV3XSBzZXRXYW50c0xheWVyOllFU107CiAKKyAgICBSRUxFQVNFX0FTU0VSVChbTlNBcHAg
aXNSdW5uaW5nXSk7CisKICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJd
IGFkZE9ic2VydmVyOnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9yKGFwcGxpY2F0aW9uRGlkUmVzaWdu
QWN0aXZlOikgbmFtZTpOU0FwcGxpY2F0aW9uRGlkUmVzaWduQWN0aXZlTm90aWZpY2F0aW9uIG9i
amVjdDpOU0FwcF07CiAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSBh
ZGRPYnNlcnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3RvcihhcHBsaWNhdGlvbkRpZENoYW5nZVNj
cmVlblBhcmFtZXRlcnM6KSBuYW1lOk5TQXBwbGljYXRpb25EaWRDaGFuZ2VTY3JlZW5QYXJhbWV0
ZXJzTm90aWZpY2F0aW9uIG9iamVjdDpOU0FwcF07CiB9CkBAIC0zMzgsNiArMzQwLDcgQEAgLSAo
dm9pZCl1cGRhdGVNZW51QW5kRG9ja0ZvckZ1bGxzY3JlZW4KICAgICAgICAgICAgIG9wdGlvbnMg
fD0gTlNBcHBsaWNhdGlvblByZXNlbnRhdGlvbkF1dG9IaWRlRG9jazsKICAgICB9CiAKKyAgICBS
RUxFQVNFX0FTU0VSVChbTlNBcHAgaXNSdW5uaW5nXSk7CiAgICAgTlNBcHAucHJlc2VudGF0aW9u
T3B0aW9ucyA9IG9wdGlvbnM7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21h
Yy9XZWJXaW5kb3dBbmltYXRpb24ubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxh
dGZvcm0vbWFjL1dlYldpbmRvd0FuaW1hdGlvbi5tbQkocmV2aXNpb24gMjI4MTg5KQorKysgU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYldpbmRvd0FuaW1hdGlvbi5tbQkod29ya2luZyBj
b3B5KQpAQCAtMzgsNiArMzgsNyBAQCBzdGF0aWMgY29uc3QgQ0dGbG9hdCBzbG93TW90aW9uRmFj
dG9yID0gCiAKIHN0YXRpYyBOU1RpbWVJbnRlcnZhbCBXZWJXaW5kb3dBbmltYXRpb25EdXJhdGlv
bkZyb21EdXJhdGlvbihOU1RpbWVJbnRlcnZhbCBkdXJhdGlvbikKIHsKKyAgICBSRUxFQVNFX0FT
U0VSVChbTlNBcHAgaXNSdW5uaW5nXSk7CiAgICAgcmV0dXJuIChbW05TQXBwIGN1cnJlbnRFdmVu
dF0gbW9kaWZpZXJGbGFnc10gJiBOU0V2ZW50TW9kaWZpZXJGbGFnU2hpZnQpID8gZHVyYXRpb24g
KiBzbG93TW90aW9uRmFjdG9yIDogZHVyYXRpb247CiB9CiAK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>333252</attachid>
            <date>2018-02-06 18:48:08 -0800</date>
            <delta_ts>2018-02-06 19:10:16 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-182553-20180206184808.patch</filename>
            <type>text/plain</type>
            <size>6254</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyODE5NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE4LTAyLTA2ICBQZXIgQXJu
ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBBc3NlcnQgdGhhdCBOU0Fw
cCBpcyBub3QgcnVubmluZyBpbiB0aGUgV2ViUHJvY2Vzcy4KKyAgICAgICAgaHR0cHM6Ly9idWdz
LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjU1MworCisgICAgICAgIFJldmlld2VkIGJ5
IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFzc2VydCB0aGF0IE5TQXBwIGlzIHJ1bm5pbmcg
d2hlcmUgTlNBcHAgaXMgdXNlZCBpbiBXZWJDb3JlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywg
Y292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4gCisKKyAgICAgICAgKiBwYWdlL21hYy9FdmVudEhh
bmRsZXJNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpsYXN0RXZlbnRJc01vdXNlVXApOgorICAg
ICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpzZW5kRmFrZUV2ZW50c0FmdGVyV2lkZ2V0VHJh
Y2tpbmcpOgorICAgICAgICAqIHBsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tOgorICAgICAg
ICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6c2V0RHJhZ0ltYWdlKToKKyAgICAgICAgKiBwbGF0Zm9y
bS9tYWMvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5tbToKKyAgICAgICAgKC1bV2ViVmlk
ZW9GdWxsc2NyZWVuQ29udHJvbGxlciB3aW5kb3dEaWRMb2FkXSk6CisgICAgICAgICgtW1dlYlZp
ZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIgdXBkYXRlTWVudUFuZERvY2tGb3JGdWxsc2NyZWVuXSk6
CisgICAgICAgICogcGxhdGZvcm0vbWFjL1dlYldpbmRvd0FuaW1hdGlvbi5tbToKKyAgICAgICAg
KFdlYkNvcmU6OldlYldpbmRvd0FuaW1hdGlvbkR1cmF0aW9uRnJvbUR1cmF0aW9uKToKKwogMjAx
OC0wMi0wNiAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CiAKICAgICAgICAgW1BheW1l
bnQgUmVxdWVzdF0gc2hvdygpIHNob3VsZCB0YWtlIGFuIG9wdGlvbmFsIFBheW1lbnREZXRhaWxz
VXBkYXRlIHByb21pc2UKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL0V2ZW50SGFuZGxl
ck1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL21hYy9FdmVudEhhbmRs
ZXJNYWMubW0JKHJldmlzaW9uIDIyODE4OSkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL0V2
ZW50SGFuZGxlck1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTk2LDYgKzE5Niw4IEBAIHN0YXRp
YyBib29sIGxhc3RFdmVudElzTW91c2VVcCgpCiAgICAgLy8gdGhhdCBzdGF0ZS4gSGFuZGxpbmcg
dGhpcyB3YXMgY3JpdGljYWwgd2hlbiB3ZSB1c2VkIEFwcEtpdCB3aWRnZXRzIGZvciBmb3JtIGVs
ZW1lbnRzLgogICAgIC8vIEl0J3Mgbm90IGNsZWFyIGluIHdoYXQgY2FzZXMgdGhpcyBpcyBoZWxw
ZnVsIG5vdyAtLSBpdCdzIHBvc3NpYmxlIGl0IGNhbiBiZSByZW1vdmVkLiAKIAorICAgIFJFTEVB
U0VfQVNTRVJUKFtOU0FwcCBpc1J1bm5pbmddKTsKKwogICAgIEJFR0lOX0JMT0NLX09CSkNfRVhD
RVBUSU9OUzsKICAgICBOU0V2ZW50ICpjdXJyZW50RXZlbnRBZnRlckhhbmRsaW5nTW91c2VEb3du
ID0gW05TQXBwIGN1cnJlbnRFdmVudF07CiAgICAgcmV0dXJuIEV2ZW50SGFuZGxlcjo6Y3VycmVu
dE5TRXZlbnQoKSAhPSBjdXJyZW50RXZlbnRBZnRlckhhbmRsaW5nTW91c2VEb3duCkBAIC01NzAs
NiArNTcyLDcgQEAgdm9pZCBFdmVudEhhbmRsZXI6OnNlbmRGYWtlRXZlbnRzQWZ0ZXJXaQogICAg
IG1fc2VuZGluZ0V2ZW50VG9TdWJ2aWV3ID0gZmFsc2U7CiAgICAgaW50IGV2ZW50VHlwZSA9IFtp
bml0aWF0aW5nRXZlbnQgdHlwZV07CiAgICAgaWYgKGV2ZW50VHlwZSA9PSBOU0V2ZW50VHlwZUxl
ZnRNb3VzZURvd24gfHwgZXZlbnRUeXBlID09IE5TRXZlbnRUeXBlS2V5RG93bikgeworICAgICAg
ICBSRUxFQVNFX0FTU0VSVChbTlNBcHAgaXNSdW5uaW5nXSk7CiAgICAgICAgIE5TRXZlbnQgKmZh
a2VFdmVudCA9IG5pbDsKICAgICAgICAgaWYgKGV2ZW50VHlwZSA9PSBOU0V2ZW50VHlwZUxlZnRN
b3VzZURvd24pIHsKICAgICAgICAgICAgIGZha2VFdmVudCA9IFtOU0V2ZW50IG1vdXNlRXZlbnRX
aXRoVHlwZTpOU0V2ZW50VHlwZUxlZnRNb3VzZVVwCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbQkocmV2aXNpb24gMjI4MTg5KQorKysgU291cmNl
L1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Bhc3RlYm9hcmRNYWMubW0JKHdvcmtpbmcgY29weSkKQEAg
LTY1Niw2ICs2NTYsOCBAQCB2b2lkIFBhc3RlYm9hcmQ6OnNldERyYWdJbWFnZShEcmFnSW1hZ2Ug
CiAgICAgLy8gSW5zdGVhZCB3ZSBtdXN0IGRyb3AgZG93biB0byB0aGUgQ29yZUdyYXBoaWNzIEFQ
SS4KICAgICBzZXREcmFnSW1hZ2VJbXBsKGltYWdlLmdldCgpLmdldCgpLCBsb2NhdGlvbik7CiAK
KyAgICBSRUxFQVNFX0FTU0VSVChbTlNBcHAgaXNSdW5uaW5nXSk7CisKICAgICAvLyBIYWNrOiBX
ZSBtdXN0IHBvc3QgYW4gZXZlbnQgdG8gd2FrZSB1cCB0aGUgTlNEcmFnTWFuYWdlciwgd2hpY2gg
aXMgc2l0dGluZyBpbiBhIG5leHRFdmVudCBjYWxsCiAgICAgLy8gdXAgdGhlIHN0YWNrIGZyb20g
dXMgYmVjYXVzZSB0aGUgQ29yZUZvdW5kYXRpb24gZHJhZyBtYW5hZ2VyIGRvZXMgbm90IHVzZSB0
aGUgcnVuIGxvb3AgYnkgaXRzZWxmLgogICAgIC8vIFRoaXMgaXMgdGhlIG1vc3QgaW5ub2N1b3Vz
IGV2ZW50IHRvIHVzZSwgcGVyIEtyaXN0ZW4gRm9yc3Rlci4KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl
L3BsYXRmb3JtL21hYy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyLm1tCj09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K
LS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9s
bGVyLm1tCShyZXZpc2lvbiAyMjgxODkpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMv
V2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5tbQkod29ya2luZyBjb3B5KQpAQCAtMTA5LDYg
KzEwOSw4IEBAIC0gKHZvaWQpd2luZG93RGlkTG9hZAogICAgIFsoTlNWaWV3Kilbd2luZG93IGNv
bnRlbnRWaWV3XSBzZXRMYXllcjpbQ0FMYXllciBsYXllcl1dOwogICAgIFtbd2luZG93IGNvbnRl
bnRWaWV3XSBzZXRXYW50c0xheWVyOllFU107CiAKKyAgICBSRUxFQVNFX0FTU0VSVChbTlNBcHAg
aXNSdW5uaW5nXSk7CisKICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJd
IGFkZE9ic2VydmVyOnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9yKGFwcGxpY2F0aW9uRGlkUmVzaWdu
QWN0aXZlOikgbmFtZTpOU0FwcGxpY2F0aW9uRGlkUmVzaWduQWN0aXZlTm90aWZpY2F0aW9uIG9i
amVjdDpOU0FwcF07CiAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSBh
ZGRPYnNlcnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3RvcihhcHBsaWNhdGlvbkRpZENoYW5nZVNj
cmVlblBhcmFtZXRlcnM6KSBuYW1lOk5TQXBwbGljYXRpb25EaWRDaGFuZ2VTY3JlZW5QYXJhbWV0
ZXJzTm90aWZpY2F0aW9uIG9iamVjdDpOU0FwcF07CiB9CkBAIC0zMzgsNiArMzQwLDcgQEAgLSAo
dm9pZCl1cGRhdGVNZW51QW5kRG9ja0ZvckZ1bGxzY3JlZW4KICAgICAgICAgICAgIG9wdGlvbnMg
fD0gTlNBcHBsaWNhdGlvblByZXNlbnRhdGlvbkF1dG9IaWRlRG9jazsKICAgICB9CiAKKyAgICBS
RUxFQVNFX0FTU0VSVChbTlNBcHAgaXNSdW5uaW5nXSk7CiAgICAgTlNBcHAucHJlc2VudGF0aW9u
T3B0aW9ucyA9IG9wdGlvbnM7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21h
Yy9XZWJXaW5kb3dBbmltYXRpb24ubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxh
dGZvcm0vbWFjL1dlYldpbmRvd0FuaW1hdGlvbi5tbQkocmV2aXNpb24gMjI4MTg5KQorKysgU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYldpbmRvd0FuaW1hdGlvbi5tbQkod29ya2luZyBj
b3B5KQpAQCAtMzgsNiArMzgsNyBAQCBzdGF0aWMgY29uc3QgQ0dGbG9hdCBzbG93TW90aW9uRmFj
dG9yID0gCiAKIHN0YXRpYyBOU1RpbWVJbnRlcnZhbCBXZWJXaW5kb3dBbmltYXRpb25EdXJhdGlv
bkZyb21EdXJhdGlvbihOU1RpbWVJbnRlcnZhbCBkdXJhdGlvbikKIHsKKyAgICBSRUxFQVNFX0FT
U0VSVChbTlNBcHAgaXNSdW5uaW5nXSk7CiAgICAgcmV0dXJuIChbW05TQXBwIGN1cnJlbnRFdmVu
dF0gbW9kaWZpZXJGbGFnc10gJiBOU0V2ZW50TW9kaWZpZXJGbGFnU2hpZnQpID8gZHVyYXRpb24g
KiBzbG93TW90aW9uRmFjdG9yIDogZHVyYXRpb247CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQv
Q29uZmlndXJhdGlvbnMvV2ViQ29udGVudFNlcnZpY2UueGNjb25maWcKPT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g
U291cmNlL1dlYktpdC9Db25maWd1cmF0aW9ucy9XZWJDb250ZW50U2VydmljZS54Y2NvbmZpZwko
cmV2aXNpb24gMjI4MTg5KQorKysgU291cmNlL1dlYktpdC9Db25maWd1cmF0aW9ucy9XZWJDb250
ZW50U2VydmljZS54Y2NvbmZpZwkod29ya2luZyBjb3B5KQpAQCAtNTIsNiArNTIsNiBAQCBXS19X
RUJDT05URU5UX1NFUlZJQ0VfTkVFRFNfVkVSU0lPTkVEX0ZSCiBXS19XRUJDT05URU5UX1NFUlZJ
Q0VfTkVFRFNfVkVSU0lPTkVEX0ZSQU1FV09SS19QQVRIX0xERkxBR19ZRVMgPSAkKFVTRV9TVEFH
SU5HX0lOU1RBTExfUEFUSCk7CiAKIFJVTkxPT1BfVFlQRVtzZGs9bWFjb3N4Kl0gPSBOU1J1bkxv
b3A7Ci1SVU5MT09QX1RZUEVbc2RrPW1hY29zeDEwLjEzKl0gPSBfTlNBcHBsaWNhdGlvbk1haW47
CitSVU5MT09QX1RZUEVbc2RrPW1hY29zeDEwLjEzKl0gPSBOU1J1bkxvb3A7CiBSVU5MT09QX1RZ
UEVbc2RrPW1hY29zeDEwLjEyKl0gPSBfTlNBcHBsaWNhdGlvbk1haW47CiBSVU5MT09QX1RZUEVb
c2RrPW1hY29zeDEwLjExKl0gPSBfTlNBcHBsaWNhdGlvbk1haW47CkluZGV4OiBTb3VyY2UvV2Vi
S2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp
dC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCShyZXZpc2lvbiAyMjgxODkpCisrKyBTb3VyY2Uv
V2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxNywx
MSArMjE3LDExIEBAIHZvaWQgV2ViUHJvY2Vzczo6aW5pdGlhbGl6ZVByb2Nlc3MoY29uc3QKIHsK
ICAgICBNZXNzYWdlUG9ydENoYW5uZWxQcm92aWRlcjo6c2V0U2hhcmVkUHJvdmlkZXIoV2ViTWVz
c2FnZVBvcnRDaGFubmVsUHJvdmlkZXI6OnNpbmdsZXRvbigpKTsKICAgICAKLSNpZiBQTEFURk9S
TShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAxNDAwCisvLyAj
aWYgUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEw
MTQwMAogICAgIC8vIFRoaXMgY2FsbCBpcyBuZWVkZWQgd2hlbiB0aGUgV2ViUHJvY2VzcyBpcyBu
b3QgcnVubmluZyB0aGUgTlNBcHBsaWNhdGlvbiBldmVudCBsb29wLgogICAgIC8vIE90aGVyd2lz
ZSwgY2FsbGluZyBlbmFibGVTYW5kYm94U3R5bGVGaWxlUXVhcmFudGluZSgpIHdpbGwgZmFpbC4K
ICAgICBsYXVuY2hTZXJ2aWNlc0NoZWNrSW4oKTsKLSNlbmRpZgorLy8gI2VuZGlmCiAgICAgcGxh
dGZvcm1Jbml0aWFsaXplUHJvY2VzcyhwYXJhbWV0ZXJzKTsKIH0KIAo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>333253</attachid>
            <date>2018-02-06 19:10:18 -0800</date>
            <delta_ts>2018-02-07 09:06:54 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-182553-20180206191017.patch</filename>
            <type>text/plain</type>
            <size>6136</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyODE5NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE4LTAyLTA2ICBQZXIgQXJu
ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBBc3NlcnQgdGhhdCBOU0Fw
cCBpcyBub3QgcnVubmluZyBpbiB0aGUgV2ViUHJvY2Vzcy4KKyAgICAgICAgaHR0cHM6Ly9idWdz
LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjU1MworCisgICAgICAgIFJldmlld2VkIGJ5
IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFzc2VydCB0aGF0IE5TQXBwIGlzIHJ1bm5pbmcg
d2hlcmUgTlNBcHAgaXMgdXNlZCBpbiBXZWJDb3JlLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywg
Y292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4gCisKKyAgICAgICAgKiBwYWdlL21hYy9FdmVudEhh
bmRsZXJNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpsYXN0RXZlbnRJc01vdXNlVXApOgorICAg
ICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpzZW5kRmFrZUV2ZW50c0FmdGVyV2lkZ2V0VHJh
Y2tpbmcpOgorICAgICAgICAqIHBsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tOgorICAgICAg
ICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6c2V0RHJhZ0ltYWdlKToKKyAgICAgICAgKiBwbGF0Zm9y
bS9tYWMvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5tbToKKyAgICAgICAgKC1bV2ViVmlk
ZW9GdWxsc2NyZWVuQ29udHJvbGxlciB3aW5kb3dEaWRMb2FkXSk6CisgICAgICAgICgtW1dlYlZp
ZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIgdXBkYXRlTWVudUFuZERvY2tGb3JGdWxsc2NyZWVuXSk6
CisgICAgICAgICogcGxhdGZvcm0vbWFjL1dlYldpbmRvd0FuaW1hdGlvbi5tbToKKyAgICAgICAg
KFdlYkNvcmU6OldlYldpbmRvd0FuaW1hdGlvbkR1cmF0aW9uRnJvbUR1cmF0aW9uKToKKwogMjAx
OC0wMi0wNiAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CiAKICAgICAgICAgW1BheW1l
bnQgUmVxdWVzdF0gc2hvdygpIHNob3VsZCB0YWtlIGFuIG9wdGlvbmFsIFBheW1lbnREZXRhaWxz
VXBkYXRlIHByb21pc2UKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL0V2ZW50SGFuZGxl
ck1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL21hYy9FdmVudEhhbmRs
ZXJNYWMubW0JKHJldmlzaW9uIDIyODE4OSkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL0V2
ZW50SGFuZGxlck1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTk2LDYgKzE5Niw4IEBAIHN0YXRp
YyBib29sIGxhc3RFdmVudElzTW91c2VVcCgpCiAgICAgLy8gdGhhdCBzdGF0ZS4gSGFuZGxpbmcg
dGhpcyB3YXMgY3JpdGljYWwgd2hlbiB3ZSB1c2VkIEFwcEtpdCB3aWRnZXRzIGZvciBmb3JtIGVs
ZW1lbnRzLgogICAgIC8vIEl0J3Mgbm90IGNsZWFyIGluIHdoYXQgY2FzZXMgdGhpcyBpcyBoZWxw
ZnVsIG5vdyAtLSBpdCdzIHBvc3NpYmxlIGl0IGNhbiBiZSByZW1vdmVkLiAKIAorICAgIFJFTEVB
U0VfQVNTRVJUKFtOU0FwcCBpc1J1bm5pbmddKTsKKwogICAgIEJFR0lOX0JMT0NLX09CSkNfRVhD
RVBUSU9OUzsKICAgICBOU0V2ZW50ICpjdXJyZW50RXZlbnRBZnRlckhhbmRsaW5nTW91c2VEb3du
ID0gW05TQXBwIGN1cnJlbnRFdmVudF07CiAgICAgcmV0dXJuIEV2ZW50SGFuZGxlcjo6Y3VycmVu
dE5TRXZlbnQoKSAhPSBjdXJyZW50RXZlbnRBZnRlckhhbmRsaW5nTW91c2VEb3duCkBAIC01NzAs
NiArNTcyLDcgQEAgdm9pZCBFdmVudEhhbmRsZXI6OnNlbmRGYWtlRXZlbnRzQWZ0ZXJXaQogICAg
IG1fc2VuZGluZ0V2ZW50VG9TdWJ2aWV3ID0gZmFsc2U7CiAgICAgaW50IGV2ZW50VHlwZSA9IFtp
bml0aWF0aW5nRXZlbnQgdHlwZV07CiAgICAgaWYgKGV2ZW50VHlwZSA9PSBOU0V2ZW50VHlwZUxl
ZnRNb3VzZURvd24gfHwgZXZlbnRUeXBlID09IE5TRXZlbnRUeXBlS2V5RG93bikgeworICAgICAg
ICBSRUxFQVNFX0FTU0VSVChbTlNBcHAgaXNSdW5uaW5nXSk7CiAgICAgICAgIE5TRXZlbnQgKmZh
a2VFdmVudCA9IG5pbDsKICAgICAgICAgaWYgKGV2ZW50VHlwZSA9PSBOU0V2ZW50VHlwZUxlZnRN
b3VzZURvd24pIHsKICAgICAgICAgICAgIGZha2VFdmVudCA9IFtOU0V2ZW50IG1vdXNlRXZlbnRX
aXRoVHlwZTpOU0V2ZW50VHlwZUxlZnRNb3VzZVVwCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbQkocmV2aXNpb24gMjI4MTg5KQorKysgU291cmNl
L1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Bhc3RlYm9hcmRNYWMubW0JKHdvcmtpbmcgY29weSkKQEAg
LTY1Niw2ICs2NTYsOCBAQCB2b2lkIFBhc3RlYm9hcmQ6OnNldERyYWdJbWFnZShEcmFnSW1hZ2Ug
CiAgICAgLy8gSW5zdGVhZCB3ZSBtdXN0IGRyb3AgZG93biB0byB0aGUgQ29yZUdyYXBoaWNzIEFQ
SS4KICAgICBzZXREcmFnSW1hZ2VJbXBsKGltYWdlLmdldCgpLmdldCgpLCBsb2NhdGlvbik7CiAK
KyAgICBSRUxFQVNFX0FTU0VSVChbTlNBcHAgaXNSdW5uaW5nXSk7CisKICAgICAvLyBIYWNrOiBX
ZSBtdXN0IHBvc3QgYW4gZXZlbnQgdG8gd2FrZSB1cCB0aGUgTlNEcmFnTWFuYWdlciwgd2hpY2gg
aXMgc2l0dGluZyBpbiBhIG5leHRFdmVudCBjYWxsCiAgICAgLy8gdXAgdGhlIHN0YWNrIGZyb20g
dXMgYmVjYXVzZSB0aGUgQ29yZUZvdW5kYXRpb24gZHJhZyBtYW5hZ2VyIGRvZXMgbm90IHVzZSB0
aGUgcnVuIGxvb3AgYnkgaXRzZWxmLgogICAgIC8vIFRoaXMgaXMgdGhlIG1vc3QgaW5ub2N1b3Vz
IGV2ZW50IHRvIHVzZSwgcGVyIEtyaXN0ZW4gRm9yc3Rlci4KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl
L3BsYXRmb3JtL21hYy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyLm1tCj09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K
LS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9s
bGVyLm1tCShyZXZpc2lvbiAyMjgxODkpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMv
V2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5tbQkod29ya2luZyBjb3B5KQpAQCAtMTA5LDYg
KzEwOSw4IEBAIC0gKHZvaWQpd2luZG93RGlkTG9hZAogICAgIFsoTlNWaWV3Kilbd2luZG93IGNv
bnRlbnRWaWV3XSBzZXRMYXllcjpbQ0FMYXllciBsYXllcl1dOwogICAgIFtbd2luZG93IGNvbnRl
bnRWaWV3XSBzZXRXYW50c0xheWVyOllFU107CiAKKyAgICBSRUxFQVNFX0FTU0VSVChbTlNBcHAg
aXNSdW5uaW5nXSk7CisKICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJd
IGFkZE9ic2VydmVyOnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9yKGFwcGxpY2F0aW9uRGlkUmVzaWdu
QWN0aXZlOikgbmFtZTpOU0FwcGxpY2F0aW9uRGlkUmVzaWduQWN0aXZlTm90aWZpY2F0aW9uIG9i
amVjdDpOU0FwcF07CiAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSBh
ZGRPYnNlcnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3RvcihhcHBsaWNhdGlvbkRpZENoYW5nZVNj
cmVlblBhcmFtZXRlcnM6KSBuYW1lOk5TQXBwbGljYXRpb25EaWRDaGFuZ2VTY3JlZW5QYXJhbWV0
ZXJzTm90aWZpY2F0aW9uIG9iamVjdDpOU0FwcF07CiB9CkBAIC0zMzgsNiArMzQwLDcgQEAgLSAo
dm9pZCl1cGRhdGVNZW51QW5kRG9ja0ZvckZ1bGxzY3JlZW4KICAgICAgICAgICAgIG9wdGlvbnMg
fD0gTlNBcHBsaWNhdGlvblByZXNlbnRhdGlvbkF1dG9IaWRlRG9jazsKICAgICB9CiAKKyAgICBS
RUxFQVNFX0FTU0VSVChbTlNBcHAgaXNSdW5uaW5nXSk7CiAgICAgTlNBcHAucHJlc2VudGF0aW9u
T3B0aW9ucyA9IG9wdGlvbnM7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21h
Yy9XZWJXaW5kb3dBbmltYXRpb24ubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxh
dGZvcm0vbWFjL1dlYldpbmRvd0FuaW1hdGlvbi5tbQkocmV2aXNpb24gMjI4MTg5KQorKysgU291
cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYldpbmRvd0FuaW1hdGlvbi5tbQkod29ya2luZyBj
b3B5KQpAQCAtMzgsNiArMzgsNyBAQCBzdGF0aWMgY29uc3QgQ0dGbG9hdCBzbG93TW90aW9uRmFj
dG9yID0gCiAKIHN0YXRpYyBOU1RpbWVJbnRlcnZhbCBXZWJXaW5kb3dBbmltYXRpb25EdXJhdGlv
bkZyb21EdXJhdGlvbihOU1RpbWVJbnRlcnZhbCBkdXJhdGlvbikKIHsKKyAgICBSRUxFQVNFX0FT
U0VSVChbTlNBcHAgaXNSdW5uaW5nXSk7CiAgICAgcmV0dXJuIChbW05TQXBwIGN1cnJlbnRFdmVu
dF0gbW9kaWZpZXJGbGFnc10gJiBOU0V2ZW50TW9kaWZpZXJGbGFnU2hpZnQpID8gZHVyYXRpb24g
KiBzbG93TW90aW9uRmFjdG9yIDogZHVyYXRpb247CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQv
Q29uZmlndXJhdGlvbnMvV2ViQ29udGVudFNlcnZpY2UueGNjb25maWcKPT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g
U291cmNlL1dlYktpdC9Db25maWd1cmF0aW9ucy9XZWJDb250ZW50U2VydmljZS54Y2NvbmZpZwko
cmV2aXNpb24gMjI4MTg5KQorKysgU291cmNlL1dlYktpdC9Db25maWd1cmF0aW9ucy9XZWJDb250
ZW50U2VydmljZS54Y2NvbmZpZwkod29ya2luZyBjb3B5KQpAQCAtNTIsNiArNTIsNiBAQCBXS19X
RUJDT05URU5UX1NFUlZJQ0VfTkVFRFNfVkVSU0lPTkVEX0ZSCiBXS19XRUJDT05URU5UX1NFUlZJ
Q0VfTkVFRFNfVkVSU0lPTkVEX0ZSQU1FV09SS19QQVRIX0xERkxBR19ZRVMgPSAkKFVTRV9TVEFH
SU5HX0lOU1RBTExfUEFUSCk7CiAKIFJVTkxPT1BfVFlQRVtzZGs9bWFjb3N4Kl0gPSBOU1J1bkxv
b3A7Ci1SVU5MT09QX1RZUEVbc2RrPW1hY29zeDEwLjEzKl0gPSBfTlNBcHBsaWNhdGlvbk1haW47
CitSVU5MT09QX1RZUEVbc2RrPW1hY29zeDEwLjEzKl0gPSBOU1J1bkxvb3A7CiBSVU5MT09QX1RZ
UEVbc2RrPW1hY29zeDEwLjEyKl0gPSBfTlNBcHBsaWNhdGlvbk1haW47CiBSVU5MT09QX1RZUEVb
c2RrPW1hY29zeDEwLjExKl0gPSBfTlNBcHBsaWNhdGlvbk1haW47CkluZGV4OiBTb3VyY2UvV2Vi
S2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp
dC9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCShyZXZpc2lvbiAyMjgxODkpCisrKyBTb3VyY2Uv
V2ViS2l0L1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxNyw3
ICsyMTcsNyBAQCB2b2lkIFdlYlByb2Nlc3M6OmluaXRpYWxpemVQcm9jZXNzKGNvbnN0CiB7CiAg
ICAgTWVzc2FnZVBvcnRDaGFubmVsUHJvdmlkZXI6OnNldFNoYXJlZFByb3ZpZGVyKFdlYk1lc3Nh
Z2VQb3J0Q2hhbm5lbFByb3ZpZGVyOjpzaW5nbGV0b24oKSk7CiAgICAgCi0jaWYgUExBVEZPUk0o
TUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTQwMAorI2lmIFBM
QVRGT1JNKE1BQykKICAgICAvLyBUaGlzIGNhbGwgaXMgbmVlZGVkIHdoZW4gdGhlIFdlYlByb2Nl
c3MgaXMgbm90IHJ1bm5pbmcgdGhlIE5TQXBwbGljYXRpb24gZXZlbnQgbG9vcC4KICAgICAvLyBP
dGhlcndpc2UsIGNhbGxpbmcgZW5hYmxlU2FuZGJveFN0eWxlRmlsZVF1YXJhbnRpbmUoKSB3aWxs
IGZhaWwuCiAgICAgbGF1bmNoU2VydmljZXNDaGVja0luKCk7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>333290</attachid>
            <date>2018-02-07 09:06:56 -0800</date>
            <delta_ts>2018-02-07 09:31:55 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-182553-20180207090655.patch</filename>
            <type>text/plain</type>
            <size>5758</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyODIyNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE4LTAyLTA2ICBQZXIgQXJu
ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBBc3NlcnQgdGhhdCBOU0Fw
cCBpcyBub3QgcnVubmluZyBpbiB0aGUgV2ViUHJvY2Vzcy4KKyAgICAgICAgaHR0cHM6Ly9idWdz
LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjU1MworCisgICAgICAgIFJldmlld2VkIGJ5
IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIFdlYkNvcmUsIHRoZXJlIGFyZSBhIGZldyBw
bGFjZXMgd2hlcmUgTlNBcHAgaXMgcmVmZXJlbmNlZC4gU2luY2UgdGhlIFdlYkNvbnRlbnQgcHJv
Y2VzcworICAgICAgICBpcyBubyBsb25nZXIgdXNpbmcgdGhlIE5TQXBwbGljYXRpb24gcnVuIGxv
b3AsIGFuZCBOU0FwcCBpcyBubyBsb25nZXIgZ3VhcmFudGVlZCB0byBiZQorICAgICAgICB2YWxp
ZCwgd2Ugc2hvdWxkIG1ha2Ugc3VyZSB0aGF0IHRoZSBOU0FwcCBpcyBub3QgcmVmZXJlbmNlZCBi
eSB0aGUgV2ViQ29udGVudCBwcm9jZXNzIG9yCisgICAgICAgIHRoZSBOZXR3b3JrIHByb2Nlc3Ms
IGJ5IGFzc2VydGluZyB0aGF0IHRoZSBOU0FwcGxpY2F0aW9uIGV2ZW50IGxvb3AgaXMgcnVubmlu
ZyB3aGVuIE5TQXBwCisgICAgICAgIGlzIHJlZmVyZW5jZWQuIEl0IGlzIHN0aWxsIG9rIGZvciB0
aGUgVUlQcm9jZXNzIHRvIHJlZmVyZW5jZSBOU0FwcC4gQWRkaW5nIHRoZXNlIGFzc2VydAorICAg
ICAgICB3aWxsIGhlbHAgY2F0Y2ggcmVmZXJlbmNlcyB0byBOU0FwcCB3aGVuIHRoZSBOU0FwcGxp
Y2F0aW9uIHJ1biBsb29wIGlzIG5vdCB1c2VkLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgY292
ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4gCisKKyAgICAgICAgKiBwYWdlL21hYy9FdmVudEhhbmRs
ZXJNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpsYXN0RXZlbnRJc01vdXNlVXApOgorICAgICAg
ICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpzZW5kRmFrZUV2ZW50c0FmdGVyV2lkZ2V0VHJhY2tp
bmcpOgorICAgICAgICAqIHBsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tOgorICAgICAgICAo
V2ViQ29yZTo6UGFzdGVib2FyZDo6c2V0RHJhZ0ltYWdlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9t
YWMvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5tbToKKyAgICAgICAgKC1bV2ViVmlkZW9G
dWxsc2NyZWVuQ29udHJvbGxlciB3aW5kb3dEaWRMb2FkXSk6CisgICAgICAgICgtW1dlYlZpZGVv
RnVsbHNjcmVlbkNvbnRyb2xsZXIgdXBkYXRlTWVudUFuZERvY2tGb3JGdWxsc2NyZWVuXSk6Cisg
ICAgICAgICogcGxhdGZvcm0vbWFjL1dlYldpbmRvd0FuaW1hdGlvbi5tbToKKyAgICAgICAgKFdl
YkNvcmU6OldlYldpbmRvd0FuaW1hdGlvbkR1cmF0aW9uRnJvbUR1cmF0aW9uKToKKwogMjAxOC0w
Mi0wNyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtSZW5kZXJU
cmVlQnVpbGRlcl0gTW92ZSBSZW5kZXJCbG9jazo6cmVtb3ZlTGVmdG92ZXJBbm9ueW1vdXNCbG9j
ayB0byBSZW5kZXJUcmVlQnVpbGRlcgpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9tYWMvRXZl
bnRIYW5kbGVyTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL0V2
ZW50SGFuZGxlck1hYy5tbQkocmV2aXNpb24gMjI4MjI2KQorKysgU291cmNlL1dlYkNvcmUvcGFn
ZS9tYWMvRXZlbnRIYW5kbGVyTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xOTYsNiArMTk2LDgg
QEAgc3RhdGljIGJvb2wgbGFzdEV2ZW50SXNNb3VzZVVwKCkKICAgICAvLyB0aGF0IHN0YXRlLiBI
YW5kbGluZyB0aGlzIHdhcyBjcml0aWNhbCB3aGVuIHdlIHVzZWQgQXBwS2l0IHdpZGdldHMgZm9y
IGZvcm0gZWxlbWVudHMuCiAgICAgLy8gSXQncyBub3QgY2xlYXIgaW4gd2hhdCBjYXNlcyB0aGlz
IGlzIGhlbHBmdWwgbm93IC0tIGl0J3MgcG9zc2libGUgaXQgY2FuIGJlIHJlbW92ZWQuIAogCisg
ICAgQVNTRVJUKFtOU0FwcCBpc1J1bm5pbmddKTsKKwogICAgIEJFR0lOX0JMT0NLX09CSkNfRVhD
RVBUSU9OUzsKICAgICBOU0V2ZW50ICpjdXJyZW50RXZlbnRBZnRlckhhbmRsaW5nTW91c2VEb3du
ID0gW05TQXBwIGN1cnJlbnRFdmVudF07CiAgICAgcmV0dXJuIEV2ZW50SGFuZGxlcjo6Y3VycmVu
dE5TRXZlbnQoKSAhPSBjdXJyZW50RXZlbnRBZnRlckhhbmRsaW5nTW91c2VEb3duCkBAIC01NzAs
NiArNTcyLDcgQEAgdm9pZCBFdmVudEhhbmRsZXI6OnNlbmRGYWtlRXZlbnRzQWZ0ZXJXaQogICAg
IG1fc2VuZGluZ0V2ZW50VG9TdWJ2aWV3ID0gZmFsc2U7CiAgICAgaW50IGV2ZW50VHlwZSA9IFtp
bml0aWF0aW5nRXZlbnQgdHlwZV07CiAgICAgaWYgKGV2ZW50VHlwZSA9PSBOU0V2ZW50VHlwZUxl
ZnRNb3VzZURvd24gfHwgZXZlbnRUeXBlID09IE5TRXZlbnRUeXBlS2V5RG93bikgeworICAgICAg
ICBBU1NFUlQoW05TQXBwIGlzUnVubmluZ10pOwogICAgICAgICBOU0V2ZW50ICpmYWtlRXZlbnQg
PSBuaWw7CiAgICAgICAgIGlmIChldmVudFR5cGUgPT0gTlNFdmVudFR5cGVMZWZ0TW91c2VEb3du
KSB7CiAgICAgICAgICAgICBmYWtlRXZlbnQgPSBbTlNFdmVudCBtb3VzZUV2ZW50V2l0aFR5cGU6
TlNFdmVudFR5cGVMZWZ0TW91c2VVcApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFj
L0V2ZW50TG9vcE1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t
YWMvRXZlbnRMb29wTWFjLm1tCShyZXZpc2lvbiAyMjgyMjYpCisrKyBTb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9tYWMvRXZlbnRMb29wTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zNiw2ICszNiw3
IEBAIHZvaWQgRXZlbnRMb29wOjpjeWNsZSgpCiAgICAgICAgIHJldHVybjsKICAgICB9CiAjZW5k
aWYKKyAgICBBU1NFUlQoW05TQXBwIGlzUnVubmluZ10pOwogICAgIFtOU0FwcCBzZXRXaW5kb3dz
TmVlZFVwZGF0ZTpZRVNdOwogICAgIGlmIChOU0V2ZW50ICpldmVudCA9IFtOU0FwcCBuZXh0RXZl
bnRNYXRjaGluZ01hc2s6TlNFdmVudE1hc2tBbnkgdW50aWxEYXRlOltOU0RhdGUgZGF0ZVdpdGhU
aW1lSW50ZXJ2YWxTaW5jZU5vdzowLjA1XSBpbk1vZGU6TlNEZWZhdWx0UnVuTG9vcE1vZGUgZGVx
dWV1ZTpZRVNdKQogICAgICAgICBbTlNBcHAgc2VuZEV2ZW50OmV2ZW50XTsKSW5kZXg6IFNvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tCj09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv
dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tCShyZXZpc2lvbiAyMjgy
MjYpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbQkod29y
a2luZyBjb3B5KQpAQCAtNjYxLDYgKzY2MSw3IEBAIHZvaWQgUGFzdGVib2FyZDo6c2V0RHJhZ0lt
YWdlKERyYWdJbWFnZSAKICAgICAvLyBUaGlzIGlzIHRoZSBtb3N0IGlubm9jdW91cyBldmVudCB0
byB1c2UsIHBlciBLcmlzdGVuIEZvcnN0ZXIuCiAgICAgTlNFdmVudCogZXZlbnQgPSBbTlNFdmVu
dCBtb3VzZUV2ZW50V2l0aFR5cGU6TlNFdmVudFR5cGVNb3VzZU1vdmVkIGxvY2F0aW9uOk5TWmVy
b1BvaW50CiAgICAgICAgIG1vZGlmaWVyRmxhZ3M6MCB0aW1lc3RhbXA6MCB3aW5kb3dOdW1iZXI6
MCBjb250ZXh0Om5pbCBldmVudE51bWJlcjowIGNsaWNrQ291bnQ6MCBwcmVzc3VyZTowXTsKKyAg
ICBBU1NFUlQoW05TQXBwIGlzUnVubmluZ10pOwogICAgIFtOU0FwcCBwb3N0RXZlbnQ6ZXZlbnQg
YXRTdGFydDpZRVNdOwogfQogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t
YWMvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5tbQo9PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv
V2ViQ29yZS9wbGF0Zm9ybS9tYWMvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5tbQkocmV2
aXNpb24gMjI4MjI2KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYlZpZGVvRnVs
bHNjcmVlbkNvbnRyb2xsZXIubW0JKHdvcmtpbmcgY29weSkKQEAgLTEwOSw2ICsxMDksOCBAQCAt
ICh2b2lkKXdpbmRvd0RpZExvYWQKICAgICBbKE5TVmlldyopW3dpbmRvdyBjb250ZW50Vmlld10g
c2V0TGF5ZXI6W0NBTGF5ZXIgbGF5ZXJdXTsKICAgICBbW3dpbmRvdyBjb250ZW50Vmlld10gc2V0
V2FudHNMYXllcjpZRVNdOwogCisgICAgQVNTRVJUKFtOU0FwcCBpc1J1bm5pbmddKTsKKwogICAg
IFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gYWRkT2JzZXJ2ZXI6c2VsZiBz
ZWxlY3RvcjpAc2VsZWN0b3IoYXBwbGljYXRpb25EaWRSZXNpZ25BY3RpdmU6KSBuYW1lOk5TQXBw
bGljYXRpb25EaWRSZXNpZ25BY3RpdmVOb3RpZmljYXRpb24gb2JqZWN0Ok5TQXBwXTsKICAgICBb
W05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIGFkZE9ic2VydmVyOnNlbGYgc2Vs
ZWN0b3I6QHNlbGVjdG9yKGFwcGxpY2F0aW9uRGlkQ2hhbmdlU2NyZWVuUGFyYW1ldGVyczopIG5h
bWU6TlNBcHBsaWNhdGlvbkRpZENoYW5nZVNjcmVlblBhcmFtZXRlcnNOb3RpZmljYXRpb24gb2Jq
ZWN0Ok5TQXBwXTsKIH0KQEAgLTMzOCw2ICszNDAsNyBAQCAtICh2b2lkKXVwZGF0ZU1lbnVBbmRE
b2NrRm9yRnVsbHNjcmVlbgogICAgICAgICAgICAgb3B0aW9ucyB8PSBOU0FwcGxpY2F0aW9uUHJl
c2VudGF0aW9uQXV0b0hpZGVEb2NrOwogICAgIH0KIAorICAgIEFTU0VSVChbTlNBcHAgaXNSdW5u
aW5nXSk7CiAgICAgTlNBcHAucHJlc2VudGF0aW9uT3B0aW9ucyA9IG9wdGlvbnM7CiB9CiAKSW5k
ZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJXaW5kb3dBbmltYXRpb24ubW0KPT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYldpbmRvd0FuaW1hdGlv
bi5tbQkocmV2aXNpb24gMjI4MjI2KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dl
YldpbmRvd0FuaW1hdGlvbi5tbQkod29ya2luZyBjb3B5KQpAQCAtMzgsNiArMzgsNyBAQCBzdGF0
aWMgY29uc3QgQ0dGbG9hdCBzbG93TW90aW9uRmFjdG9yID0gCiAKIHN0YXRpYyBOU1RpbWVJbnRl
cnZhbCBXZWJXaW5kb3dBbmltYXRpb25EdXJhdGlvbkZyb21EdXJhdGlvbihOU1RpbWVJbnRlcnZh
bCBkdXJhdGlvbikKIHsKKyAgICBBU1NFUlQoW05TQXBwIGlzUnVubmluZ10pOwogICAgIHJldHVy
biAoW1tOU0FwcCBjdXJyZW50RXZlbnRdIG1vZGlmaWVyRmxhZ3NdICYgTlNFdmVudE1vZGlmaWVy
RmxhZ1NoaWZ0KSA/IGR1cmF0aW9uICogc2xvd01vdGlvbkZhY3RvciA6IGR1cmF0aW9uOwogfQog
Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>333295</attachid>
            <date>2018-02-07 09:31:56 -0800</date>
            <delta_ts>2018-02-07 12:33:08 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-182553-20180207093155.patch</filename>
            <type>text/plain</type>
            <size>5801</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyODIyNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDE4LTAyLTA2ICBQZXIgQXJu
ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBBc3NlcnQgdGhhdCBOU0Fw
cCBpcyBub3QgcnVubmluZyBpbiB0aGUgV2ViUHJvY2Vzcy4KKyAgICAgICAgaHR0cHM6Ly9idWdz
LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjU1MworICAgICAgICA8cmRhcjovL3Byb2Js
ZW0vMzczMTYxNDQ+CisgICAgICAgIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh
KS4KKworICAgICAgICBJbiBXZWJDb3JlLCB0aGVyZSBhcmUgYSBmZXcgcGxhY2VzIHdoZXJlIE5T
QXBwIGlzIHJlZmVyZW5jZWQuIFNpbmNlIHRoZSBXZWJDb250ZW50IHByb2Nlc3MKKyAgICAgICAg
aXMgbm8gbG9uZ2VyIHVzaW5nIHRoZSBOU0FwcGxpY2F0aW9uIHJ1biBsb29wLCBhbmQgTlNBcHAg
aXMgbm8gbG9uZ2VyIGd1YXJhbnRlZWQgdG8gYmUKKyAgICAgICAgdmFsaWQsIHdlIHNob3VsZCBt
YWtlIHN1cmUgdGhhdCB0aGUgTlNBcHAgaXMgbm90IHJlZmVyZW5jZWQgYnkgdGhlIFdlYkNvbnRl
bnQgcHJvY2VzcyBvcgorICAgICAgICB0aGUgTmV0d29yayBwcm9jZXNzLCBieSBhc3NlcnRpbmcg
dGhhdCB0aGUgTlNBcHBsaWNhdGlvbiBldmVudCBsb29wIGlzIHJ1bm5pbmcgd2hlbiBOU0FwcAor
ICAgICAgICBpcyByZWZlcmVuY2VkLiBJdCBpcyBzdGlsbCBvayBmb3IgdGhlIFVJUHJvY2VzcyB0
byByZWZlcmVuY2UgTlNBcHAuIEFkZGluZyB0aGVzZSBhc3NlcnQKKyAgICAgICAgd2lsbCBoZWxw
IGNhdGNoIHJlZmVyZW5jZXMgdG8gTlNBcHAgd2hlbiB0aGUgTlNBcHBsaWNhdGlvbiBydW4gbG9v
cCBpcyBub3QgdXNlZC4KKworICAgICAgICBObyBuZXcgdGVzdHMsIGNvdmVyZWQgYnkgZXhpc3Rp
bmcgdGVzdHMuIAorCisgICAgICAgICogcGFnZS9tYWMvRXZlbnRIYW5kbGVyTWFjLm1tOgorICAg
ICAgICAoV2ViQ29yZTo6bGFzdEV2ZW50SXNNb3VzZVVwKToKKyAgICAgICAgKFdlYkNvcmU6OkV2
ZW50SGFuZGxlcjo6c2VuZEZha2VFdmVudHNBZnRlcldpZGdldFRyYWNraW5nKToKKyAgICAgICAg
KiBwbGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlBhc3Rl
Ym9hcmQ6OnNldERyYWdJbWFnZSk6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1dlYlZpZGVvRnVs
bHNjcmVlbkNvbnRyb2xsZXIubW06CisgICAgICAgICgtW1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRy
b2xsZXIgd2luZG93RGlkTG9hZF0pOgorICAgICAgICAoLVtXZWJWaWRlb0Z1bGxzY3JlZW5Db250
cm9sbGVyIHVwZGF0ZU1lbnVBbmREb2NrRm9yRnVsbHNjcmVlbl0pOgorICAgICAgICAqIHBsYXRm
b3JtL21hYy9XZWJXaW5kb3dBbmltYXRpb24ubW06CisgICAgICAgIChXZWJDb3JlOjpXZWJXaW5k
b3dBbmltYXRpb25EdXJhdGlvbkZyb21EdXJhdGlvbik6CisKIDIwMTgtMDItMDcgIFphbGFuIEJ1
anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbUmVuZGVyVHJlZUJ1aWxkZXJdIE1v
dmUgUmVuZGVyQmxvY2s6OnJlbW92ZUxlZnRvdmVyQW5vbnltb3VzQmxvY2sgdG8gUmVuZGVyVHJl
ZUJ1aWxkZXIKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL0V2ZW50SGFuZGxlck1hYy5t
bQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL21hYy9FdmVudEhhbmRsZXJNYWMu
bW0JKHJldmlzaW9uIDIyODIyNikKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL0V2ZW50SGFu
ZGxlck1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTk2LDYgKzE5Niw4IEBAIHN0YXRpYyBib29s
IGxhc3RFdmVudElzTW91c2VVcCgpCiAgICAgLy8gdGhhdCBzdGF0ZS4gSGFuZGxpbmcgdGhpcyB3
YXMgY3JpdGljYWwgd2hlbiB3ZSB1c2VkIEFwcEtpdCB3aWRnZXRzIGZvciBmb3JtIGVsZW1lbnRz
LgogICAgIC8vIEl0J3Mgbm90IGNsZWFyIGluIHdoYXQgY2FzZXMgdGhpcyBpcyBoZWxwZnVsIG5v
dyAtLSBpdCdzIHBvc3NpYmxlIGl0IGNhbiBiZSByZW1vdmVkLiAKIAorICAgIEFTU0VSVChbTlNB
cHAgaXNSdW5uaW5nXSk7CisKICAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlM7CiAgICAg
TlNFdmVudCAqY3VycmVudEV2ZW50QWZ0ZXJIYW5kbGluZ01vdXNlRG93biA9IFtOU0FwcCBjdXJy
ZW50RXZlbnRdOwogICAgIHJldHVybiBFdmVudEhhbmRsZXI6OmN1cnJlbnROU0V2ZW50KCkgIT0g
Y3VycmVudEV2ZW50QWZ0ZXJIYW5kbGluZ01vdXNlRG93bgpAQCAtNTcwLDYgKzU3Miw3IEBAIHZv
aWQgRXZlbnRIYW5kbGVyOjpzZW5kRmFrZUV2ZW50c0FmdGVyV2kKICAgICBtX3NlbmRpbmdFdmVu
dFRvU3VidmlldyA9IGZhbHNlOwogICAgIGludCBldmVudFR5cGUgPSBbaW5pdGlhdGluZ0V2ZW50
IHR5cGVdOwogICAgIGlmIChldmVudFR5cGUgPT0gTlNFdmVudFR5cGVMZWZ0TW91c2VEb3duIHx8
IGV2ZW50VHlwZSA9PSBOU0V2ZW50VHlwZUtleURvd24pIHsKKyAgICAgICAgQVNTRVJUKFtOU0Fw
cCBpc1J1bm5pbmddKTsKICAgICAgICAgTlNFdmVudCAqZmFrZUV2ZW50ID0gbmlsOwogICAgICAg
ICBpZiAoZXZlbnRUeXBlID09IE5TRXZlbnRUeXBlTGVmdE1vdXNlRG93bikgewogICAgICAgICAg
ICAgZmFrZUV2ZW50ID0gW05TRXZlbnQgbW91c2VFdmVudFdpdGhUeXBlOk5TRXZlbnRUeXBlTGVm
dE1vdXNlVXAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9FdmVudExvb3BNYWMu
bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0V2ZW50TG9vcE1h
Yy5tbQkocmV2aXNpb24gMjI4MjI2KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0V2
ZW50TG9vcE1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMzYsNiArMzYsNyBAQCB2b2lkIEV2ZW50
TG9vcDo6Y3ljbGUoKQogICAgICAgICByZXR1cm47CiAgICAgfQogI2VuZGlmCisgICAgQVNTRVJU
KFtOU0FwcCBpc1J1bm5pbmddKTsKICAgICBbTlNBcHAgc2V0V2luZG93c05lZWRVcGRhdGU6WUVT
XTsKICAgICBpZiAoTlNFdmVudCAqZXZlbnQgPSBbTlNBcHAgbmV4dEV2ZW50TWF0Y2hpbmdNYXNr
Ok5TRXZlbnRNYXNrQW55IHVudGlsRGF0ZTpbTlNEYXRlIGRhdGVXaXRoVGltZUludGVydmFsU2lu
Y2VOb3c6MC4wNV0gaW5Nb2RlOk5TRGVmYXVsdFJ1bkxvb3BNb2RlIGRlcXVldWU6WUVTXSkKICAg
ICAgICAgW05TQXBwIHNlbmRFdmVudDpldmVudF07CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0
Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w
bGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbQkocmV2aXNpb24gMjI4MjI2KQorKysgU291cmNl
L1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Bhc3RlYm9hcmRNYWMubW0JKHdvcmtpbmcgY29weSkKQEAg
LTY2MSw2ICs2NjEsNyBAQCB2b2lkIFBhc3RlYm9hcmQ6OnNldERyYWdJbWFnZShEcmFnSW1hZ2Ug
CiAgICAgLy8gVGhpcyBpcyB0aGUgbW9zdCBpbm5vY3VvdXMgZXZlbnQgdG8gdXNlLCBwZXIgS3Jp
c3RlbiBGb3JzdGVyLgogICAgIE5TRXZlbnQqIGV2ZW50ID0gW05TRXZlbnQgbW91c2VFdmVudFdp
dGhUeXBlOk5TRXZlbnRUeXBlTW91c2VNb3ZlZCBsb2NhdGlvbjpOU1plcm9Qb2ludAogICAgICAg
ICBtb2RpZmllckZsYWdzOjAgdGltZXN0YW1wOjAgd2luZG93TnVtYmVyOjAgY29udGV4dDpuaWwg
ZXZlbnROdW1iZXI6MCBjbGlja0NvdW50OjAgcHJlc3N1cmU6MF07CisgICAgQVNTRVJUKFtOU0Fw
cCBpc1J1bm5pbmddKTsKICAgICBbTlNBcHAgcG9zdEV2ZW50OmV2ZW50IGF0U3RhcnQ6WUVTXTsK
IH0KICNlbmRpZgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYlZpZGVvRnVs
bHNjcmVlbkNvbnRyb2xsZXIubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZv
cm0vbWFjL1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW0JKHJldmlzaW9uIDIyODIyNikK
KysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9s
bGVyLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xMDksNiArMTA5LDggQEAgLSAodm9pZCl3aW5kb3dE
aWRMb2FkCiAgICAgWyhOU1ZpZXcqKVt3aW5kb3cgY29udGVudFZpZXddIHNldExheWVyOltDQUxh
eWVyIGxheWVyXV07CiAgICAgW1t3aW5kb3cgY29udGVudFZpZXddIHNldFdhbnRzTGF5ZXI6WUVT
XTsKIAorICAgIEFTU0VSVChbTlNBcHAgaXNSdW5uaW5nXSk7CisKICAgICBbW05TTm90aWZpY2F0
aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIGFkZE9ic2VydmVyOnNlbGYgc2VsZWN0b3I6QHNlbGVj
dG9yKGFwcGxpY2F0aW9uRGlkUmVzaWduQWN0aXZlOikgbmFtZTpOU0FwcGxpY2F0aW9uRGlkUmVz
aWduQWN0aXZlTm90aWZpY2F0aW9uIG9iamVjdDpOU0FwcF07CiAgICAgW1tOU05vdGlmaWNhdGlv
bkNlbnRlciBkZWZhdWx0Q2VudGVyXSBhZGRPYnNlcnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3Rv
cihhcHBsaWNhdGlvbkRpZENoYW5nZVNjcmVlblBhcmFtZXRlcnM6KSBuYW1lOk5TQXBwbGljYXRp
b25EaWRDaGFuZ2VTY3JlZW5QYXJhbWV0ZXJzTm90aWZpY2F0aW9uIG9iamVjdDpOU0FwcF07CiB9
CkBAIC0zMzgsNiArMzQwLDcgQEAgLSAodm9pZCl1cGRhdGVNZW51QW5kRG9ja0ZvckZ1bGxzY3Jl
ZW4KICAgICAgICAgICAgIG9wdGlvbnMgfD0gTlNBcHBsaWNhdGlvblByZXNlbnRhdGlvbkF1dG9I
aWRlRG9jazsKICAgICB9CiAKKyAgICBBU1NFUlQoW05TQXBwIGlzUnVubmluZ10pOwogICAgIE5T
QXBwLnByZXNlbnRhdGlvbk9wdGlvbnMgPSBvcHRpb25zOwogfQogCkluZGV4OiBTb3VyY2UvV2Vi
Q29yZS9wbGF0Zm9ybS9tYWMvV2ViV2luZG93QW5pbWF0aW9uLm1tCj09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv
dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJXaW5kb3dBbmltYXRpb24ubW0JKHJldmlzaW9u
IDIyODIyNikKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJXaW5kb3dBbmltYXRp
b24ubW0JKHdvcmtpbmcgY29weSkKQEAgLTM4LDYgKzM4LDcgQEAgc3RhdGljIGNvbnN0IENHRmxv
YXQgc2xvd01vdGlvbkZhY3RvciA9IAogCiBzdGF0aWMgTlNUaW1lSW50ZXJ2YWwgV2ViV2luZG93
QW5pbWF0aW9uRHVyYXRpb25Gcm9tRHVyYXRpb24oTlNUaW1lSW50ZXJ2YWwgZHVyYXRpb24pCiB7
CisgICAgQVNTRVJUKFtOU0FwcCBpc1J1bm5pbmddKTsKICAgICByZXR1cm4gKFtbTlNBcHAgY3Vy
cmVudEV2ZW50XSBtb2RpZmllckZsYWdzXSAmIE5TRXZlbnRNb2RpZmllckZsYWdTaGlmdCkgPyBk
dXJhdGlvbiAqIHNsb3dNb3Rpb25GYWN0b3IgOiBkdXJhdGlvbjsKIH0KIAo=
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>333307</attachid>
            <date>2018-02-07 12:33:09 -0800</date>
            <delta_ts>2018-02-08 10:21:16 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-182553-20180207123309.patch</filename>
            <type>text/plain</type>
            <size>6672</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyODIzOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDE4LTAyLTA3ICBQZXIgQXJu
ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBBc3NlcnQgdGhhdCBOU0Fw
cCBpcyBub3QgcnVubmluZyBpbiB0aGUgV2ViUHJvY2Vzcy4KKyAgICAgICAgaHR0cHM6Ly9idWdz
LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjU1MworICAgICAgICA8cmRhcjovL3Byb2Js
ZW0vMzczMTYxNDQ+CisgICAgICAgIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh
KS4KKworICAgICAgICBJbiBXZWJDb3JlLCB0aGVyZSBhcmUgYSBmZXcgcGxhY2VzIHdoZXJlIE5T
QXBwIGlzIHJlZmVyZW5jZWQuIFNpbmNlIHRoZSBXZWJDb250ZW50IHByb2Nlc3MKKyAgICAgICAg
aXMgbm8gbG9uZ2VyIHVzaW5nIHRoZSBOU0FwcGxpY2F0aW9uIHJ1biBsb29wLCBhbmQgTlNBcHAg
aXMgbm8gbG9uZ2VyIGd1YXJhbnRlZWQgdG8gYmUKKyAgICAgICAgdmFsaWQsIHdlIHNob3VsZCBt
YWtlIHN1cmUgdGhhdCB0aGUgTlNBcHAgaXMgbm90IHJlZmVyZW5jZWQgYnkgdGhlIFdlYkNvbnRl
bnQgcHJvY2VzcyBvcgorICAgICAgICB0aGUgTmV0d29yayBwcm9jZXNzLCBieSBhc3NlcnRpbmcg
dGhhdCB0aGUgTlNBcHBsaWNhdGlvbiBldmVudCBsb29wIGlzIHJ1bm5pbmcgd2hlbiBOU0FwcAor
ICAgICAgICBpcyByZWZlcmVuY2VkLiBJdCBpcyBzdGlsbCBvayBmb3IgdGhlIFVJUHJvY2VzcyB0
byByZWZlcmVuY2UgTlNBcHAuIEFkZGluZyB0aGVzZSBhc3NlcnQKKyAgICAgICAgd2lsbCBoZWxw
IGNhdGNoIHJlZmVyZW5jZXMgdG8gTlNBcHAgd2hlbiB0aGUgTlNBcHBsaWNhdGlvbiBydW4gbG9v
cCBpcyBub3QgdXNlZC4KKyAgICAgICAgQWxzbywgZG8gbm90IHBvc3QgYSBmYWtlIG1vdXNlIGV2
ZW50IGluIFBhc3RlQm9hcmQ6OnNldERyYWdJbWFnZSB3aGVuIHRoZSBOU0FwcGxpY2F0aW9uCisg
ICAgICAgIHJ1biBsb29wIGlzIG5vdCBydW5uaW5nLCBzaW5jZSB0aGlzIGlzIG9ubHkgcmVsZXZh
bnQgaW4gV0sxLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgY292ZXJlZCBieSBleGlzdGluZyB0
ZXN0cy4gCisKKyAgICAgICAgKiBwYWdlL21hYy9FdmVudEhhbmRsZXJNYWMubW06CisgICAgICAg
IChXZWJDb3JlOjpsYXN0RXZlbnRJc01vdXNlVXApOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRI
YW5kbGVyOjpzZW5kRmFrZUV2ZW50c0FmdGVyV2lkZ2V0VHJhY2tpbmcpOgorICAgICAgICAqIHBs
YXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6UGFzdGVib2Fy
ZDo6c2V0RHJhZ0ltYWdlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvV2ViVmlkZW9GdWxsc2Ny
ZWVuQ29udHJvbGxlci5tbToKKyAgICAgICAgKC1bV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxl
ciB3aW5kb3dEaWRMb2FkXSk6CisgICAgICAgICgtW1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xs
ZXIgdXBkYXRlTWVudUFuZERvY2tGb3JGdWxsc2NyZWVuXSk6CisgICAgICAgICogcGxhdGZvcm0v
bWFjL1dlYldpbmRvd0FuaW1hdGlvbi5tbToKKyAgICAgICAgKFdlYkNvcmU6OldlYldpbmRvd0Fu
aW1hdGlvbkR1cmF0aW9uRnJvbUR1cmF0aW9uKToKKwogMjAxOC0wMi0wNyAgSm9obiBXaWxhbmRl
ciAgPHdpbGFuZGVyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXN0cmljdCBSZWZlcmVyIHRvIGp1
c3QgdGhlIG9yaWdpbiBmb3IgdGhpcmQgcGFydGllcyBpbiBwcml2YXRlIG1vZGUgYW5kIHRoaXJk
IHBhcnRpZXMgSVRQIGJsb2NrcyBjb29raWVzIGZvciBpbiByZWd1bGFyIG1vZGUKSW5kZXg6IFNv
dXJjZS9XZWJDb3JlL3BhZ2UvbWFjL0V2ZW50SGFuZGxlck1hYy5tbQo9PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT
b3VyY2UvV2ViQ29yZS9wYWdlL21hYy9FdmVudEhhbmRsZXJNYWMubW0JKHJldmlzaW9uIDIyODIz
OSkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL0V2ZW50SGFuZGxlck1hYy5tbQkod29ya2lu
ZyBjb3B5KQpAQCAtMTk2LDYgKzE5Niw4IEBAIHN0YXRpYyBib29sIGxhc3RFdmVudElzTW91c2VV
cCgpCiAgICAgLy8gdGhhdCBzdGF0ZS4gSGFuZGxpbmcgdGhpcyB3YXMgY3JpdGljYWwgd2hlbiB3
ZSB1c2VkIEFwcEtpdCB3aWRnZXRzIGZvciBmb3JtIGVsZW1lbnRzLgogICAgIC8vIEl0J3Mgbm90
IGNsZWFyIGluIHdoYXQgY2FzZXMgdGhpcyBpcyBoZWxwZnVsIG5vdyAtLSBpdCdzIHBvc3NpYmxl
IGl0IGNhbiBiZSByZW1vdmVkLiAKIAorICAgIEFTU0VSVChbTlNBcHAgaXNSdW5uaW5nXSk7CisK
ICAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlM7CiAgICAgTlNFdmVudCAqY3VycmVudEV2
ZW50QWZ0ZXJIYW5kbGluZ01vdXNlRG93biA9IFtOU0FwcCBjdXJyZW50RXZlbnRdOwogICAgIHJl
dHVybiBFdmVudEhhbmRsZXI6OmN1cnJlbnROU0V2ZW50KCkgIT0gY3VycmVudEV2ZW50QWZ0ZXJI
YW5kbGluZ01vdXNlRG93bgpAQCAtNTcwLDYgKzU3Miw3IEBAIHZvaWQgRXZlbnRIYW5kbGVyOjpz
ZW5kRmFrZUV2ZW50c0FmdGVyV2kKICAgICBtX3NlbmRpbmdFdmVudFRvU3VidmlldyA9IGZhbHNl
OwogICAgIGludCBldmVudFR5cGUgPSBbaW5pdGlhdGluZ0V2ZW50IHR5cGVdOwogICAgIGlmIChl
dmVudFR5cGUgPT0gTlNFdmVudFR5cGVMZWZ0TW91c2VEb3duIHx8IGV2ZW50VHlwZSA9PSBOU0V2
ZW50VHlwZUtleURvd24pIHsKKyAgICAgICAgQVNTRVJUKFtOU0FwcCBpc1J1bm5pbmddKTsKICAg
ICAgICAgTlNFdmVudCAqZmFrZUV2ZW50ID0gbmlsOwogICAgICAgICBpZiAoZXZlbnRUeXBlID09
IE5TRXZlbnRUeXBlTGVmdE1vdXNlRG93bikgewogICAgICAgICAgICAgZmFrZUV2ZW50ID0gW05T
RXZlbnQgbW91c2VFdmVudFdpdGhUeXBlOk5TRXZlbnRUeXBlTGVmdE1vdXNlVXAKSW5kZXg6IFNv
dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9FdmVudExvb3BNYWMubW0KPT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g
U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0V2ZW50TG9vcE1hYy5tbQkocmV2aXNpb24gMjI4
MjM5KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0V2ZW50TG9vcE1hYy5tbQkod29y
a2luZyBjb3B5KQpAQCAtMzYsNiArMzYsNyBAQCB2b2lkIEV2ZW50TG9vcDo6Y3ljbGUoKQogICAg
ICAgICByZXR1cm47CiAgICAgfQogI2VuZGlmCisgICAgQVNTRVJUKFtOU0FwcCBpc1J1bm5pbmdd
KTsKICAgICBbTlNBcHAgc2V0V2luZG93c05lZWRVcGRhdGU6WUVTXTsKICAgICBpZiAoTlNFdmVu
dCAqZXZlbnQgPSBbTlNBcHAgbmV4dEV2ZW50TWF0Y2hpbmdNYXNrOk5TRXZlbnRNYXNrQW55IHVu
dGlsRGF0ZTpbTlNEYXRlIGRhdGVXaXRoVGltZUludGVydmFsU2luY2VOb3c6MC4wNV0gaW5Nb2Rl
Ok5TRGVmYXVsdFJ1bkxvb3BNb2RlIGRlcXVldWU6WUVTXSkKICAgICAgICAgW05TQXBwIHNlbmRF
dmVudDpldmVudF07CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGFzdGVib2Fy
ZE1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGFzdGVi
b2FyZE1hYy5tbQkocmV2aXNpb24gMjI4MjM5KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v
bWFjL1Bhc3RlYm9hcmRNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTY1OSw5ICs2NTksMTQgQEAg
dm9pZCBQYXN0ZWJvYXJkOjpzZXREcmFnSW1hZ2UoRHJhZ0ltYWdlIAogICAgIC8vIEhhY2s6IFdl
IG11c3QgcG9zdCBhbiBldmVudCB0byB3YWtlIHVwIHRoZSBOU0RyYWdNYW5hZ2VyLCB3aGljaCBp
cyBzaXR0aW5nIGluIGEgbmV4dEV2ZW50IGNhbGwKICAgICAvLyB1cCB0aGUgc3RhY2sgZnJvbSB1
cyBiZWNhdXNlIHRoZSBDb3JlRm91bmRhdGlvbiBkcmFnIG1hbmFnZXIgZG9lcyBub3QgdXNlIHRo
ZSBydW4gbG9vcCBieSBpdHNlbGYuCiAgICAgLy8gVGhpcyBpcyB0aGUgbW9zdCBpbm5vY3VvdXMg
ZXZlbnQgdG8gdXNlLCBwZXIgS3Jpc3RlbiBGb3JzdGVyLgotICAgIE5TRXZlbnQqIGV2ZW50ID0g
W05TRXZlbnQgbW91c2VFdmVudFdpdGhUeXBlOk5TRXZlbnRUeXBlTW91c2VNb3ZlZCBsb2NhdGlv
bjpOU1plcm9Qb2ludAotICAgICAgICBtb2RpZmllckZsYWdzOjAgdGltZXN0YW1wOjAgd2luZG93
TnVtYmVyOjAgY29udGV4dDpuaWwgZXZlbnROdW1iZXI6MCBjbGlja0NvdW50OjAgcHJlc3N1cmU6
MF07Ci0gICAgW05TQXBwIHBvc3RFdmVudDpldmVudCBhdFN0YXJ0OllFU107CisgICAgLy8gVGhp
cyBpcyBvbmx5IHJlbGV2YW50IGluIFdLMS4gRG8gbm90IGV4ZWN1dGUgaW4gdGhlIFdlYkNvbnRl
bnQgcHJvY2Vzcywgc2luY2UgaXQgaXMgbm93IHVzaW5nCisgICAgLy8gTlNSdW5Mb29wLCBhbmQg
bm90IHRoZSBOU0FwcGxpY2F0aW9uIHJ1biBsb29wLgorICAgIGlmIChbTlNBcHAgaXNSdW5uaW5n
XSkgeworICAgICAgICBOU0V2ZW50KiBldmVudCA9IFtOU0V2ZW50IG1vdXNlRXZlbnRXaXRoVHlw
ZTpOU0V2ZW50VHlwZU1vdXNlTW92ZWQgbG9jYXRpb246TlNaZXJvUG9pbnQKKyAgICAgICAgICAg
IG1vZGlmaWVyRmxhZ3M6MCB0aW1lc3RhbXA6MCB3aW5kb3dOdW1iZXI6MCBjb250ZXh0Om5pbCBl
dmVudE51bWJlcjowIGNsaWNrQ291bnQ6MCBwcmVzc3VyZTowXTsKKyAgICAgICAgQVNTRVJUKFtO
U0FwcCBpc1J1bm5pbmddKTsKKyAgICAgICAgW05TQXBwIHBvc3RFdmVudDpldmVudCBhdFN0YXJ0
OllFU107CisgICAgfQogfQogI2VuZGlmCiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt
L21hYy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyLm1tCj09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj
ZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyLm1tCShy
ZXZpc2lvbiAyMjgyMzkpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvV2ViVmlkZW9G
dWxsc2NyZWVuQ29udHJvbGxlci5tbQkod29ya2luZyBjb3B5KQpAQCAtMTA5LDYgKzEwOSw4IEBA
IC0gKHZvaWQpd2luZG93RGlkTG9hZAogICAgIFsoTlNWaWV3Kilbd2luZG93IGNvbnRlbnRWaWV3
XSBzZXRMYXllcjpbQ0FMYXllciBsYXllcl1dOwogICAgIFtbd2luZG93IGNvbnRlbnRWaWV3XSBz
ZXRXYW50c0xheWVyOllFU107CiAKKyAgICBBU1NFUlQoW05TQXBwIGlzUnVubmluZ10pOworCiAg
ICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSBhZGRPYnNlcnZlcjpzZWxm
IHNlbGVjdG9yOkBzZWxlY3RvcihhcHBsaWNhdGlvbkRpZFJlc2lnbkFjdGl2ZTopIG5hbWU6TlNB
cHBsaWNhdGlvbkRpZFJlc2lnbkFjdGl2ZU5vdGlmaWNhdGlvbiBvYmplY3Q6TlNBcHBdOwogICAg
IFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gYWRkT2JzZXJ2ZXI6c2VsZiBz
ZWxlY3RvcjpAc2VsZWN0b3IoYXBwbGljYXRpb25EaWRDaGFuZ2VTY3JlZW5QYXJhbWV0ZXJzOikg
bmFtZTpOU0FwcGxpY2F0aW9uRGlkQ2hhbmdlU2NyZWVuUGFyYW1ldGVyc05vdGlmaWNhdGlvbiBv
YmplY3Q6TlNBcHBdOwogfQpAQCAtMzM4LDYgKzM0MCw3IEBAIC0gKHZvaWQpdXBkYXRlTWVudUFu
ZERvY2tGb3JGdWxsc2NyZWVuCiAgICAgICAgICAgICBvcHRpb25zIHw9IE5TQXBwbGljYXRpb25Q
cmVzZW50YXRpb25BdXRvSGlkZURvY2s7CiAgICAgfQogCisgICAgQVNTRVJUKFtOU0FwcCBpc1J1
bm5pbmddKTsKICAgICBOU0FwcC5wcmVzZW50YXRpb25PcHRpb25zID0gb3B0aW9uczsKIH0KIApJ
bmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYldpbmRvd0FuaW1hdGlvbi5tbQo9
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvV2ViV2luZG93QW5pbWF0
aW9uLm1tCShyZXZpc2lvbiAyMjgyMzkpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMv
V2ViV2luZG93QW5pbWF0aW9uLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zOCw2ICszOCw3IEBAIHN0
YXRpYyBjb25zdCBDR0Zsb2F0IHNsb3dNb3Rpb25GYWN0b3IgPSAKIAogc3RhdGljIE5TVGltZUlu
dGVydmFsIFdlYldpbmRvd0FuaW1hdGlvbkR1cmF0aW9uRnJvbUR1cmF0aW9uKE5TVGltZUludGVy
dmFsIGR1cmF0aW9uKQogeworICAgIEFTU0VSVChbTlNBcHAgaXNSdW5uaW5nXSk7CiAgICAgcmV0
dXJuIChbW05TQXBwIGN1cnJlbnRFdmVudF0gbW9kaWZpZXJGbGFnc10gJiBOU0V2ZW50TW9kaWZp
ZXJGbGFnU2hpZnQpID8gZHVyYXRpb24gKiBzbG93TW90aW9uRmFjdG9yIDogZHVyYXRpb247CiB9
CiAK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>333387</attachid>
            <date>2018-02-08 10:21:18 -0800</date>
            <delta_ts>2018-02-09 11:22:25 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-182553-20180208102117.patch</filename>
            <type>text/plain</type>
            <size>7104</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyODI3OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM4IEBACisyMDE4LTAyLTA4ICBQZXIgQXJu
ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBBc3NlcnQgdGhhdCBOU0Fw
cCBpcyBub3QgcnVubmluZyBpbiB0aGUgV2ViUHJvY2Vzcy4KKyAgICAgICAgaHR0cHM6Ly9idWdz
LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjU1MworICAgICAgICA8cmRhcjovL3Byb2Js
ZW0vMzczMTYxNDQ+CisgICAgICAgIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh
KS4KKworICAgICAgICBJbiBXZWJDb3JlLCB0aGVyZSBhcmUgYSBmZXcgcGxhY2VzIHdoZXJlIE5T
QXBwIGlzIHJlZmVyZW5jZWQuIFNpbmNlIHRoZSBXZWJDb250ZW50IHByb2Nlc3MKKyAgICAgICAg
aXMgbm8gbG9uZ2VyIHVzaW5nIHRoZSBOU0FwcGxpY2F0aW9uIHJ1biBsb29wLCBhbmQgTlNBcHAg
aXMgbm8gbG9uZ2VyIGd1YXJhbnRlZWQgdG8gYmUKKyAgICAgICAgdmFsaWQsIHdlIHNob3VsZCBt
YWtlIHN1cmUgdGhhdCB0aGUgTlNBcHAgaXMgbm90IHJlZmVyZW5jZWQgYnkgdGhlIFdlYkNvbnRl
bnQgcHJvY2VzcyBvcgorICAgICAgICB0aGUgTmV0d29yayBwcm9jZXNzLCBieSBhc3NlcnRpbmcg
dGhhdCB0aGUgTlNBcHBsaWNhdGlvbiBldmVudCBsb29wIGlzIHJ1bm5pbmcgd2hlbiBOU0FwcAor
ICAgICAgICBpcyByZWZlcmVuY2VkLiBJdCBpcyBzdGlsbCBvayBmb3IgdGhlIFVJUHJvY2VzcyB0
byByZWZlcmVuY2UgTlNBcHAuIEFkZGluZyB0aGVzZSBhc3NlcnQKKyAgICAgICAgd2lsbCBoZWxw
IGNhdGNoIHJlZmVyZW5jZXMgdG8gTlNBcHAgd2hlbiB0aGUgTlNBcHBsaWNhdGlvbiBydW4gbG9v
cCBpcyBub3QgdXNlZC4KKworICAgICAgICBBbHNvLCBkbyBub3QgcG9zdCBhIGZha2UgbW91c2Ug
ZXZlbnQgaW4gUGFzdGVCb2FyZDo6c2V0RHJhZ0ltYWdlIHdoZW4gdGhlIE5TQXBwbGljYXRpb24K
KyAgICAgICAgcnVuIGxvb3AgaXMgbm90IHJ1bm5pbmcsIHNpbmNlIHRoaXMgaXMgb25seSByZWxl
dmFudCBpbiBXSzEuCisKKyAgICAgICAgVGhlIGZ1bmN0aW9uIFdlYldpbmRvd0FuaW1hdGlvbkR1
cmF0aW9uRnJvbUR1cmF0aW9uIGlzIGNhbGxlZCBkdXJpbmcgV0sxIGZ1bGxzY3JlZW4gQVBJCisg
ICAgICAgIHRlc3RzLCBhbmQgc2luY2UgdGhlc2UgdGVzdHMgYXJlIG5vdCBydW5uaW5nIHRoZSBO
U0FwcGxpY2F0aW9uIGV2ZW50IGxvb3AsIGFkZCBhIGNoZWNrCisgICAgICAgIGZvciB3aGV0aGVy
IE5TQXBwbGljYXRpb24gaXMgcnVubmluZyB0aGVyZS4KKworICAgICAgICBObyBuZXcgdGVzdHMs
IGNvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuIAorCisgICAgICAgICogcGFnZS9tYWMvRXZlbnRI
YW5kbGVyTWFjLm1tOgorICAgICAgICAoV2ViQ29yZTo6bGFzdEV2ZW50SXNNb3VzZVVwKToKKyAg
ICAgICAgKFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6c2VuZEZha2VFdmVudHNBZnRlcldpZGdldFRy
YWNraW5nKToKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbToKKyAgICAg
ICAgKFdlYkNvcmU6OlBhc3RlYm9hcmQ6OnNldERyYWdJbWFnZSk6CisgICAgICAgICogcGxhdGZv
cm0vbWFjL1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW06CisgICAgICAgICgtW1dlYlZp
ZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIgd2luZG93RGlkTG9hZF0pOgorICAgICAgICAoLVtXZWJW
aWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyIHVwZGF0ZU1lbnVBbmREb2NrRm9yRnVsbHNjcmVlbl0p
OgorICAgICAgICAqIHBsYXRmb3JtL21hYy9XZWJXaW5kb3dBbmltYXRpb24ubW06CisgICAgICAg
IChXZWJDb3JlOjpXZWJXaW5kb3dBbmltYXRpb25EdXJhdGlvbkZyb21EdXJhdGlvbik6CisKIDIw
MTgtMDItMDggIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJl
dmlld2VkLCB0aW55IHBhcnRpYWwgcm9sbG91dCBvZiByMjI4MjYwIGFzIGl0IGNhdXNlZCBzb21l
IHdvcmtlciBmYWlsdXJlcwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9tYWMvRXZlbnRIYW5k
bGVyTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL0V2ZW50SGFu
ZGxlck1hYy5tbQkocmV2aXNpb24gMjI4Mjc4KQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9tYWMv
RXZlbnRIYW5kbGVyTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xOTYsNiArMTk2LDggQEAgc3Rh
dGljIGJvb2wgbGFzdEV2ZW50SXNNb3VzZVVwKCkKICAgICAvLyB0aGF0IHN0YXRlLiBIYW5kbGlu
ZyB0aGlzIHdhcyBjcml0aWNhbCB3aGVuIHdlIHVzZWQgQXBwS2l0IHdpZGdldHMgZm9yIGZvcm0g
ZWxlbWVudHMuCiAgICAgLy8gSXQncyBub3QgY2xlYXIgaW4gd2hhdCBjYXNlcyB0aGlzIGlzIGhl
bHBmdWwgbm93IC0tIGl0J3MgcG9zc2libGUgaXQgY2FuIGJlIHJlbW92ZWQuIAogCisgICAgQVNT
RVJUKFtOU0FwcCBpc1J1bm5pbmddKTsKKwogICAgIEJFR0lOX0JMT0NLX09CSkNfRVhDRVBUSU9O
UzsKICAgICBOU0V2ZW50ICpjdXJyZW50RXZlbnRBZnRlckhhbmRsaW5nTW91c2VEb3duID0gW05T
QXBwIGN1cnJlbnRFdmVudF07CiAgICAgcmV0dXJuIEV2ZW50SGFuZGxlcjo6Y3VycmVudE5TRXZl
bnQoKSAhPSBjdXJyZW50RXZlbnRBZnRlckhhbmRsaW5nTW91c2VEb3duCkBAIC01NzAsNiArNTcy
LDcgQEAgdm9pZCBFdmVudEhhbmRsZXI6OnNlbmRGYWtlRXZlbnRzQWZ0ZXJXaQogICAgIG1fc2Vu
ZGluZ0V2ZW50VG9TdWJ2aWV3ID0gZmFsc2U7CiAgICAgaW50IGV2ZW50VHlwZSA9IFtpbml0aWF0
aW5nRXZlbnQgdHlwZV07CiAgICAgaWYgKGV2ZW50VHlwZSA9PSBOU0V2ZW50VHlwZUxlZnRNb3Vz
ZURvd24gfHwgZXZlbnRUeXBlID09IE5TRXZlbnRUeXBlS2V5RG93bikgeworICAgICAgICBBU1NF
UlQoW05TQXBwIGlzUnVubmluZ10pOwogICAgICAgICBOU0V2ZW50ICpmYWtlRXZlbnQgPSBuaWw7
CiAgICAgICAgIGlmIChldmVudFR5cGUgPT0gTlNFdmVudFR5cGVMZWZ0TW91c2VEb3duKSB7CiAg
ICAgICAgICAgICBmYWtlRXZlbnQgPSBbTlNFdmVudCBtb3VzZUV2ZW50V2l0aFR5cGU6TlNFdmVu
dFR5cGVMZWZ0TW91c2VVcApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0V2ZW50
TG9vcE1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvRXZl
bnRMb29wTWFjLm1tCShyZXZpc2lvbiAyMjgyNzgpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y
bS9tYWMvRXZlbnRMb29wTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zNiw2ICszNiw3IEBAIHZv
aWQgRXZlbnRMb29wOjpjeWNsZSgpCiAgICAgICAgIHJldHVybjsKICAgICB9CiAjZW5kaWYKKyAg
ICBBU1NFUlQoW05TQXBwIGlzUnVubmluZ10pOwogICAgIFtOU0FwcCBzZXRXaW5kb3dzTmVlZFVw
ZGF0ZTpZRVNdOwogICAgIGlmIChOU0V2ZW50ICpldmVudCA9IFtOU0FwcCBuZXh0RXZlbnRNYXRj
aGluZ01hc2s6TlNFdmVudE1hc2tBbnkgdW50aWxEYXRlOltOU0RhdGUgZGF0ZVdpdGhUaW1lSW50
ZXJ2YWxTaW5jZU5vdzowLjA1XSBpbk1vZGU6TlNEZWZhdWx0UnVuTG9vcE1vZGUgZGVxdWV1ZTpZ
RVNdKQogICAgICAgICBbTlNBcHAgc2VuZEV2ZW50OmV2ZW50XTsKSW5kZXg6IFNvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X
ZWJDb3JlL3BsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tCShyZXZpc2lvbiAyMjgyNzgpCisr
KyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbQkod29ya2luZyBj
b3B5KQpAQCAtNjU5LDkgKzY1OSwxNCBAQCB2b2lkIFBhc3RlYm9hcmQ6OnNldERyYWdJbWFnZShE
cmFnSW1hZ2UgCiAgICAgLy8gSGFjazogV2UgbXVzdCBwb3N0IGFuIGV2ZW50IHRvIHdha2UgdXAg
dGhlIE5TRHJhZ01hbmFnZXIsIHdoaWNoIGlzIHNpdHRpbmcgaW4gYSBuZXh0RXZlbnQgY2FsbAog
ICAgIC8vIHVwIHRoZSBzdGFjayBmcm9tIHVzIGJlY2F1c2UgdGhlIENvcmVGb3VuZGF0aW9uIGRy
YWcgbWFuYWdlciBkb2VzIG5vdCB1c2UgdGhlIHJ1biBsb29wIGJ5IGl0c2VsZi4KICAgICAvLyBU
aGlzIGlzIHRoZSBtb3N0IGlubm9jdW91cyBldmVudCB0byB1c2UsIHBlciBLcmlzdGVuIEZvcnN0
ZXIuCi0gICAgTlNFdmVudCogZXZlbnQgPSBbTlNFdmVudCBtb3VzZUV2ZW50V2l0aFR5cGU6TlNF
dmVudFR5cGVNb3VzZU1vdmVkIGxvY2F0aW9uOk5TWmVyb1BvaW50Ci0gICAgICAgIG1vZGlmaWVy
RmxhZ3M6MCB0aW1lc3RhbXA6MCB3aW5kb3dOdW1iZXI6MCBjb250ZXh0Om5pbCBldmVudE51bWJl
cjowIGNsaWNrQ291bnQ6MCBwcmVzc3VyZTowXTsKLSAgICBbTlNBcHAgcG9zdEV2ZW50OmV2ZW50
IGF0U3RhcnQ6WUVTXTsKKyAgICAvLyBUaGlzIGlzIG9ubHkgcmVsZXZhbnQgaW4gV0sxLiBEbyBu
b3QgZXhlY3V0ZSBpbiB0aGUgV2ViQ29udGVudCBwcm9jZXNzLCBzaW5jZSBpdCBpcyBub3cgdXNp
bmcKKyAgICAvLyBOU1J1bkxvb3AsIGFuZCBub3QgdGhlIE5TQXBwbGljYXRpb24gcnVuIGxvb3Au
CisgICAgaWYgKFtOU0FwcCBpc1J1bm5pbmddKSB7CisgICAgICAgIE5TRXZlbnQqIGV2ZW50ID0g
W05TRXZlbnQgbW91c2VFdmVudFdpdGhUeXBlOk5TRXZlbnRUeXBlTW91c2VNb3ZlZCBsb2NhdGlv
bjpOU1plcm9Qb2ludAorICAgICAgICAgICAgbW9kaWZpZXJGbGFnczowIHRpbWVzdGFtcDowIHdp
bmRvd051bWJlcjowIGNvbnRleHQ6bmlsIGV2ZW50TnVtYmVyOjAgY2xpY2tDb3VudDowIHByZXNz
dXJlOjBdOworICAgICAgICBBU1NFUlQoW05TQXBwIGlzUnVubmluZ10pOworICAgICAgICBbTlNB
cHAgcG9zdEV2ZW50OmV2ZW50IGF0U3RhcnQ6WUVTXTsKKyAgICB9CiB9CiAjZW5kaWYKIApJbmRl
eDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xs
ZXIubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYlZpZGVv
RnVsbHNjcmVlbkNvbnRyb2xsZXIubW0JKHJldmlzaW9uIDIyODI3OCkKKysrIFNvdXJjZS9XZWJD
b3JlL3BsYXRmb3JtL21hYy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyLm1tCSh3b3JraW5n
IGNvcHkpCkBAIC0xMDksNiArMTA5LDggQEAgLSAodm9pZCl3aW5kb3dEaWRMb2FkCiAgICAgWyhO
U1ZpZXcqKVt3aW5kb3cgY29udGVudFZpZXddIHNldExheWVyOltDQUxheWVyIGxheWVyXV07CiAg
ICAgW1t3aW5kb3cgY29udGVudFZpZXddIHNldFdhbnRzTGF5ZXI6WUVTXTsKIAorICAgIEFTU0VS
VChbTlNBcHAgaXNSdW5uaW5nXSk7CisKICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1
bHRDZW50ZXJdIGFkZE9ic2VydmVyOnNlbGYgc2VsZWN0b3I6QHNlbGVjdG9yKGFwcGxpY2F0aW9u
RGlkUmVzaWduQWN0aXZlOikgbmFtZTpOU0FwcGxpY2F0aW9uRGlkUmVzaWduQWN0aXZlTm90aWZp
Y2F0aW9uIG9iamVjdDpOU0FwcF07CiAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0
Q2VudGVyXSBhZGRPYnNlcnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3RvcihhcHBsaWNhdGlvbkRp
ZENoYW5nZVNjcmVlblBhcmFtZXRlcnM6KSBuYW1lOk5TQXBwbGljYXRpb25EaWRDaGFuZ2VTY3Jl
ZW5QYXJhbWV0ZXJzTm90aWZpY2F0aW9uIG9iamVjdDpOU0FwcF07CiB9CkBAIC0zMzgsNiArMzQw
LDcgQEAgLSAodm9pZCl1cGRhdGVNZW51QW5kRG9ja0ZvckZ1bGxzY3JlZW4KICAgICAgICAgICAg
IG9wdGlvbnMgfD0gTlNBcHBsaWNhdGlvblByZXNlbnRhdGlvbkF1dG9IaWRlRG9jazsKICAgICB9
CiAKKyAgICBBU1NFUlQoW05TQXBwIGlzUnVubmluZ10pOwogICAgIE5TQXBwLnByZXNlbnRhdGlv
bk9wdGlvbnMgPSBvcHRpb25zOwogfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9t
YWMvV2ViV2luZG93QW5pbWF0aW9uLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Bs
YXRmb3JtL21hYy9XZWJXaW5kb3dBbmltYXRpb24ubW0JKHJldmlzaW9uIDIyODI3OCkKKysrIFNv
dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJXaW5kb3dBbmltYXRpb24ubW0JKHdvcmtpbmcg
Y29weSkKQEAgLTM4LDcgKzM4LDggQEAgc3RhdGljIGNvbnN0IENHRmxvYXQgc2xvd01vdGlvbkZh
Y3RvciA9IAogCiBzdGF0aWMgTlNUaW1lSW50ZXJ2YWwgV2ViV2luZG93QW5pbWF0aW9uRHVyYXRp
b25Gcm9tRHVyYXRpb24oTlNUaW1lSW50ZXJ2YWwgZHVyYXRpb24pCiB7Ci0gICAgcmV0dXJuIChb
W05TQXBwIGN1cnJlbnRFdmVudF0gbW9kaWZpZXJGbGFnc10gJiBOU0V2ZW50TW9kaWZpZXJGbGFn
U2hpZnQpID8gZHVyYXRpb24gKiBzbG93TW90aW9uRmFjdG9yIDogZHVyYXRpb247CisgICAgTlNV
SW50ZWdlciBtb2RpZmllcnMgPSBbTlNBcHAgaXNSdW5uaW5nXSA/IFtbTlNBcHAgY3VycmVudEV2
ZW50XSBtb2RpZmllckZsYWdzXSA6IDA7CisgICAgcmV0dXJuIChtb2RpZmllcnMgJiBOU0V2ZW50
TW9kaWZpZXJGbGFnU2hpZnQpID8gZHVyYXRpb24gKiBzbG93TW90aW9uRmFjdG9yIDogZHVyYXRp
b247CiB9CiAKIHN0YXRpYyBOU1JlY3Qgc2NhbGVkUmVjdChOU1JlY3QgX2luaXRpYWxGcmFtZSwg
TlNSZWN0IF9maW5hbEZyYW1lLCBDR0Zsb2F0IGZhY3RvcikK
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>333503</attachid>
            <date>2018-02-09 11:24:37 -0800</date>
            <delta_ts>2018-02-09 14:13:05 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-182553-20180209112436.patch</filename>
            <type>text/plain</type>
            <size>4152</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi
Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyODMzMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n
ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDE4LTAyLTA5ICBQZXIgQXJu
ZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBBc3NlcnQgdGhhdCBOU0Fw
cCBpcyBub3QgcnVubmluZyBpbiB0aGUgV2ViUHJvY2Vzcy4KKyAgICAgICAgaHR0cHM6Ly9idWdz
LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjU1MworCisgICAgICAgIFJldmlld2VkIGJ5
IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIFdlYkNvcmUsIHRoZXJlIGFyZSBhIGZldyBw
bGFjZXMgd2hlcmUgTlNBcHAgaXMgcmVmZXJlbmNlZC4gU2luY2UgdGhlIFdlYkNvbnRlbnQgcHJv
Y2VzcworICAgICAgICBpcyBubyBsb25nZXIgdXNpbmcgdGhlIE5TQXBwbGljYXRpb24gcnVuIGxv
b3AsIGFuZCBOU0FwcCBpcyBubyBsb25nZXIgZ3VhcmFudGVlZCB0byBiZQorICAgICAgICB2YWxp
ZCwgd2Ugc2hvdWxkIG1ha2Ugc3VyZSB0aGF0IHRoZSBOU0FwcCBpcyBub3QgcmVmZXJlbmNlZCBi
eSB0aGUgV2ViQ29udGVudCBwcm9jZXNzIG9yCisgICAgICAgIHRoZSBOZXR3b3JrIHByb2Nlc3Ms
IGJ5IGFzc2VydGluZyB0aGF0IHRoZSBOU0FwcGxpY2F0aW9uIGV2ZW50IGxvb3AgaXMgcnVubmlu
ZyB3aGVuIE5TQXBwCisgICAgICAgIGlzIHJlZmVyZW5jZWQuIEl0IGlzIHN0aWxsIG9rIGZvciB0
aGUgVUlQcm9jZXNzIHRvIHJlZmVyZW5jZSBOU0FwcC4gQWRkaW5nIHRoZXNlIGFzc2VydAorICAg
ICAgICB3aWxsIGhlbHAgY2F0Y2ggTlNBcHAgcmVmZXJlbmNlcyB3aGVuIHRoZSBOU0FwcGxpY2F0
aW9uIHJ1biBsb29wIGlzIG5vdCB1c2VkLgorCisgICAgICAgIEFsc28sIGRvIG5vdCBwb3N0IGEg
ZmFrZSBtb3VzZSBldmVudCBpbiBQYXN0ZUJvYXJkOjpzZXREcmFnSW1hZ2Ugd2hlbiB0aGUgTlNB
cHBsaWNhdGlvbgorICAgICAgICBydW4gbG9vcCBpcyBub3QgcnVubmluZywgc2luY2UgdGhpcyBp
cyBvbmx5IHJlbGV2YW50IGluIFdLMS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIGNvdmVyZWQg
YnkgZXhpc3RpbmcgdGVzdHMuIAorCisgICAgICAgICogcGFnZS9tYWMvRXZlbnRIYW5kbGVyTWFj
Lm1tOgorICAgICAgICAoV2ViQ29yZTo6bGFzdEV2ZW50SXNNb3VzZVVwKToKKyAgICAgICAgKFdl
YkNvcmU6OkV2ZW50SGFuZGxlcjo6c2VuZEZha2VFdmVudHNBZnRlcldpZGdldFRyYWNraW5nKToK
KyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbToKKyAgICAgICAgKFdlYkNv
cmU6OlBhc3RlYm9hcmQ6OnNldERyYWdJbWFnZSk6CisKIDIwMTgtMDItMDggIEFudG9pbmUgUXVp
bnQgIDxncmFvdXRzQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2ViIEFuaW1hdGlvbnNdIFJlZmFj
dG9yIEFuaW1hdGlvbkVmZmVjdCBhbmQgS2V5ZnJhbWVFZmZlY3QgaW50byBBbmltYXRpb25FZmZl
Y3RSZWFkT25seSwgS2V5ZnJhbWVFZmZlY3RSZWFkT25seSBhbmQgS2V5ZnJhbWVFZmZlY3QKSW5k
ZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL0V2ZW50SGFuZGxlck1hYy5tbQo9PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL21hYy9FdmVudEhhbmRsZXJNYWMubW0JKHJldmlzaW9u
IDIyODMyOSkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvbWFjL0V2ZW50SGFuZGxlck1hYy5tbQko
d29ya2luZyBjb3B5KQpAQCAtMTk2LDYgKzE5Niw4IEBAIHN0YXRpYyBib29sIGxhc3RFdmVudElz
TW91c2VVcCgpCiAgICAgLy8gdGhhdCBzdGF0ZS4gSGFuZGxpbmcgdGhpcyB3YXMgY3JpdGljYWwg
d2hlbiB3ZSB1c2VkIEFwcEtpdCB3aWRnZXRzIGZvciBmb3JtIGVsZW1lbnRzLgogICAgIC8vIEl0
J3Mgbm90IGNsZWFyIGluIHdoYXQgY2FzZXMgdGhpcyBpcyBoZWxwZnVsIG5vdyAtLSBpdCdzIHBv
c3NpYmxlIGl0IGNhbiBiZSByZW1vdmVkLiAKIAorICAgIEFTU0VSVChbTlNBcHAgaXNSdW5uaW5n
XSk7CisKICAgICBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlM7CiAgICAgTlNFdmVudCAqY3Vy
cmVudEV2ZW50QWZ0ZXJIYW5kbGluZ01vdXNlRG93biA9IFtOU0FwcCBjdXJyZW50RXZlbnRdOwog
ICAgIHJldHVybiBFdmVudEhhbmRsZXI6OmN1cnJlbnROU0V2ZW50KCkgIT0gY3VycmVudEV2ZW50
QWZ0ZXJIYW5kbGluZ01vdXNlRG93bgpAQCAtNTcwLDYgKzU3Miw3IEBAIHZvaWQgRXZlbnRIYW5k
bGVyOjpzZW5kRmFrZUV2ZW50c0FmdGVyV2kKICAgICBtX3NlbmRpbmdFdmVudFRvU3VidmlldyA9
IGZhbHNlOwogICAgIGludCBldmVudFR5cGUgPSBbaW5pdGlhdGluZ0V2ZW50IHR5cGVdOwogICAg
IGlmIChldmVudFR5cGUgPT0gTlNFdmVudFR5cGVMZWZ0TW91c2VEb3duIHx8IGV2ZW50VHlwZSA9
PSBOU0V2ZW50VHlwZUtleURvd24pIHsKKyAgICAgICAgQVNTRVJUKFtOU0FwcCBpc1J1bm5pbmdd
KTsKICAgICAgICAgTlNFdmVudCAqZmFrZUV2ZW50ID0gbmlsOwogICAgICAgICBpZiAoZXZlbnRU
eXBlID09IE5TRXZlbnRUeXBlTGVmdE1vdXNlRG93bikgewogICAgICAgICAgICAgZmFrZUV2ZW50
ID0gW05TRXZlbnQgbW91c2VFdmVudFdpdGhUeXBlOk5TRXZlbnRUeXBlTGVmdE1vdXNlVXAKSW5k
ZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tCj09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tCShyZXZp
c2lvbiAyMjgzMjkpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1h
Yy5tbQkod29ya2luZyBjb3B5KQpAQCAtNjU4LDEwICs2NTgsMTQgQEAgdm9pZCBQYXN0ZWJvYXJk
OjpzZXREcmFnSW1hZ2UoRHJhZ0ltYWdlIAogCiAgICAgLy8gSGFjazogV2UgbXVzdCBwb3N0IGFu
IGV2ZW50IHRvIHdha2UgdXAgdGhlIE5TRHJhZ01hbmFnZXIsIHdoaWNoIGlzIHNpdHRpbmcgaW4g
YSBuZXh0RXZlbnQgY2FsbAogICAgIC8vIHVwIHRoZSBzdGFjayBmcm9tIHVzIGJlY2F1c2UgdGhl
IENvcmVGb3VuZGF0aW9uIGRyYWcgbWFuYWdlciBkb2VzIG5vdCB1c2UgdGhlIHJ1biBsb29wIGJ5
IGl0c2VsZi4KLSAgICAvLyBUaGlzIGlzIHRoZSBtb3N0IGlubm9jdW91cyBldmVudCB0byB1c2Us
IHBlciBLcmlzdGVuIEZvcnN0ZXIuCi0gICAgTlNFdmVudCogZXZlbnQgPSBbTlNFdmVudCBtb3Vz
ZUV2ZW50V2l0aFR5cGU6TlNFdmVudFR5cGVNb3VzZU1vdmVkIGxvY2F0aW9uOk5TWmVyb1BvaW50
Ci0gICAgICAgIG1vZGlmaWVyRmxhZ3M6MCB0aW1lc3RhbXA6MCB3aW5kb3dOdW1iZXI6MCBjb250
ZXh0Om5pbCBldmVudE51bWJlcjowIGNsaWNrQ291bnQ6MCBwcmVzc3VyZTowXTsKLSAgICBbTlNB
cHAgcG9zdEV2ZW50OmV2ZW50IGF0U3RhcnQ6WUVTXTsKKyAgICAvLyBUaGlzIGlzIHRoZSBtb3N0
IGlubm9jdW91cyBldmVudCB0byB1c2UsIHBlciBLcmlzdGluIEZvcnN0ZXIuCisgICAgLy8gVGhp
cyBpcyBvbmx5IHJlbGV2YW50IGluIFdLMS4gRG8gbm90IGV4ZWN1dGUgaW4gdGhlIFdlYkNvbnRl
bnQgcHJvY2Vzcywgc2luY2UgaXQgaXMgbm93IHVzaW5nCisgICAgLy8gTlNSdW5Mb29wLCBhbmQg
bm90IHRoZSBOU0FwcGxpY2F0aW9uIHJ1biBsb29wLgorICAgIGlmIChbTlNBcHAgaXNSdW5uaW5n
XSkgeworICAgICAgICBOU0V2ZW50KiBldmVudCA9IFtOU0V2ZW50IG1vdXNlRXZlbnRXaXRoVHlw
ZTpOU0V2ZW50VHlwZU1vdXNlTW92ZWQgbG9jYXRpb246TlNaZXJvUG9pbnQKKyAgICAgICAgICAg
IG1vZGlmaWVyRmxhZ3M6MCB0aW1lc3RhbXA6MCB3aW5kb3dOdW1iZXI6MCBjb250ZXh0Om5pbCBl
dmVudE51bWJlcjowIGNsaWNrQ291bnQ6MCBwcmVzc3VyZTowXTsKKyAgICAgICAgW05TQXBwIHBv
c3RFdmVudDpldmVudCBhdFN0YXJ0OllFU107CisgICAgfQogfQogI2VuZGlmCiAK
</data>

          </attachment>
      

    </bug>

</bugzilla>