<?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>219428</bug_id>
          
          <creation_ts>2020-12-02 05:04:06 -0800</creation_ts>
          <short_desc>Add sandbox extension flag to specify that path contains no symlinks</short_desc>
          <delta_ts>2021-05-06 11:40:15 -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>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>benjamin</cc>
    
    <cc>bfulgham</cc>
    
    <cc>cdumez</cc>
    
    <cc>cmarcelo</cc>
    
    <cc>ews-watchlist</cc>
    
    <cc>webkit-bug-importer</cc>
          

      

      

      

          <comment_sort_order>oldest_to_newest</comment_sort_order>  
          <long_desc isprivate="0" >
    <commentid>1711305</commentid>
    <comment_count>0</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-12-02 05:04:06 -0800</bug_when>
    <thetext>In general, when SandboxExtension::createHandleWithoutResolvingPath is called, it is assumed that there are no symlinks in the provided path. Add a &apos;canonical&apos; flag, which can be used by platform APIs to verify that this is the case.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1711306</commentid>
    <comment_count>1</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-12-02 05:04:44 -0800</bug_when>
    <thetext>&lt;rdar://problem/66551986&gt;</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1711307</commentid>
    <comment_count>2</comment_count>
      <attachid>415213</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-12-02 05:09:02 -0800</bug_when>
    <thetext>Created attachment 415213
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1711308</commentid>
    <comment_count>3</comment_count>
      <attachid>415214</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-12-02 05:11:36 -0800</bug_when>
    <thetext>Created attachment 415214
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1711330</commentid>
    <comment_count>4</comment_count>
      <attachid>415222</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-12-02 07:19:30 -0800</bug_when>
    <thetext>Created attachment 415222
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1711357</commentid>
    <comment_count>5</comment_count>
      <attachid>415222</attachid>
    <who name="Alexey Proskuryakov">ap</who>
    <bug_when>2020-12-02 09:29:54 -0800</bug_when>
    <thetext>Comment on attachment 415222
Patch

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

Is the API test failure real?

&gt; Source/WebKit/Shared/Cocoa/SandboxExtensionCocoa.mm:97
&gt; +        if (flags &amp; SandboxExtension::Flags::Canonical)
&gt; +            extensionFlags |= SANDBOX_EXTENSION_CANONICAL;

If I understand what this does correctly, then the naming is actively misleading. Putting a &quot;canonical&quot; flag on an extension means that it is canonical. But we cannot guarantee that, and that&apos;s the whole purpose of adding the flag!

The difference between &quot;is canonical&quot; and &quot;do not canonicalize&quot; is subtle and even non-existent when everything goes well, but maintaining this difference is how we defend against attacks.

I think that we should have another pass at the naming, and do better than mirror an SPI name.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1711626</commentid>
    <comment_count>6</comment_count>
      <attachid>415283</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-12-03 01:21:29 -0800</bug_when>
    <thetext>Created attachment 415283
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1711627</commentid>
    <comment_count>7</comment_count>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-12-03 01:23:46 -0800</bug_when>
    <thetext>(In reply to Alexey Proskuryakov from comment #5)
&gt; Comment on attachment 415222 [details]
&gt; Patch
&gt; 
&gt; View in context:
&gt; https://bugs.webkit.org/attachment.cgi?id=415222&amp;action=review
&gt; 
&gt; Is the API test failure real?
&gt; 

Yes, should be fixed in latest patch.

&gt; &gt; Source/WebKit/Shared/Cocoa/SandboxExtensionCocoa.mm:97
&gt; &gt; +        if (flags &amp; SandboxExtension::Flags::Canonical)
&gt; &gt; +            extensionFlags |= SANDBOX_EXTENSION_CANONICAL;
&gt; 
&gt; If I understand what this does correctly, then the naming is actively
&gt; misleading. Putting a &quot;canonical&quot; flag on an extension means that it is
&gt; canonical. But we cannot guarantee that, and that&apos;s the whole purpose of
&gt; adding the flag!
&gt; 
&gt; The difference between &quot;is canonical&quot; and &quot;do not canonicalize&quot; is subtle
&gt; and even non-existent when everything goes well, but maintaining this
&gt; difference is how we defend against attacks.
&gt; 
&gt; I think that we should have another pass at the naming, and do better than
&gt; mirror an SPI name.

That is a good point. I have proposed a new name in the latest patch.

Thanks for reviewing!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1711638</commentid>
    <comment_count>8</comment_count>
      <attachid>415288</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2020-12-03 02:30:06 -0800</bug_when>
    <thetext>Created attachment 415288
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1711791</commentid>
    <comment_count>9</comment_count>
      <attachid>415288</attachid>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2020-12-03 13:29:43 -0800</bug_when>
    <thetext>Comment on attachment 415288
Patch

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

I reviewed this with Coops and I think it looks good. r=me.

&gt; Source/WebKit/Shared/Cocoa/SandboxExtensionCocoa.mm:277
&gt; +    handle.m_sandboxExtension = SandboxExtensionImpl::create(path.utf8().data(), type, WTF::nullopt,  SandboxExtension::Flags::DoNotCanonicalize);

Extra whitespace before SandboxExtension::Flags::DoNotCanonicalize</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1711834</commentid>
    <comment_count>10</comment_count>
      <attachid>415288</attachid>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2020-12-03 14:41:57 -0800</bug_when>
    <thetext>Comment on attachment 415288
Patch

Whoops! Not quite right.</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1754666</commentid>
    <comment_count>11</comment_count>
      <attachid>427162</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-04-27 10:21:27 -0700</bug_when>
    <thetext>Created attachment 427162
Patch</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1757501</commentid>
    <comment_count>12</comment_count>
      <attachid>427162</attachid>
    <who name="Brent Fulgham">bfulgham</who>
    <bug_when>2021-05-06 10:46:18 -0700</bug_when>
    <thetext>Comment on attachment 427162
Patch

r=me</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1757508</commentid>
    <comment_count>13</comment_count>
      <attachid>427162</attachid>
    <who name="Per Arne Vollan">pvollan</who>
    <bug_when>2021-05-06 11:03:49 -0700</bug_when>
    <thetext>Comment on attachment 427162
Patch

Thanks for reviewing!</thetext>
  </long_desc><long_desc isprivate="0" >
    <commentid>1757540</commentid>
    <comment_count>14</comment_count>
    <who name="EWS">ews-feeder</who>
    <bug_when>2021-05-06 11:40:12 -0700</bug_when>
    <thetext>Committed r277104 (237406@main): &lt;https://commits.webkit.org/237406@main&gt;

All reviewed patches have been landed. Closing bug and clearing flags on attachment 427162.</thetext>
  </long_desc>
      
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>415213</attachid>
            <date>2020-12-02 05:09:02 -0800</date>
            <delta_ts>2020-12-02 05:23:16 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-219428-20201202050900.patch</filename>
            <type>text/plain</type>
            <size>2623</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL
aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNzAzNDQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv
Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDIwLTEyLTAyICBQZXIgQXJuZSBW
b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgc2FuZGJveCBleHRlbnNp
b24gZmxhZyB0byBzcGVjaWZ5IHRoYXQgcGF0aCBjb250YWlucyBubyBzeW1saW5rcworICAgICAg
ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5NDI4CisgICAgICAg
IDxyZGFyOi8vcHJvYmxlbS82NjU1MTk4Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg
KE9PUFMhKS4KKworICAgICAgICBJbiBnZW5lcmFsLCB3aGVuIFNhbmRib3hFeHRlbnNpb246OmNy
ZWF0ZUhhbmRsZVdpdGhvdXRSZXNvbHZpbmdQYXRoIGlzIGNhbGxlZCwgaXQgaXMgYXNzdW1lZCB0
aGF0IHRoZXJlIGFyZSBubyBzeW1saW5rcworICAgICAgICBpbiB0aGUgcHJvdmlkZWQgcGF0aC4g
QWRkIGEgJ2Nhbm9uaWNhbCcgZmxhZywgd2hpY2ggY2FuIGJlIHVzZWQgYnkgcGxhdGZvcm0gQVBJ
cyB0byB2ZXJpZnkgdGhhdCB0aGlzIGlzIHRoZSBjYXNlLgorCisgICAgICAgICogU2hhcmVkL0Nv
Y29hL1NhbmRib3hFeHRlbnNpb25Db2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6U2FuZGJveEV4
dGVuc2lvbkltcGw6OnNhbmRib3hFeHRlbnNpb25Gb3JUeXBlKToKKyAgICAgICAgKFdlYktpdDo6
U2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlV2l0aG91dFJlc29sdmluZ1BhdGgpOgorICAg
ICAgICAqIFNoYXJlZC9TYW5kYm94RXh0ZW5zaW9uLmg6CisKIDIwMjAtMTItMDEgIFRpbSBIb3J0
b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgR1BVIFByb2Nlc3M6IElP
U3VyZmFjZXMgc2hvdWxkIG5vdCBiZSBtYXBwZWQgaW50byB0aGUgV2ViIENvbnRlbnQgUHJvY2Vz
cwpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvU2FuZGJveEV4dGVuc2lvbi5oCj09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT0KLS0tIFNvdXJjZS9XZWJLaXQvU2hhcmVkL1NhbmRib3hFeHRlbnNpb24uaAkocmV2aXNpb24g
MjcwMjMzKQorKysgU291cmNlL1dlYktpdC9TaGFyZWQvU2FuZGJveEV4dGVuc2lvbi5oCSh3b3Jr
aW5nIGNvcHkpCkBAIC01Niw3ICs1Niw4IEBAIHB1YmxpYzoKIAogICAgIGVudW0gY2xhc3MgRmxh
Z3MgOiB1aW50OF90IHsKICAgICAgICAgRGVmYXVsdCwKLSAgICAgICAgTm9SZXBvcnQKKyAgICAg
ICAgTm9SZXBvcnQsCisgICAgICAgIENhbm9uaWNhbAogICAgIH07CiAgICAgCiAgICAgY2xhc3Mg
SGFuZGxlIHsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvU2hhcmVkL0NvY29hL1NhbmRib3hFeHRlbnNp
b25Db2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9TYW5k
Ym94RXh0ZW5zaW9uQ29jb2EubW0JKHJldmlzaW9uIDI3MDIzMykKKysrIFNvdXJjZS9XZWJLaXQv
U2hhcmVkL0NvY29hL1NhbmRib3hFeHRlbnNpb25Db2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAt
OTMsNiArOTMsOCBAQCBwcml2YXRlOgogICAgICAgICB1aW50MzJfdCBleHRlbnNpb25GbGFncyA9
IDA7CiAgICAgICAgIGlmIChmbGFncyAmIFNhbmRib3hFeHRlbnNpb246OkZsYWdzOjpOb1JlcG9y
dCkKICAgICAgICAgICAgIGV4dGVuc2lvbkZsYWdzIHw9IFNBTkRCT1hfRVhURU5TSU9OX05PX1JF
UE9SVDsKKyAgICAgICAgaWYgKGZsYWdzICYgU2FuZGJveEV4dGVuc2lvbjo6RmxhZ3M6OkNhbm9u
aWNhbCkKKyAgICAgICAgICAgIGV4dGVuc2lvbkZsYWdzIHw9IFNBTkRCT1hfRVhURU5TSU9OX0NB
Tk9OSUNBTDsKIAogICAgICAgICBzd2l0Y2ggKHR5cGUpIHsKICAgICAgICAgY2FzZSBTYW5kYm94
RXh0ZW5zaW9uOjpUeXBlOjpSZWFkT25seToKQEAgLTI3MCw3ICsyNzIsNyBAQCBib29sIFNhbmRi
b3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZVdpdGhvCiB7CiAgICAgQVNTRVJUKCFoYW5kbGUubV9z
YW5kYm94RXh0ZW5zaW9uKTsKIAotICAgIGhhbmRsZS5tX3NhbmRib3hFeHRlbnNpb24gPSBTYW5k
Ym94RXh0ZW5zaW9uSW1wbDo6Y3JlYXRlKHBhdGgudXRmOCgpLmRhdGEoKSwgdHlwZSk7CisgICAg
aGFuZGxlLm1fc2FuZGJveEV4dGVuc2lvbiA9IFNhbmRib3hFeHRlbnNpb25JbXBsOjpjcmVhdGUo
cGF0aC51dGY4KCkuZGF0YSgpLCB0eXBlLCBXVEY6Om51bGxvcHQsICBTYW5kYm94RXh0ZW5zaW9u
OjpGbGFnczo6Q2Fub25pY2FsKTsKICAgICBpZiAoIWhhbmRsZS5tX3NhbmRib3hFeHRlbnNpb24p
IHsKICAgICAgICAgTE9HX0VSUk9SKCJDb3VsZCBub3QgY3JlYXRlIGEgc2FuZGJveCBleHRlbnNp
b24gZm9yICclcyciLCBwYXRoLnV0ZjgoKS5kYXRhKCkpOwogICAgICAgICByZXR1cm4gZmFsc2U7
Cg==
</data>
<flag name="commit-queue"
          id="432360"
          type_id="3"
          status="-"
          setter="ews-feeder"
    />
          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>415214</attachid>
            <date>2020-12-02 05:11:36 -0800</date>
            <delta_ts>2020-12-02 07:19:24 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-219428-20201202051134.patch</filename>
            <type>text/plain</type>
            <size>3921</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh
bmdlTG9nCShyZXZpc2lvbiAyNzAzNDQpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu
ZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDIwLTEyLTAyICBQZXIgQXJuZSBWb2xsYW4gIDxw
dm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgc2FuZGJveCBleHRlbnNpb24gZmxhZyB0
byBzcGVjaWZ5IHRoYXQgcGF0aCBjb250YWlucyBubyBzeW1saW5rcworICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5NDI4CisgICAgICAgIDxyZGFyOi8v
cHJvYmxlbS82NjU1MTk4Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICBEZWNsYXJlIGNhbm9uaWNhbCBzYW5kYm94IGZsYWcuCisKKyAgICAgICAgKiB3
dGYvc3BpL2Rhcndpbi9TYW5kYm94U1BJLmg6CisKIDIwMjAtMTItMDEgIFlvdWVubiBGYWJsZXQg
IDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFVwZGF0ZSBsaXN0IG9mIGJsb2NrIHBvcnRz
IGFjY29yZGluZyBmZXRjaCBzcGVjCkluZGV4OiBTb3VyY2UvV1RGL3d0Zi9zcGkvZGFyd2luL1Nh
bmRib3hTUEkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi9zcGkvZGFyd2luL1NhbmRi
b3hTUEkuaAkocmV2aXNpb24gMjcwMjMzKQorKysgU291cmNlL1dURi93dGYvc3BpL2Rhcndpbi9T
YW5kYm94U1BJLmgJKHdvcmtpbmcgY29weSkKQEAgLTYxLDYgKzYxLDcgQEAgZXh0ZXJuIGNvbnN0
IGNoYXIgKmNvbnN0IEFQUF9TQU5EQk9YX1JFQQogZXh0ZXJuIGNvbnN0IGVudW0gc2FuZGJveF9m
aWx0ZXJfdHlwZSBTQU5EQk9YX0NIRUNLX05PX1JFUE9SVDsKIAogZXh0ZXJuIGNvbnN0IHVpbnQz
Ml90IFNBTkRCT1hfRVhURU5TSU9OX05PX1JFUE9SVDsKK2V4dGVybiBjb25zdCB1aW50MzJfdCBT
QU5EQk9YX0VYVEVOU0lPTl9DQU5PTklDQUw7CiAKIGNoYXIgKnNhbmRib3hfZXh0ZW5zaW9uX2lz
c3VlX2ZpbGUoY29uc3QgY2hhciAqZXh0ZW5zaW9uX2NsYXNzLCBjb25zdCBjaGFyICpwYXRoLCB1
aW50MzJfdCBmbGFncyk7CiBjaGFyICpzYW5kYm94X2V4dGVuc2lvbl9pc3N1ZV9nZW5lcmljKGNv
bnN0IGNoYXIgKmV4dGVuc2lvbl9jbGFzcywgdWludDMyX3QgZmxhZ3MpOwpJbmRleDogU291cmNl
L1dlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJ
KHJldmlzaW9uIDI3MDM0NCkKKysrIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv
cHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjAtMTItMDIgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xs
YW5AYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBzYW5kYm94IGV4dGVuc2lvbiBmbGFnIHRvIHNw
ZWNpZnkgdGhhdCBwYXRoIGNvbnRhaW5zIG5vIHN5bWxpbmtzCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk0MjgKKyAgICAgICAgPHJkYXI6Ly9wcm9i
bGVtLzY2NTUxOTg2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg
ICAgICAgIEluIGdlbmVyYWwsIHdoZW4gU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlV2l0
aG91dFJlc29sdmluZ1BhdGggaXMgY2FsbGVkLCBpdCBpcyBhc3N1bWVkIHRoYXQgdGhlcmUgYXJl
IG5vIHN5bWxpbmtzCisgICAgICAgIGluIHRoZSBwcm92aWRlZCBwYXRoLiBBZGQgYSAnY2Fub25p
Y2FsJyBmbGFnLCB3aGljaCBjYW4gYmUgdXNlZCBieSBwbGF0Zm9ybSBBUElzIHRvIHZlcmlmeSB0
aGF0IHRoaXMgaXMgdGhlIGNhc2UuCisKKyAgICAgICAgKiBTaGFyZWQvQ29jb2EvU2FuZGJveEV4
dGVuc2lvbkNvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9uSW1wbDo6
c2FuZGJveEV4dGVuc2lvbkZvclR5cGUpOgorICAgICAgICAoV2ViS2l0OjpTYW5kYm94RXh0ZW5z
aW9uOjpjcmVhdGVIYW5kbGVXaXRob3V0UmVzb2x2aW5nUGF0aCk6CisgICAgICAgICogU2hhcmVk
L1NhbmRib3hFeHRlbnNpb24uaDoKKwogMjAyMC0xMi0wMSAgVGltIEhvcnRvbiAgPHRpbW90aHlf
aG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBHUFUgUHJvY2VzczogSU9TdXJmYWNlcyBzaG91
bGQgbm90IGJlIG1hcHBlZCBpbnRvIHRoZSBXZWIgQ29udGVudCBQcm9jZXNzCkluZGV4OiBTb3Vy
Y2UvV2ViS2l0L1NoYXJlZC9TYW5kYm94RXh0ZW5zaW9uLmgKPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl
L1dlYktpdC9TaGFyZWQvU2FuZGJveEV4dGVuc2lvbi5oCShyZXZpc2lvbiAyNzAyMzMpCisrKyBT
b3VyY2UvV2ViS2l0L1NoYXJlZC9TYW5kYm94RXh0ZW5zaW9uLmgJKHdvcmtpbmcgY29weSkKQEAg
LTU2LDcgKzU2LDggQEAgcHVibGljOgogCiAgICAgZW51bSBjbGFzcyBGbGFncyA6IHVpbnQ4X3Qg
ewogICAgICAgICBEZWZhdWx0LAotICAgICAgICBOb1JlcG9ydAorICAgICAgICBOb1JlcG9ydCwK
KyAgICAgICAgQ2Fub25pY2FsCiAgICAgfTsKICAgICAKICAgICBjbGFzcyBIYW5kbGUgewpJbmRl
eDogU291cmNlL1dlYktpdC9TaGFyZWQvQ29jb2EvU2FuZGJveEV4dGVuc2lvbkNvY29hLm1tCj09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvU2hhcmVkL0NvY29hL1NhbmRib3hFeHRlbnNpb25D
b2NvYS5tbQkocmV2aXNpb24gMjcwMjMzKQorKysgU291cmNlL1dlYktpdC9TaGFyZWQvQ29jb2Ev
U2FuZGJveEV4dGVuc2lvbkNvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC05Myw2ICs5Myw4IEBA
IHByaXZhdGU6CiAgICAgICAgIHVpbnQzMl90IGV4dGVuc2lvbkZsYWdzID0gMDsKICAgICAgICAg
aWYgKGZsYWdzICYgU2FuZGJveEV4dGVuc2lvbjo6RmxhZ3M6Ok5vUmVwb3J0KQogICAgICAgICAg
ICAgZXh0ZW5zaW9uRmxhZ3MgfD0gU0FOREJPWF9FWFRFTlNJT05fTk9fUkVQT1JUOworICAgICAg
ICBpZiAoZmxhZ3MgJiBTYW5kYm94RXh0ZW5zaW9uOjpGbGFnczo6Q2Fub25pY2FsKQorICAgICAg
ICAgICAgZXh0ZW5zaW9uRmxhZ3MgfD0gU0FOREJPWF9FWFRFTlNJT05fQ0FOT05JQ0FMOwogCiAg
ICAgICAgIHN3aXRjaCAodHlwZSkgewogICAgICAgICBjYXNlIFNhbmRib3hFeHRlbnNpb246OlR5
cGU6OlJlYWRPbmx5OgpAQCAtMjcwLDcgKzI3Miw3IEBAIGJvb2wgU2FuZGJveEV4dGVuc2lvbjo6
Y3JlYXRlSGFuZGxlV2l0aG8KIHsKICAgICBBU1NFUlQoIWhhbmRsZS5tX3NhbmRib3hFeHRlbnNp
b24pOwogCi0gICAgaGFuZGxlLm1fc2FuZGJveEV4dGVuc2lvbiA9IFNhbmRib3hFeHRlbnNpb25J
bXBsOjpjcmVhdGUocGF0aC51dGY4KCkuZGF0YSgpLCB0eXBlKTsKKyAgICBoYW5kbGUubV9zYW5k
Ym94RXh0ZW5zaW9uID0gU2FuZGJveEV4dGVuc2lvbkltcGw6OmNyZWF0ZShwYXRoLnV0ZjgoKS5k
YXRhKCksIHR5cGUsIFdURjo6bnVsbG9wdCwgIFNhbmRib3hFeHRlbnNpb246OkZsYWdzOjpDYW5v
bmljYWwpOwogICAgIGlmICghaGFuZGxlLm1fc2FuZGJveEV4dGVuc2lvbikgewogICAgICAgICBM
T0dfRVJST1IoIkNvdWxkIG5vdCBjcmVhdGUgYSBzYW5kYm94IGV4dGVuc2lvbiBmb3IgJyVzJyIs
IHBhdGgudXRmOCgpLmRhdGEoKSk7CiAgICAgICAgIHJldHVybiBmYWxzZTsK
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>415222</attachid>
            <date>2020-12-02 07:19:30 -0800</date>
            <delta_ts>2020-12-03 01:21:25 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-219428-20201202071928.patch</filename>
            <type>text/plain</type>
            <size>4669</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh
bmdlTG9nCShyZXZpc2lvbiAyNzAzNDQpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu
ZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDIwLTEyLTAyICBQZXIgQXJuZSBWb2xsYW4gIDxw
dm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgc2FuZGJveCBleHRlbnNpb24gZmxhZyB0
byBzcGVjaWZ5IHRoYXQgcGF0aCBjb250YWlucyBubyBzeW1saW5rcworICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5NDI4CisgICAgICAgIDxyZGFyOi8v
cHJvYmxlbS82NjU1MTk4Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICBEZWNsYXJlIGNhbm9uaWNhbCBzYW5kYm94IGZsYWcuCisKKyAgICAgICAgKiB3
dGYvc3BpL2Rhcndpbi9TYW5kYm94U1BJLmg6CisKIDIwMjAtMTItMDEgIFlvdWVubiBGYWJsZXQg
IDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFVwZGF0ZSBsaXN0IG9mIGJsb2NrIHBvcnRz
IGFjY29yZGluZyBmZXRjaCBzcGVjCkluZGV4OiBTb3VyY2UvV1RGL3d0Zi9zcGkvZGFyd2luL1Nh
bmRib3hTUEkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi9zcGkvZGFyd2luL1NhbmRi
b3hTUEkuaAkocmV2aXNpb24gMjcwMzQ0KQorKysgU291cmNlL1dURi93dGYvc3BpL2Rhcndpbi9T
YW5kYm94U1BJLmgJKHdvcmtpbmcgY29weSkKQEAgLTYxLDYgKzYxLDcgQEAgZXh0ZXJuIGNvbnN0
IGNoYXIgKmNvbnN0IEFQUF9TQU5EQk9YX1JFQQogZXh0ZXJuIGNvbnN0IGVudW0gc2FuZGJveF9m
aWx0ZXJfdHlwZSBTQU5EQk9YX0NIRUNLX05PX1JFUE9SVDsKIAogZXh0ZXJuIGNvbnN0IHVpbnQz
Ml90IFNBTkRCT1hfRVhURU5TSU9OX05PX1JFUE9SVDsKK2V4dGVybiBjb25zdCB1aW50MzJfdCBT
QU5EQk9YX0VYVEVOU0lPTl9DQU5PTklDQUw7CiAKIGNoYXIgKnNhbmRib3hfZXh0ZW5zaW9uX2lz
c3VlX2ZpbGUoY29uc3QgY2hhciAqZXh0ZW5zaW9uX2NsYXNzLCBjb25zdCBjaGFyICpwYXRoLCB1
aW50MzJfdCBmbGFncyk7CiBjaGFyICpzYW5kYm94X2V4dGVuc2lvbl9pc3N1ZV9nZW5lcmljKGNv
bnN0IGNoYXIgKmV4dGVuc2lvbl9jbGFzcywgdWludDMyX3QgZmxhZ3MpOwpJbmRleDogU291cmNl
L1dlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJ
KHJldmlzaW9uIDI3MDM0NCkKKysrIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv
cHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjAtMTItMDIgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xs
YW5AYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBzYW5kYm94IGV4dGVuc2lvbiBmbGFnIHRvIHNw
ZWNpZnkgdGhhdCBwYXRoIGNvbnRhaW5zIG5vIHN5bWxpbmtzCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk0MjgKKyAgICAgICAgPHJkYXI6Ly9wcm9i
bGVtLzY2NTUxOTg2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg
ICAgICAgIEluIGdlbmVyYWwsIHdoZW4gU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlV2l0
aG91dFJlc29sdmluZ1BhdGggaXMgY2FsbGVkLCBpdCBpcyBhc3N1bWVkIHRoYXQgdGhlcmUgYXJl
IG5vIHN5bWxpbmtzCisgICAgICAgIGluIHRoZSBwcm92aWRlZCBwYXRoLiBBZGQgYSAnY2Fub25p
Y2FsJyBmbGFnLCB3aGljaCBjYW4gYmUgdXNlZCBieSBwbGF0Zm9ybSBBUElzIHRvIHZlcmlmeSB0
aGF0IHRoaXMgaXMgdGhlIGNhc2UuIFRoaXMKKyAgICAgICAgcGF0Y2ggYWxzbyBzdG9wcyByZXNv
bHZpbmcgc3ltbGlua3Mgd2l0aCBbTlNTdHJpbmcgc3RyaW5nQnlSZXNvbHZpbmdTeW1saW5rc0lu
UGF0aF0gaW4gZmF2b3Igb2YgcmVhbHBhdGgsIHNpbmNlIHJlYWxwYXRoCisgICAgICAgIGNvcnJl
Y2x5IHJlcGxhY2VzIC92YXIgd2l0aCAvcHJpdmF0ZS92YXIsIHdoaWNoIFtOU1N0cmluZyBzdHJp
bmdCeVJlc29sdmluZ1N5bWxpbmtzSW5QYXRoXSBkb2VzIG5vdC4KKworICAgICAgICAqIFNoYXJl
ZC9Db2NvYS9TYW5kYm94RXh0ZW5zaW9uQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OlNhbmRi
b3hFeHRlbnNpb25JbXBsOjpzYW5kYm94RXh0ZW5zaW9uRm9yVHlwZSk6CisgICAgICAgIChXZWJL
aXQ6OlNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZVdpdGhvdXRSZXNvbHZpbmdQYXRoKToK
KyAgICAgICAgKiBTaGFyZWQvU2FuZGJveEV4dGVuc2lvbi5oOgorCiAyMDIwLTEyLTAxICBUaW0g
SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIEdQVSBQcm9jZXNz
OiBJT1N1cmZhY2VzIHNob3VsZCBub3QgYmUgbWFwcGVkIGludG8gdGhlIFdlYiBDb250ZW50IFBy
b2Nlc3MKSW5kZXg6IFNvdXJjZS9XZWJLaXQvU2hhcmVkL1NhbmRib3hFeHRlbnNpb24uaAo9PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1NoYXJlZC9TYW5kYm94RXh0ZW5zaW9uLmgJKHJldmlz
aW9uIDI3MDM0NCkKKysrIFNvdXJjZS9XZWJLaXQvU2hhcmVkL1NhbmRib3hFeHRlbnNpb24uaAko
d29ya2luZyBjb3B5KQpAQCAtNTYsNyArNTYsOCBAQCBwdWJsaWM6CiAKICAgICBlbnVtIGNsYXNz
IEZsYWdzIDogdWludDhfdCB7CiAgICAgICAgIERlZmF1bHQsCi0gICAgICAgIE5vUmVwb3J0Cisg
ICAgICAgIE5vUmVwb3J0LAorICAgICAgICBDYW5vbmljYWwKICAgICB9OwogICAgIAogICAgIGNs
YXNzIEhhbmRsZSB7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9TYW5kYm94RXh0
ZW5zaW9uQ29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFyZWQvQ29jb2Ev
U2FuZGJveEV4dGVuc2lvbkNvY29hLm1tCShyZXZpc2lvbiAyNzAzNDQpCisrKyBTb3VyY2UvV2Vi
S2l0L1NoYXJlZC9Db2NvYS9TYW5kYm94RXh0ZW5zaW9uQ29jb2EubW0JKHdvcmtpbmcgY29weSkK
QEAgLTkzLDYgKzkzLDggQEAgcHJpdmF0ZToKICAgICAgICAgdWludDMyX3QgZXh0ZW5zaW9uRmxh
Z3MgPSAwOwogICAgICAgICBpZiAoZmxhZ3MgJiBTYW5kYm94RXh0ZW5zaW9uOjpGbGFnczo6Tm9S
ZXBvcnQpCiAgICAgICAgICAgICBleHRlbnNpb25GbGFncyB8PSBTQU5EQk9YX0VYVEVOU0lPTl9O
T19SRVBPUlQ7CisgICAgICAgIGlmIChmbGFncyAmIFNhbmRib3hFeHRlbnNpb246OkZsYWdzOjpD
YW5vbmljYWwpCisgICAgICAgICAgICBleHRlbnNpb25GbGFncyB8PSBTQU5EQk9YX0VYVEVOU0lP
Tl9DQU5PTklDQUw7CiAKICAgICAgICAgc3dpdGNoICh0eXBlKSB7CiAgICAgICAgIGNhc2UgU2Fu
ZGJveEV4dGVuc2lvbjo6VHlwZTo6UmVhZE9ubHk6CkBAIC0yMzksNyArMjQxLDEwIEBAIFJlZlB0
cjxTYW5kYm94RXh0ZW5zaW9uPiBTYW5kYm94RXh0ZW5zaW8KIAogU3RyaW5nIHN0cmluZ0J5UmVz
b2x2aW5nU3ltbGlua3NJblBhdGgoY29uc3QgU3RyaW5nJiBwYXRoKQogewotICAgIHJldHVybiBb
KE5TU3RyaW5nICopcGF0aCBzdHJpbmdCeVJlc29sdmluZ1N5bWxpbmtzSW5QYXRoXTsKKyAgICBj
aGFyIHJlc29sdmVkUGF0aFtQQVRIX01BWF0gPSB7IDAgfTsKKyAgICBpZiAoIXJlYWxwYXRoKHBh
dGgudXRmOCgpLmRhdGEoKSwgcmVzb2x2ZWRQYXRoKSkKKyAgICAgICAgV1RGTG9nQWx3YXlzKCJD
b3VsZCBub3QgY2Fub25pY2FsaXplICVzLCBlcnJvciA9ICVzXG4iLCBwYXRoLnV0ZjgoKS5kYXRh
KCksIHN0cmVycm9yKGVycm5vKSk7CisgICAgcmV0dXJuIHJlc29sdmVkUGF0aDsKIH0KIAogU3Ry
aW5nIHJlc29sdmVBbmRDcmVhdGVSZWFkV3JpdGVEaXJlY3RvcnlGb3JTYW5kYm94RXh0ZW5zaW9u
KGNvbnN0IFN0cmluZyYgcGF0aCkKQEAgLTI3MCw3ICsyNzUsNyBAQCBib29sIFNhbmRib3hFeHRl
bnNpb246OmNyZWF0ZUhhbmRsZVdpdGhvCiB7CiAgICAgQVNTRVJUKCFoYW5kbGUubV9zYW5kYm94
RXh0ZW5zaW9uKTsKIAotICAgIGhhbmRsZS5tX3NhbmRib3hFeHRlbnNpb24gPSBTYW5kYm94RXh0
ZW5zaW9uSW1wbDo6Y3JlYXRlKHBhdGgudXRmOCgpLmRhdGEoKSwgdHlwZSk7CisgICAgaGFuZGxl
Lm1fc2FuZGJveEV4dGVuc2lvbiA9IFNhbmRib3hFeHRlbnNpb25JbXBsOjpjcmVhdGUocGF0aC51
dGY4KCkuZGF0YSgpLCB0eXBlLCBXVEY6Om51bGxvcHQsICBTYW5kYm94RXh0ZW5zaW9uOjpGbGFn
czo6Q2Fub25pY2FsKTsKICAgICBpZiAoIWhhbmRsZS5tX3NhbmRib3hFeHRlbnNpb24pIHsKICAg
ICAgICAgTE9HX0VSUk9SKCJDb3VsZCBub3QgY3JlYXRlIGEgc2FuZGJveCBleHRlbnNpb24gZm9y
ICclcyciLCBwYXRoLnV0ZjgoKS5kYXRhKCkpOwogICAgICAgICByZXR1cm4gZmFsc2U7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>415283</attachid>
            <date>2020-12-03 01:21:29 -0800</date>
            <delta_ts>2020-12-03 02:30:00 -0800</delta_ts>
            <desc>Patch</desc>
            <filename>bug-219428-20201203012127.patch</filename>
            <type>text/plain</type>
            <size>4603</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh
bmdlTG9nCShyZXZpc2lvbiAyNzAzNDQpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu
ZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDIwLTEyLTAyICBQZXIgQXJuZSBWb2xsYW4gIDxw
dm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgc2FuZGJveCBleHRlbnNpb24gZmxhZyB0
byBzcGVjaWZ5IHRoYXQgcGF0aCBjb250YWlucyBubyBzeW1saW5rcworICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5NDI4CisgICAgICAgIDxyZGFyOi8v
cHJvYmxlbS82NjU1MTk4Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICBEZWNsYXJlIGNhbm9uaWNhbCBzYW5kYm94IGZsYWcuCisKKyAgICAgICAgKiB3
dGYvc3BpL2Rhcndpbi9TYW5kYm94U1BJLmg6CisKIDIwMjAtMTItMDEgIFlvdWVubiBGYWJsZXQg
IDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFVwZGF0ZSBsaXN0IG9mIGJsb2NrIHBvcnRz
IGFjY29yZGluZyBmZXRjaCBzcGVjCkluZGV4OiBTb3VyY2UvV1RGL3d0Zi9zcGkvZGFyd2luL1Nh
bmRib3hTUEkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi9zcGkvZGFyd2luL1NhbmRi
b3hTUEkuaAkocmV2aXNpb24gMjcwMzQ0KQorKysgU291cmNlL1dURi93dGYvc3BpL2Rhcndpbi9T
YW5kYm94U1BJLmgJKHdvcmtpbmcgY29weSkKQEAgLTYxLDYgKzYxLDcgQEAgZXh0ZXJuIGNvbnN0
IGNoYXIgKmNvbnN0IEFQUF9TQU5EQk9YX1JFQQogZXh0ZXJuIGNvbnN0IGVudW0gc2FuZGJveF9m
aWx0ZXJfdHlwZSBTQU5EQk9YX0NIRUNLX05PX1JFUE9SVDsKIAogZXh0ZXJuIGNvbnN0IHVpbnQz
Ml90IFNBTkRCT1hfRVhURU5TSU9OX05PX1JFUE9SVDsKK2V4dGVybiBjb25zdCB1aW50MzJfdCBT
QU5EQk9YX0VYVEVOU0lPTl9DQU5PTklDQUw7CiAKIGNoYXIgKnNhbmRib3hfZXh0ZW5zaW9uX2lz
c3VlX2ZpbGUoY29uc3QgY2hhciAqZXh0ZW5zaW9uX2NsYXNzLCBjb25zdCBjaGFyICpwYXRoLCB1
aW50MzJfdCBmbGFncyk7CiBjaGFyICpzYW5kYm94X2V4dGVuc2lvbl9pc3N1ZV9nZW5lcmljKGNv
bnN0IGNoYXIgKmV4dGVuc2lvbl9jbGFzcywgdWludDMyX3QgZmxhZ3MpOwpJbmRleDogU291cmNl
L1dlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJ
KHJldmlzaW9uIDI3MDM0NCkKKysrIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv
cHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMjAtMTItMDIgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xs
YW5AYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBzYW5kYm94IGV4dGVuc2lvbiBmbGFnIHRvIHNw
ZWNpZnkgdGhhdCBwYXRoIGNvbnRhaW5zIG5vIHN5bWxpbmtzCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk0MjgKKyAgICAgICAgPHJkYXI6Ly9wcm9i
bGVtLzY2NTUxOTg2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg
ICAgICAgIEluIGdlbmVyYWwsIHdoZW4gU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlV2l0
aG91dFJlc29sdmluZ1BhdGggaXMgY2FsbGVkLCBpdCBpcyBhc3N1bWVkIHRoYXQgdGhlcmUgYXJl
IG5vIHN5bWxpbmtzCisgICAgICAgIGluIHRoZSBwcm92aWRlZCBwYXRoLiBBZGQgYSAnY2Fub25p
Y2FsJyBmbGFnLCB3aGljaCBjYW4gYmUgdXNlZCBieSBwbGF0Zm9ybSBBUElzIHRvIHZlcmlmeSB0
aGF0IHRoaXMgaXMgdGhlIGNhc2UuIFRoaXMKKyAgICAgICAgcGF0Y2ggYWxzbyBzdG9wcyByZXNv
bHZpbmcgc3ltbGlua3Mgd2l0aCBbTlNTdHJpbmcgc3RyaW5nQnlSZXNvbHZpbmdTeW1saW5rc0lu
UGF0aF0gaW4gZmF2b3Igb2YgcmVhbHBhdGgsIHNpbmNlIHJlYWxwYXRoCisgICAgICAgIGNvcnJl
Y2x5IHJlcGxhY2VzIC92YXIgd2l0aCAvcHJpdmF0ZS92YXIsIHdoaWNoIFtOU1N0cmluZyBzdHJp
bmdCeVJlc29sdmluZ1N5bWxpbmtzSW5QYXRoXSBkb2VzIG5vdC4KKworICAgICAgICAqIFNoYXJl
ZC9Db2NvYS9TYW5kYm94RXh0ZW5zaW9uQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OlNhbmRi
b3hFeHRlbnNpb25JbXBsOjpzYW5kYm94RXh0ZW5zaW9uRm9yVHlwZSk6CisgICAgICAgIChXZWJL
aXQ6OlNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZVdpdGhvdXRSZXNvbHZpbmdQYXRoKToK
KyAgICAgICAgKiBTaGFyZWQvU2FuZGJveEV4dGVuc2lvbi5oOgorCiAyMDIwLTEyLTAxICBUaW0g
SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIEdQVSBQcm9jZXNz
OiBJT1N1cmZhY2VzIHNob3VsZCBub3QgYmUgbWFwcGVkIGludG8gdGhlIFdlYiBDb250ZW50IFBy
b2Nlc3MKSW5kZXg6IFNvdXJjZS9XZWJLaXQvU2hhcmVkL1NhbmRib3hFeHRlbnNpb24uaAo9PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1NoYXJlZC9TYW5kYm94RXh0ZW5zaW9uLmgJKHJldmlz
aW9uIDI3MDM0NCkKKysrIFNvdXJjZS9XZWJLaXQvU2hhcmVkL1NhbmRib3hFeHRlbnNpb24uaAko
d29ya2luZyBjb3B5KQpAQCAtNTYsNyArNTYsOCBAQCBwdWJsaWM6CiAKICAgICBlbnVtIGNsYXNz
IEZsYWdzIDogdWludDhfdCB7CiAgICAgICAgIERlZmF1bHQsCi0gICAgICAgIE5vUmVwb3J0Cisg
ICAgICAgIE5vUmVwb3J0LAorICAgICAgICBEb05vdENhbm9uaWNhbGl6ZSwKICAgICB9OwogICAg
IAogICAgIGNsYXNzIEhhbmRsZSB7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9T
YW5kYm94RXh0ZW5zaW9uQ29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9TaGFy
ZWQvQ29jb2EvU2FuZGJveEV4dGVuc2lvbkNvY29hLm1tCShyZXZpc2lvbiAyNzAzNDQpCisrKyBT
b3VyY2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9TYW5kYm94RXh0ZW5zaW9uQ29jb2EubW0JKHdvcmtp
bmcgY29weSkKQEAgLTkzLDYgKzkzLDggQEAgcHJpdmF0ZToKICAgICAgICAgdWludDMyX3QgZXh0
ZW5zaW9uRmxhZ3MgPSAwOwogICAgICAgICBpZiAoZmxhZ3MgJiBTYW5kYm94RXh0ZW5zaW9uOjpG
bGFnczo6Tm9SZXBvcnQpCiAgICAgICAgICAgICBleHRlbnNpb25GbGFncyB8PSBTQU5EQk9YX0VY
VEVOU0lPTl9OT19SRVBPUlQ7CisgICAgICAgIGlmIChmbGFncyAmIFNhbmRib3hFeHRlbnNpb246
OkZsYWdzOjpEb05vdENhbm9uaWNhbGl6ZSkKKyAgICAgICAgICAgIGV4dGVuc2lvbkZsYWdzIHw9
IFNBTkRCT1hfRVhURU5TSU9OX0NBTk9OSUNBTDsKIAogICAgICAgICBzd2l0Y2ggKHR5cGUpIHsK
ICAgICAgICAgY2FzZSBTYW5kYm94RXh0ZW5zaW9uOjpUeXBlOjpSZWFkT25seToKQEAgLTIzOSw3
ICsyNDEsOSBAQCBSZWZQdHI8U2FuZGJveEV4dGVuc2lvbj4gU2FuZGJveEV4dGVuc2lvCiAKIFN0
cmluZyBzdHJpbmdCeVJlc29sdmluZ1N5bWxpbmtzSW5QYXRoKGNvbnN0IFN0cmluZyYgcGF0aCkK
IHsKLSAgICByZXR1cm4gWyhOU1N0cmluZyAqKXBhdGggc3RyaW5nQnlSZXNvbHZpbmdTeW1saW5r
c0luUGF0aF07CisgICAgY2hhciByZXNvbHZlZFBhdGhbUEFUSF9NQVhdID0geyAwIH07CisgICAg
cmVhbHBhdGgocGF0aC51dGY4KCkuZGF0YSgpLCByZXNvbHZlZFBhdGgpOworICAgIHJldHVybiBT
dHJpbmc6OmZyb21VVEY4KHJlc29sdmVkUGF0aCk7CiB9CiAKIFN0cmluZyByZXNvbHZlQW5kQ3Jl
YXRlUmVhZFdyaXRlRGlyZWN0b3J5Rm9yU2FuZGJveEV4dGVuc2lvbihjb25zdCBTdHJpbmcmIHBh
dGgpCkBAIC0yNzAsNyArMjc0LDcgQEAgYm9vbCBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5k
bGVXaXRobwogewogICAgIEFTU0VSVCghaGFuZGxlLm1fc2FuZGJveEV4dGVuc2lvbik7CiAKLSAg
ICBoYW5kbGUubV9zYW5kYm94RXh0ZW5zaW9uID0gU2FuZGJveEV4dGVuc2lvbkltcGw6OmNyZWF0
ZShwYXRoLnV0ZjgoKS5kYXRhKCksIHR5cGUpOworICAgIGhhbmRsZS5tX3NhbmRib3hFeHRlbnNp
b24gPSBTYW5kYm94RXh0ZW5zaW9uSW1wbDo6Y3JlYXRlKHBhdGgudXRmOCgpLmRhdGEoKSwgdHlw
ZSwgV1RGOjpudWxsb3B0LCAgU2FuZGJveEV4dGVuc2lvbjo6RmxhZ3M6OkRvTm90Q2Fub25pY2Fs
aXplKTsKICAgICBpZiAoIWhhbmRsZS5tX3NhbmRib3hFeHRlbnNpb24pIHsKICAgICAgICAgTE9H
X0VSUk9SKCJDb3VsZCBub3QgY3JlYXRlIGEgc2FuZGJveCBleHRlbnNpb24gZm9yICclcyciLCBw
YXRoLnV0ZjgoKS5kYXRhKCkpOwogICAgICAgICByZXR1cm4gZmFsc2U7Cg==
</data>

          </attachment>
          <attachment
              isobsolete="1"
              ispatch="1"
              isprivate="0"
          >
            <attachid>415288</attachid>
            <date>2020-12-03 02:30:06 -0800</date>
            <delta_ts>2021-04-27 10:21:24 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-219428-20201203023004.patch</filename>
            <type>text/plain</type>
            <size>5519</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh
bmdlTG9nCShyZXZpc2lvbiAyNzAzNDQpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu
ZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDIwLTEyLTAyICBQZXIgQXJuZSBWb2xsYW4gIDxw
dm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgc2FuZGJveCBleHRlbnNpb24gZmxhZyB0
byBzcGVjaWZ5IHRoYXQgcGF0aCBjb250YWlucyBubyBzeW1saW5rcworICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5NDI4CisgICAgICAgIDxyZGFyOi8v
cHJvYmxlbS82NjU1MTk4Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICBEZWNsYXJlIGNhbm9uaWNhbCBzYW5kYm94IGZsYWcuCisKKyAgICAgICAgKiB3
dGYvc3BpL2Rhcndpbi9TYW5kYm94U1BJLmg6CisKIDIwMjAtMTItMDEgIFlvdWVubiBGYWJsZXQg
IDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFVwZGF0ZSBsaXN0IG9mIGJsb2NrIHBvcnRz
IGFjY29yZGluZyBmZXRjaCBzcGVjCkluZGV4OiBTb3VyY2UvV1RGL3d0Zi9zcGkvZGFyd2luL1Nh
bmRib3hTUEkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi9zcGkvZGFyd2luL1NhbmRi
b3hTUEkuaAkocmV2aXNpb24gMjcwMzQ0KQorKysgU291cmNlL1dURi93dGYvc3BpL2Rhcndpbi9T
YW5kYm94U1BJLmgJKHdvcmtpbmcgY29weSkKQEAgLTYxLDYgKzYxLDcgQEAgZXh0ZXJuIGNvbnN0
IGNoYXIgKmNvbnN0IEFQUF9TQU5EQk9YX1JFQQogZXh0ZXJuIGNvbnN0IGVudW0gc2FuZGJveF9m
aWx0ZXJfdHlwZSBTQU5EQk9YX0NIRUNLX05PX1JFUE9SVDsKIAogZXh0ZXJuIGNvbnN0IHVpbnQz
Ml90IFNBTkRCT1hfRVhURU5TSU9OX05PX1JFUE9SVDsKK2V4dGVybiBjb25zdCB1aW50MzJfdCBT
QU5EQk9YX0VYVEVOU0lPTl9DQU5PTklDQUw7CiAKIGNoYXIgKnNhbmRib3hfZXh0ZW5zaW9uX2lz
c3VlX2ZpbGUoY29uc3QgY2hhciAqZXh0ZW5zaW9uX2NsYXNzLCBjb25zdCBjaGFyICpwYXRoLCB1
aW50MzJfdCBmbGFncyk7CiBjaGFyICpzYW5kYm94X2V4dGVuc2lvbl9pc3N1ZV9nZW5lcmljKGNv
bnN0IGNoYXIgKmV4dGVuc2lvbl9jbGFzcywgdWludDMyX3QgZmxhZ3MpOwpJbmRleDogU291cmNl
L1dlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJ
KHJldmlzaW9uIDI3MDM5MCkKKysrIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv
cHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMjAtMTItMDMgIFBlciBBcm5lIFZvbGxhbiAgPHB2b2xs
YW5AYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBzYW5kYm94IGV4dGVuc2lvbiBmbGFnIHRvIHNw
ZWNpZnkgdGhhdCBwYXRoIGNvbnRhaW5zIG5vIHN5bWxpbmtzCisgICAgICAgIGh0dHBzOi8vYnVn
cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTk0MjgKKyAgICAgICAgPHJkYXI6Ly9wcm9i
bGVtLzY2NTUxOTg2PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg
ICAgICAgIEluIGdlbmVyYWwsIHdoZW4gU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlV2l0
aG91dFJlc29sdmluZ1BhdGggaXMgY2FsbGVkLCBpdCBpcyBhc3N1bWVkIHRoYXQgdGhlcmUgYXJl
IG5vIHN5bWxpbmtzCisgICAgICAgIGluIHRoZSBwcm92aWRlZCBwYXRoLiBBZGQgYSAnY2Fub25p
Y2FsJyBmbGFnLCB3aGljaCBjYW4gYmUgdXNlZCBieSBwbGF0Zm9ybSBBUElzIHRvIHZlcmlmeSB0
aGF0IHRoaXMgaXMgdGhlIGNhc2UuIFRoaXMKKyAgICAgICAgcGF0Y2ggYWxzbyBzdG9wcyByZXNv
bHZpbmcgc3ltbGlua3Mgd2l0aCBbTlNTdHJpbmcgc3RyaW5nQnlSZXNvbHZpbmdTeW1saW5rc0lu
UGF0aF0gaW4gZmF2b3Igb2YgcmVhbHBhdGgsIHNpbmNlIHJlYWxwYXRoCisgICAgICAgIGNvcnJl
Y2x5IHJlcGxhY2VzIC92YXIgd2l0aCAvcHJpdmF0ZS92YXIsIHdoaWNoIFtOU1N0cmluZyBzdHJp
bmdCeVJlc29sdmluZ1N5bWxpbmtzSW5QYXRoXSBkb2VzIG5vdC4KKyAgICAgICAKKyAgICAgICAg
KiBTaGFyZWQvQ29jb2EvU2FuZGJveEV4dGVuc2lvbkNvY29hLm1tOgorICAgICAgICAoV2ViS2l0
OjpTYW5kYm94RXh0ZW5zaW9uSW1wbDo6c2FuZGJveEV4dGVuc2lvbkZvclR5cGUpOgorICAgICAg
ICAoV2ViS2l0OjpzdHJpbmdCeVJlc29sdmluZ1N5bWxpbmtzSW5QYXRoKToKKyAgICAgICAgKFdl
YktpdDo6U2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlSGFuZGxlV2l0aG91dFJlc29sdmluZ1BhdGgp
OgorICAgICAgICAqIFNoYXJlZC9TYW5kYm94RXh0ZW5zaW9uLmg6CisgICAgICAgICogVUlQcm9j
ZXNzL1dlYlByb2Nlc3NQb29sLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6
OndlYlByb2Nlc3NEYXRhU3RvcmVQYXJhbWV0ZXJzKToKKwogMjAyMC0xMi0wMyAgTWFydGluIFJv
Ymluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgTW92ZSBjb2RlIGZyb20g
QXhpc1Njcm9sbFNuYXBPZmZzZXRzIHRvIFNjcm9sbFNuYXBPZmZzZXRzSW5mbwpJbmRleDogU291
cmNlL1dlYktpdC9TaGFyZWQvU2FuZGJveEV4dGVuc2lvbi5oCj09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj
ZS9XZWJLaXQvU2hhcmVkL1NhbmRib3hFeHRlbnNpb24uaAkocmV2aXNpb24gMjcwMzQ0KQorKysg
U291cmNlL1dlYktpdC9TaGFyZWQvU2FuZGJveEV4dGVuc2lvbi5oCSh3b3JraW5nIGNvcHkpCkBA
IC01Niw3ICs1Niw4IEBAIHB1YmxpYzoKIAogICAgIGVudW0gY2xhc3MgRmxhZ3MgOiB1aW50OF90
IHsKICAgICAgICAgRGVmYXVsdCwKLSAgICAgICAgTm9SZXBvcnQKKyAgICAgICAgTm9SZXBvcnQs
CisgICAgICAgIERvTm90Q2Fub25pY2FsaXplLAogICAgIH07CiAgICAgCiAgICAgY2xhc3MgSGFu
ZGxlIHsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvU2hhcmVkL0NvY29hL1NhbmRib3hFeHRlbnNpb25D
b2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9TYW5kYm94
RXh0ZW5zaW9uQ29jb2EubW0JKHJldmlzaW9uIDI3MDM0NCkKKysrIFNvdXJjZS9XZWJLaXQvU2hh
cmVkL0NvY29hL1NhbmRib3hFeHRlbnNpb25Db2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtOTMs
NiArOTMsOCBAQCBwcml2YXRlOgogICAgICAgICB1aW50MzJfdCBleHRlbnNpb25GbGFncyA9IDA7
CiAgICAgICAgIGlmIChmbGFncyAmIFNhbmRib3hFeHRlbnNpb246OkZsYWdzOjpOb1JlcG9ydCkK
ICAgICAgICAgICAgIGV4dGVuc2lvbkZsYWdzIHw9IFNBTkRCT1hfRVhURU5TSU9OX05PX1JFUE9S
VDsKKyAgICAgICAgaWYgKGZsYWdzICYgU2FuZGJveEV4dGVuc2lvbjo6RmxhZ3M6OkRvTm90Q2Fu
b25pY2FsaXplKQorICAgICAgICAgICAgZXh0ZW5zaW9uRmxhZ3MgfD0gU0FOREJPWF9FWFRFTlNJ
T05fQ0FOT05JQ0FMOwogCiAgICAgICAgIHN3aXRjaCAodHlwZSkgewogICAgICAgICBjYXNlIFNh
bmRib3hFeHRlbnNpb246OlR5cGU6OlJlYWRPbmx5OgpAQCAtMjM5LDcgKzI0MSw5IEBAIFJlZlB0
cjxTYW5kYm94RXh0ZW5zaW9uPiBTYW5kYm94RXh0ZW5zaW8KIAogU3RyaW5nIHN0cmluZ0J5UmVz
b2x2aW5nU3ltbGlua3NJblBhdGgoY29uc3QgU3RyaW5nJiBwYXRoKQogewotICAgIHJldHVybiBb
KE5TU3RyaW5nICopcGF0aCBzdHJpbmdCeVJlc29sdmluZ1N5bWxpbmtzSW5QYXRoXTsKKyAgICBj
aGFyIHJlc29sdmVkUGF0aFtQQVRIX01BWF0gPSB7IDAgfTsKKyAgICByZWFscGF0aChwYXRoLnV0
ZjgoKS5kYXRhKCksIHJlc29sdmVkUGF0aCk7CisgICAgcmV0dXJuIFN0cmluZzo6ZnJvbVVURjgo
cmVzb2x2ZWRQYXRoKTsKIH0KIAogU3RyaW5nIHJlc29sdmVBbmRDcmVhdGVSZWFkV3JpdGVEaXJl
Y3RvcnlGb3JTYW5kYm94RXh0ZW5zaW9uKGNvbnN0IFN0cmluZyYgcGF0aCkKQEAgLTI3MCw3ICsy
NzQsNyBAQCBib29sIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZVdpdGhvCiB7CiAgICAg
QVNTRVJUKCFoYW5kbGUubV9zYW5kYm94RXh0ZW5zaW9uKTsKIAotICAgIGhhbmRsZS5tX3NhbmRi
b3hFeHRlbnNpb24gPSBTYW5kYm94RXh0ZW5zaW9uSW1wbDo6Y3JlYXRlKHBhdGgudXRmOCgpLmRh
dGEoKSwgdHlwZSk7CisgICAgaGFuZGxlLm1fc2FuZGJveEV4dGVuc2lvbiA9IFNhbmRib3hFeHRl
bnNpb25JbXBsOjpjcmVhdGUocGF0aC51dGY4KCkuZGF0YSgpLCB0eXBlLCBXVEY6Om51bGxvcHQs
ICBTYW5kYm94RXh0ZW5zaW9uOjpGbGFnczo6RG9Ob3RDYW5vbmljYWxpemUpOwogICAgIGlmICgh
aGFuZGxlLm1fc2FuZGJveEV4dGVuc2lvbikgewogICAgICAgICBMT0dfRVJST1IoIkNvdWxkIG5v
dCBjcmVhdGUgYSBzYW5kYm94IGV4dGVuc2lvbiBmb3IgJyVzJyIsIHBhdGgudXRmOCgpLmRhdGEo
KSk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz
L1dlYlByb2Nlc3NQb29sLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz
cy9XZWJQcm9jZXNzUG9vbC5jcHAJKHJldmlzaW9uIDI3MDM0NCkKKysrIFNvdXJjZS9XZWJLaXQv
VUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzMyLDcgKzcz
Miw3IEBAIFdlYlByb2Nlc3NEYXRhU3RvcmVQYXJhbWV0ZXJzIFdlYlByb2Nlc3MKIAogICAgIFN0
cmluZyBqYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRpcmVjdG9yeTsKICAgICBpZiAoIW1famF2YVNj
cmlwdENvbmZpZ3VyYXRpb25EaXJlY3RvcnkuaXNFbXB0eSgpKQotICAgICAgICBqYXZhU2NyaXB0
Q29uZmlndXJhdGlvbkRpcmVjdG9yeSA9IG1famF2YVNjcmlwdENvbmZpZ3VyYXRpb25EaXJlY3Rv
cnk7CisgICAgICAgIGphdmFTY3JpcHRDb25maWd1cmF0aW9uRGlyZWN0b3J5ID0gcmVzb2x2ZVBh
dGhGb3JTYW5kYm94RXh0ZW5zaW9uKG1famF2YVNjcmlwdENvbmZpZ3VyYXRpb25EaXJlY3Rvcnkp
OwogICAgIGVsc2UgaWYgKGphdmFTY3JpcHRDb25maWd1cmF0aW9uRmlsZUVuYWJsZWQoKSkKICAg
ICAgICAgamF2YVNjcmlwdENvbmZpZ3VyYXRpb25EaXJlY3RvcnkgPSB3ZWJzaXRlRGF0YVN0b3Jl
LnJlc29sdmVkSmF2YVNjcmlwdENvbmZpZ3VyYXRpb25EaXJlY3RvcnkoKTsKIAo=
</data>

          </attachment>
          <attachment
              isobsolete="0"
              ispatch="1"
              isprivate="0"
          >
            <attachid>427162</attachid>
            <date>2021-04-27 10:21:27 -0700</date>
            <delta_ts>2021-05-06 11:40:14 -0700</delta_ts>
            <desc>Patch</desc>
            <filename>bug-219428-20210427102126.patch</filename>
            <type>text/plain</type>
            <size>5543</size>
            <attacher name="Per Arne Vollan">pvollan</attacher>
            
              <data encoding="base64">SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh
bmdlTG9nCShyZXZpc2lvbiAyNzY2NDQpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu
ZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDIxLTA0LTI3ICBQZXIgQXJuZSBWb2xsYW4gIDxw
dm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgc2FuZGJveCBleHRlbnNpb24gZmxhZyB0
byBzcGVjaWZ5IHRoYXQgcGF0aCBjb250YWlucyBubyBzeW1saW5rcworICAgICAgICBodHRwczov
L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5NDI4CisgICAgICAgIDxyZGFyOi8v
cHJvYmxlbS82NjU1MTk4Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K
KworICAgICAgICBEZWNsYXJlIGNhbm9uaWNhbCBzYW5kYm94IGZsYWcuCisKKyAgICAgICAgKiB3
dGYvc3BpL2Rhcndpbi9TYW5kYm94U1BJLmg6CisKIDIwMjEtMDQtMjYgIEJlbiBOaGFtICA8bmhh
bUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVkdWNlIG1lbW9yeSBmb290cHJpbnQgZm9yIGJhY2tn
cm91bmQgdGFicwpJbmRleDogU291cmNlL1dURi93dGYvc3BpL2Rhcndpbi9TYW5kYm94U1BJLmgK
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQotLS0gU291cmNlL1dURi93dGYvc3BpL2Rhcndpbi9TYW5kYm94U1BJLmgJKHJl
dmlzaW9uIDI3NjY0NCkKKysrIFNvdXJjZS9XVEYvd3RmL3NwaS9kYXJ3aW4vU2FuZGJveFNQSS5o
CSh3b3JraW5nIGNvcHkpCkBAIC02MSw2ICs2MSw3IEBAIGV4dGVybiBjb25zdCBjaGFyICpjb25z
dCBBUFBfU0FOREJPWF9SRUEKIGV4dGVybiBjb25zdCBlbnVtIHNhbmRib3hfZmlsdGVyX3R5cGUg
U0FOREJPWF9DSEVDS19OT19SRVBPUlQ7CiAKIGV4dGVybiBjb25zdCB1aW50MzJfdCBTQU5EQk9Y
X0VYVEVOU0lPTl9OT19SRVBPUlQ7CitleHRlcm4gY29uc3QgdWludDMyX3QgU0FOREJPWF9FWFRF
TlNJT05fQ0FOT05JQ0FMOwogCiBjaGFyICpzYW5kYm94X2V4dGVuc2lvbl9pc3N1ZV9maWxlKGNv
bnN0IGNoYXIgKmV4dGVuc2lvbl9jbGFzcywgY29uc3QgY2hhciAqcGF0aCwgdWludDMyX3QgZmxh
Z3MpOwogY2hhciAqc2FuZGJveF9leHRlbnNpb25faXNzdWVfZ2VuZXJpYyhjb25zdCBjaGFyICpl
eHRlbnNpb25fY2xhc3MsIHVpbnQzMl90IGZsYWdzKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hh
bmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAy
NzY2NDQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz
ICsxLDI0IEBACisyMDIxLTA0LTI3ICBQZXIgQXJuZSBWb2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNv
bT4KKworICAgICAgICBBZGQgc2FuZGJveCBleHRlbnNpb24gZmxhZyB0byBzcGVjaWZ5IHRoYXQg
cGF0aCBjb250YWlucyBubyBzeW1saW5rcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y
Zy9zaG93X2J1Zy5jZ2k/aWQ9MjE5NDI4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82NjU1MTk4
Nj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBn
ZW5lcmFsLCB3aGVuIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZVdpdGhvdXRSZXNvbHZp
bmdQYXRoIGlzIGNhbGxlZCwgaXQgaXMgYXNzdW1lZCB0aGF0IHRoZXJlIGFyZSBubyBzeW1saW5r
cworICAgICAgICBpbiB0aGUgcHJvdmlkZWQgcGF0aC4gQWRkIGEgJ2Nhbm9uaWNhbCcgZmxhZywg
d2hpY2ggY2FuIGJlIHVzZWQgYnkgcGxhdGZvcm0gQVBJcyB0byB2ZXJpZnkgdGhhdCB0aGlzIGlz
IHRoZSBjYXNlLiBUaGlzCisgICAgICAgIHBhdGNoIGFsc28gc3RvcHMgcmVzb2x2aW5nIHN5bWxp
bmtzIHdpdGggW05TU3RyaW5nIHN0cmluZ0J5UmVzb2x2aW5nU3ltbGlua3NJblBhdGhdIGluIGZh
dm9yIG9mIHJlYWxwYXRoLCBzaW5jZSByZWFscGF0aAorICAgICAgICBjb3JyZWNseSByZXBsYWNl
cyAvdmFyIHdpdGggL3ByaXZhdGUvdmFyLCB3aGljaCBbTlNTdHJpbmcgc3RyaW5nQnlSZXNvbHZp
bmdTeW1saW5rc0luUGF0aF0gZG9lcyBub3QuCisgICAgICAgCisgICAgICAgICogU2hhcmVkL0Nv
Y29hL1NhbmRib3hFeHRlbnNpb25Db2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6U2FuZGJveEV4
dGVuc2lvbkltcGw6OnNhbmRib3hFeHRlbnNpb25Gb3JUeXBlKToKKyAgICAgICAgKFdlYktpdDo6
c3RyaW5nQnlSZXNvbHZpbmdTeW1saW5rc0luUGF0aCk6CisgICAgICAgIChXZWJLaXQ6OlNhbmRi
b3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZVdpdGhvdXRSZXNvbHZpbmdQYXRoKToKKyAgICAgICAg
KiBTaGFyZWQvU2FuZGJveEV4dGVuc2lvbi5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9j
ZXNzUG9vbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjp3ZWJQcm9jZXNz
RGF0YVN0b3JlUGFyYW1ldGVycyk6CisKIDIwMjEtMDQtMjcgIEJyZW50IEZ1bGdoYW0gIDxiZnVs
Z2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU10gW0dQVV0gVGhlIFVJIHByb2Nlc3Mgc2hv
dWxkIGlzc3VlIHRoZSBtYWNoIHNhbmRib3ggZXh0ZW5zaW9uIHRvICdjb20uYXBwbGUuQUdYQ29t
cGlsZXJTZXJ2aWNlJyAKSW5kZXg6IFNvdXJjZS9XZWJLaXQvU2hhcmVkL1NhbmRib3hFeHRlbnNp
b24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1NoYXJlZC9TYW5kYm94RXh0ZW5zaW9u
LmgJKHJldmlzaW9uIDI3NjY0NCkKKysrIFNvdXJjZS9XZWJLaXQvU2hhcmVkL1NhbmRib3hFeHRl
bnNpb24uaAkod29ya2luZyBjb3B5KQpAQCAtNTYsNyArNTYsOCBAQCBwdWJsaWM6CiAKICAgICBl
bnVtIGNsYXNzIEZsYWdzIDogdWludDhfdCB7CiAgICAgICAgIERlZmF1bHQsCi0gICAgICAgIE5v
UmVwb3J0CisgICAgICAgIE5vUmVwb3J0LAorICAgICAgICBEb05vdENhbm9uaWNhbGl6ZSwKICAg
ICB9OwogICAgIAogICAgIGNsYXNzIEhhbmRsZSB7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1NoYXJl
ZC9Db2NvYS9TYW5kYm94RXh0ZW5zaW9uQ29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl
YktpdC9TaGFyZWQvQ29jb2EvU2FuZGJveEV4dGVuc2lvbkNvY29hLm1tCShyZXZpc2lvbiAyNzY2
NDQpCisrKyBTb3VyY2UvV2ViS2l0L1NoYXJlZC9Db2NvYS9TYW5kYm94RXh0ZW5zaW9uQ29jb2Eu
bW0JKHdvcmtpbmcgY29weSkKQEAgLTk0LDYgKzk0LDggQEAgcHJpdmF0ZToKICAgICAgICAgdWlu
dDMyX3QgZXh0ZW5zaW9uRmxhZ3MgPSAwOwogICAgICAgICBpZiAoZmxhZ3MgJiBTYW5kYm94RXh0
ZW5zaW9uOjpGbGFnczo6Tm9SZXBvcnQpCiAgICAgICAgICAgICBleHRlbnNpb25GbGFncyB8PSBT
QU5EQk9YX0VYVEVOU0lPTl9OT19SRVBPUlQ7CisgICAgICAgIGlmIChmbGFncyAmIFNhbmRib3hF
eHRlbnNpb246OkZsYWdzOjpEb05vdENhbm9uaWNhbGl6ZSkKKyAgICAgICAgICAgIGV4dGVuc2lv
bkZsYWdzIHw9IFNBTkRCT1hfRVhURU5TSU9OX0NBTk9OSUNBTDsKIAogICAgICAgICBzd2l0Y2gg
KHR5cGUpIHsKICAgICAgICAgY2FzZSBTYW5kYm94RXh0ZW5zaW9uOjpUeXBlOjpSZWFkT25seToK
QEAgLTI0NSw3ICsyNDcsOSBAQCBSZWZQdHI8U2FuZGJveEV4dGVuc2lvbj4gU2FuZGJveEV4dGVu
c2lvCiAKIFN0cmluZyBzdHJpbmdCeVJlc29sdmluZ1N5bWxpbmtzSW5QYXRoKGNvbnN0IFN0cmlu
ZyYgcGF0aCkKIHsKLSAgICByZXR1cm4gWyhOU1N0cmluZyAqKXBhdGggc3RyaW5nQnlSZXNvbHZp
bmdTeW1saW5rc0luUGF0aF07CisgICAgY2hhciByZXNvbHZlZFBhdGhbUEFUSF9NQVhdID0geyAw
IH07CisgICAgcmVhbHBhdGgocGF0aC51dGY4KCkuZGF0YSgpLCByZXNvbHZlZFBhdGgpOworICAg
IHJldHVybiBTdHJpbmc6OmZyb21VVEY4KHJlc29sdmVkUGF0aCk7CiB9CiAKIFN0cmluZyByZXNv
bHZlQW5kQ3JlYXRlUmVhZFdyaXRlRGlyZWN0b3J5Rm9yU2FuZGJveEV4dGVuc2lvbihjb25zdCBT
dHJpbmcmIHBhdGgpCkBAIC0yNzYsNyArMjgwLDcgQEAgYm9vbCBTYW5kYm94RXh0ZW5zaW9uOjpj
cmVhdGVIYW5kbGVXaXRobwogewogICAgIEFTU0VSVCghaGFuZGxlLm1fc2FuZGJveEV4dGVuc2lv
bik7CiAKLSAgICBoYW5kbGUubV9zYW5kYm94RXh0ZW5zaW9uID0gU2FuZGJveEV4dGVuc2lvbklt
cGw6OmNyZWF0ZShwYXRoLnV0ZjgoKS5kYXRhKCksIHR5cGUpOworICAgIGhhbmRsZS5tX3NhbmRi
b3hFeHRlbnNpb24gPSBTYW5kYm94RXh0ZW5zaW9uSW1wbDo6Y3JlYXRlKHBhdGgudXRmOCgpLmRh
dGEoKSwgdHlwZSwgV1RGOjpudWxsb3B0LCBTYW5kYm94RXh0ZW5zaW9uOjpGbGFnczo6RG9Ob3RD
YW5vbmljYWxpemUpOwogICAgIGlmICghaGFuZGxlLm1fc2FuZGJveEV4dGVuc2lvbikgewogICAg
ICAgICBMT0dfRVJST1IoIkNvdWxkIG5vdCBjcmVhdGUgYSBzYW5kYm94IGV4dGVuc2lvbiBmb3Ig
JyVzJyIsIHBhdGgudXRmOCgpLmRhdGEoKSk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKSW5kZXg6
IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAo9PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t
LSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAJKHJldmlzaW9uIDI3
NjY0NCkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAkod29y
a2luZyBjb3B5KQpAQCAtNzUwLDcgKzc1MCw3IEBAIFdlYlByb2Nlc3NEYXRhU3RvcmVQYXJhbWV0
ZXJzIFdlYlByb2Nlc3MKIAogICAgIFN0cmluZyBqYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRpcmVj
dG9yeTsKICAgICBpZiAoIW1famF2YVNjcmlwdENvbmZpZ3VyYXRpb25EaXJlY3RvcnkuaXNFbXB0
eSgpKQotICAgICAgICBqYXZhU2NyaXB0Q29uZmlndXJhdGlvbkRpcmVjdG9yeSA9IG1famF2YVNj
cmlwdENvbmZpZ3VyYXRpb25EaXJlY3Rvcnk7CisgICAgICAgIGphdmFTY3JpcHRDb25maWd1cmF0
aW9uRGlyZWN0b3J5ID0gcmVzb2x2ZVBhdGhGb3JTYW5kYm94RXh0ZW5zaW9uKG1famF2YVNjcmlw
dENvbmZpZ3VyYXRpb25EaXJlY3RvcnkpOwogICAgIGVsc2UgaWYgKGphdmFTY3JpcHRDb25maWd1
cmF0aW9uRmlsZUVuYWJsZWQoKSkKICAgICAgICAgamF2YVNjcmlwdENvbmZpZ3VyYXRpb25EaXJl
Y3RvcnkgPSB3ZWJzaXRlRGF0YVN0b3JlLnJlc29sdmVkSmF2YVNjcmlwdENvbmZpZ3VyYXRpb25E
aXJlY3RvcnkoKTsKIAo=
</data>

          </attachment>
      

    </bug>

</bugzilla>