[dovecot/core] 9f6738: lib: Reformat iostream-pump.h.

Sun Mar 18 15:00:38 EET 2018

  Branch: refs/heads/master
  Home:   https://github.com/dovecot/core
  Commit: 9f67382489af7696d1f7980eeed170040904c596
      https://github.com/dovecot/core/commit/9f67382489af7696d1f7980eeed170040904c596
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib/iostream-pump.h

  Log Message:
  -----------
  lib: Reformat iostream-pump.h.

  Commit: b056116e1b7791e8d678a83455617695c8b1d72c
      https://github.com/dovecot/core/commit/b056116e1b7791e8d678a83455617695c8b1d72c
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib/iostream-pump.c

  Log Message:
  -----------
  lib: Reformat iostream-pump.c.

  Commit: 64bd49bb81de4602cdbf274431680bf2bfc5840b
      https://github.com/dovecot/core/commit/64bd49bb81de4602cdbf274431680bf2bfc5840b
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib/test-iostream-pump.c

  Log Message:
  -----------
  lib: Reformat test-iostream-pump.c.

  Commit: 003dbc09fc886267ad3b439115452feb644f1e56
      https://github.com/dovecot/core/commit/003dbc09fc886267ad3b439115452feb644f1e56
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib/iostream-pump.c

  Log Message:
  -----------
  lib: iostream-pump: Use refcount as name and int as type for reference count field.

This is what the rest of Dovecot uses.

  Commit: b37d0e1004a257a618095b409a7a4bab15d23d92
      https://github.com/dovecot/core/commit/b37d0e1004a257a618095b409a7a4bab15d23d92
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib/iostream-pump.c
    M src/lib/iostream-pump.h

  Log Message:
  -----------
  lib: iostream-pump: Make iostream_pump_unref() implementation match other similar code.

This also means that iostream_pump_unref(NULL) is now a no-op.

  Commit: e1f514ef2c6b47fffe0e9cab146be8817ba46a57
      https://github.com/dovecot/core/commit/e1f514ef2c6b47fffe0e9cab146be8817ba46a57
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib/iostream-pump.c
    M src/lib/iostream-pump.h

  Log Message:
  -----------
  lib: iostream-pump: Add iostream_pump_destroy().

This functions always stops the pump and dereferences the streams before
dereferencing the pump itself.

  Commit: 57b574c5c7920fa83109971ddf894b4751ba1f49
      https://github.com/dovecot/core/commit/57b574c5c7920fa83109971ddf894b4751ba1f49
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib/iostream-pump.c
    M src/lib/test-iostream-pump.c

  Log Message:
  -----------
  lib: iostream-pump: Properly implement running a pump with one of the streams blocking.

Having both streams blocking is not useful and that is now explicitly forbidden.

  Commit: 9cf850fbcaa34eaf9021d582986c9317b4ab18da
      https://github.com/dovecot/core/commit/9cf850fbcaa34eaf9021d582986c9317b4ab18da
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/program-client.c

  Log Message:
  -----------
  lib-program-client: Reformat program-client.c.

  Commit: aad7b112e915034515c7124468b2326466271a95
      https://github.com/dovecot/core/commit/aad7b112e915034515c7124468b2326466271a95
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/program-client.h

  Log Message:
  -----------
  lib-program-client: Reformat program-client.h.

  Commit: f28eeb83d3b48bd899e34a0fa70112b15c91e675
      https://github.com/dovecot/core/commit/f28eeb83d3b48bd899e34a0fa70112b15c91e675
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/program-client-local.c

  Log Message:
  -----------
  lib-program-client: Reformat program-client-local.c.

  Commit: e2128b1556207e4ff9389e2f2744b4fdc94d56e2
      https://github.com/dovecot/core/commit/e2128b1556207e4ff9389e2f2744b4fdc94d56e2
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/program-client-remote.c

  Log Message:
  -----------
  lib-program-client: Reformat program-client-remote.c.

  Commit: 807ed22361870b0a730c8baa45da76f611cd7803
      https://github.com/dovecot/core/commit/807ed22361870b0a730c8baa45da76f611cd7803
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/test-program-client-local.c

  Log Message:
  -----------
  lib-program-client: Reformat test-program-client-local.c.

  Commit: 8f0db728e712b32bb9be9dbf281ba13e83fb77b1
      https://github.com/dovecot/core/commit/8f0db728e712b32bb9be9dbf281ba13e83fb77b1
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/program-client-private.h

  Log Message:
  -----------
  lib-program-client: Reformat program-client-private.h.

  Commit: b1531d935ac4885180f4a59d54344f4a2480e7cf
      https://github.com/dovecot/core/commit/b1531d935ac4885180f4a59d54344f4a2480e7cf
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/test-program-client-net.c

  Log Message:
  -----------
  lib-program-client: Reformat test-program-client-net.c.

  Commit: 71835db78e7645baf5f4c1c06cb5717020bdabe0
      https://github.com/dovecot/core/commit/71835db78e7645baf5f4c1c06cb5717020bdabe0
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/test-program-client-unix.c

  Log Message:
  -----------
  lib-program-client: Reformat test-program-client-unix.c.

  Commit: 0cabc0863ff03a0ac61b7cd3f3193cf4c66a7044
      https://github.com/dovecot/core/commit/0cabc0863ff03a0ac61b7cd3f3193cf4c66a7044
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/program-client-local.c

  Log Message:
  -----------
  lib-program-client: local: Call program client variable "plclient" consistently.

  Commit: 156d6d2089c0eb6f6b8674a564ffb8834bf33eb7
      https://github.com/dovecot/core/commit/156d6d2089c0eb6f6b8674a564ffb8834bf33eb7
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/program-client-remote.c

  Log Message:
  -----------
  lib-program-client: remote: Call program client variable "prclient" consistently.

  Commit: 36e44c0f0bccb517894c40c4313eeb74013df42f
      https://github.com/dovecot/core/commit/36e44c0f0bccb517894c40c4313eeb74013df42f
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/program-client-remote.c

  Log Message:
  -----------
  lib-program-client: remote: Use struct program_client_remote as parameter where possible.

Avoids the need to cast it everywhere.

  Commit: c1d11effccbfc111b4250b1ede567c3754df8286
      https://github.com/dovecot/core/commit/c1d11effccbfc111b4250b1ede567c3754df8286
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/program-client.c

  Log Message:
  -----------
  lib-program-client: Make sure program client callback is called only once.

  Commit: 9799593989c402e3ec0ae55c60e1f58f8838d945
      https://github.com/dovecot/core/commit/9799593989c402e3ec0ae55c60e1f58f8838d945
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/program-client-remote.c

  Log Message:
  -----------
  lib-program-client: remote: Always shut down the output when all is written.

Before, this step was omitted when dot streams were used. However, shutting down
the output is necessary no matter what. Otherwise, the receiving end will not
see that no more input will follow, causing deadlock.

  Commit: e5abc312ec38555a635505d68e101094c5490b72
      https://github.com/dovecot/core/commit/e5abc312ec38555a635505d68e101094c5490b72
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/test-program-client-unix.c

  Log Message:
  -----------
  lib-program-client: test-program-client-unix: Further fix error handling in test_program_input().

  Commit: 4712d0a1e0a5fecd38f1dfbf5152d1fe3e776b9c
      https://github.com/dovecot/core/commit/4712d0a1e0a5fecd38f1dfbf5152d1fe3e776b9c
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/test-program-client-net.c

  Log Message:
  -----------
  lib-program-client: test-program-client-net: Match client input handling code with test-program-client-unix.

  Commit: 42d2755b32f5d840abb7a67e611977adef8e6f7c
      https://github.com/dovecot/core/commit/42d2755b32f5d840abb7a67e611977adef8e6f7c
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/test-program-client-unix.c

  Log Message:
  -----------
  lib-program-client: test-program-client-unix: Create body stream only once in test_program_input_handle().

  Commit: ffbff246652cd3ee41d7131295e076c6db6768a2
      https://github.com/dovecot/core/commit/ffbff246652cd3ee41d7131295e076c6db6768a2
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/test-program-client-net.c

  Log Message:
  -----------
  lib-program-client: test-program-client-net: Create body streams only once in test_program_input_handle().

  Commit: d5a55c51517bcf14e8b0eb1142d3930e835c3969
      https://github.com/dovecot/core/commit/d5a55c51517bcf14e8b0eb1142d3930e835c3969
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/test-program-client-unix.c

  Log Message:
  -----------
  lib-program-client: test-program-client-unix: Handle test client connections non-blocking.

  Commit: 7b56efa93a523d3bbbcc1be42fafec36b0dff869
      https://github.com/dovecot/core/commit/7b56efa93a523d3bbbcc1be42fafec36b0dff869
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/test-program-client-net.c

  Log Message:
  -----------
  lib-program-client: test-program-client-net: Handle test client connections non-blocking.

  Commit: fe1de26fdb3eef8237b7d1250022e6cbbc17062e
      https://github.com/dovecot/core/commit/fe1de26fdb3eef8237b7d1250022e6cbbc17062e
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/test-program-client-unix.c

  Log Message:
  -----------
  lib-program-client: test-program-client-unix: Destroy test client upon error.

This prevents infinite input event loop when something goes wrong.

  Commit: 2d9b387f2d8c459e5b5aa4fcd2017679816b7f38
      https://github.com/dovecot/core/commit/2d9b387f2d8c459e5b5aa4fcd2017679816b7f38
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/test-program-client-net.c

  Log Message:
  -----------
  lib-program-client: test-program-client-net: Destroy test client upon error.

This prevents infinite input event loop when something goes wrong.

  Commit: 81f430edc671b1a38c3389b6d84fe2f2c9e48e30
      https://github.com/dovecot/core/commit/81f430edc671b1a38c3389b6d84fe2f2c9e48e30
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/test-program-client-unix.c

  Log Message:
  -----------
  lib-program-client: test-program-client-unix: Properly recognize the noreply script protocol option.

Somehow the equivalent test-program-client-net code does not have this problem.
And somehow this test did not fail before.

  Commit: 19711ad047d57e366c2e1f8906bb0ec9dee37dc6
      https://github.com/dovecot/core/commit/19711ad047d57e366c2e1f8906bb0ec9dee37dc6
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/test-program-client-net.c

  Log Message:
  -----------
  lib-program-client: test-program-client-net: Read the client input stream to EOF after the dot stream is closed.

The low-level file stream is not necessarily read to EOF when the body dot
stream sees EOF.

  Commit: 8760bc069233fd7dfda797fcd36c27c7f797b146
      https://github.com/dovecot/core/commit/8760bc069233fd7dfda797fcd36c27c7f797b146
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/program-client-local.c
    M src/lib-program-client/program-client-private.h
    M src/lib-program-client/program-client-remote.c
    M src/lib-program-client/program-client.c

  Log Message:
  -----------
  lib-program-client: Use iostream-temp rather than istream-seekable for seekable output.

This considerably simplifies the code.

  Commit: 6acc2464b039fea6a2528b493beff60869a0b761
      https://github.com/dovecot/core/commit/6acc2464b039fea6a2528b493beff60869a0b761
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/program-client-private.h
    M src/lib-program-client/program-client-remote.c
    M src/lib-program-client/program-client.c

  Log Message:
  -----------
  lib-program-client: Initialize dot streams right after the connection is established.

This avoids creating the dot streams in the input/output handlers, which makes
the code cleaner and easier to port to using iostream-pump.

  Commit: 82fc7bdfc52a093990d370a2da87285af1b0fc4f
      https://github.com/dovecot/core/commit/82fc7bdfc52a093990d370a2da87285af1b0fc4f
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/program-client-private.h
    M src/lib-program-client/program-client.c

  Log Message:
  -----------
  lib-program-client: Use iostream-pump for streaming data towards program.

  Commit: f5ceca9f6c9540681283f150887215a5ae7e103d
      https://github.com/dovecot/core/commit/f5ceca9f6c9540681283f150887215a5ae7e103d
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/program-client-local.c
    M src/lib-program-client/program-client-private.h
    M src/lib-program-client/program-client-remote.c
    M src/lib-program-client/program-client.c

  Log Message:
  -----------
  lib-program-client: Change return type of program_client_connected() to void.

Returning an int status code is no longer useful.

  Commit: 2de592609e9f32f2ce25203ff79fbcf8465c406c
      https://github.com/dovecot/core/commit/2de592609e9f32f2ce25203ff79fbcf8465c406c
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/program-client-local.c

  Log Message:
  -----------
  lib-program-client: local: Stop immediately when child program without I/O ends.

Particularly, don't perform this by calling the input handler.

  Commit: b51abde99b8a949f45a299b75e2fdfc9e359ea0a
      https://github.com/dovecot/core/commit/b51abde99b8a949f45a299b75e2fdfc9e359ea0a
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/program-client-remote.c

  Log Message:
  -----------
  lib-program-client: remote: Initialize program_client_istream with parent FD.

This way, io_add_istream() works as expected.

  Commit: fc83bcaa8b76832a703763d88019e28fe19e7f74
      https://github.com/dovecot/core/commit/fc83bcaa8b76832a703763d88019e28fe19e7f74
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/program-client.c

  Log Message:
  -----------
  lib-program-client: Destroy timeout once client is passively disconnected.

  Commit: 33065ed599071b974b867c3a84bc44850f48d8d5
      https://github.com/dovecot/core/commit/33065ed599071b974b867c3a84bc44850f48d8d5
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/program-client-private.h
    M src/lib-program-client/program-client.c

  Log Message:
  -----------
  lib-program-client: Use iostream-pump for streaming data from program.

  Commit: 95885b1eb62122806ff2a5cde440785204198f96
      https://github.com/dovecot/core/commit/95885b1eb62122806ff2a5cde440785204198f96
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/program-client-remote.c

  Log Message:
  -----------
  lib-program-client: remote: Don't try to read remaining input at disconnect.

This code is no longer relevant. At disconnect, there is nothing left to be read
by definition.

  Commit: a2e3a3515de2faa073274f3c6616e9bcbfe2754f
      https://github.com/dovecot/core/commit/a2e3a3515de2faa073274f3c6616e9bcbfe2754f
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/program-client.c

  Log Message:
  -----------
  lib-program-client: Simplify disconnect handling.

Perform all of the cleanups in a separate shared function.
Always close all fds, since there is nothing left to be read or written at
disconnect.

  Commit: 745177592c62a03a42d75adfada9f1dfa7ad22c0
      https://github.com/dovecot/core/commit/745177592c62a03a42d75adfada9f1dfa7ad22c0
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/program-client-local.c

  Log Message:
  -----------
  lib-program-client: local: Make sure the child is dead once the program client is destroyed.

  Commit: 88c23d1ab7dd18d822101cb7a0b1567ac3fdf16c
      https://github.com/dovecot/core/commit/88c23d1ab7dd18d822101cb7a0b1567ac3fdf16c
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/program-client-local.c

  Log Message:
  -----------
  lib-program-client: local: Cleanup any kill timeout while program client is destroyed.

  Commit: 1f5a761af239b608c5dfcb10cd531b65654d95d3
      https://github.com/dovecot/core/commit/1f5a761af239b608c5dfcb10cd531b65654d95d3
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/test-program-client-local.c
    M src/lib-program-client/test-program-client-net.c
    M src/lib-program-client/test-program-client-unix.c

  Log Message:
  -----------
  lib-program-client: Make debug mode for test suite optional.

It is now disabled by default.

  Commit: b89cf6b95943e8cee4f2188095b34933dc855af1
      https://github.com/dovecot/core/commit/b89cf6b95943e8cee4f2188095b34933dc855af1
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/program-client-remote.c
    M src/lib-program-client/program-client.c

  Log Message:
  -----------
  lib-program-client: Use i_close_fd() rather than close() when error is not supposed to happen.

  Commit: 23cfbf2451f7191dee1d9995011c898a7bf32bd4
      https://github.com/dovecot/core/commit/23cfbf2451f7191dee1d9995011c898a7bf32bd4
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/program-client-local.c
    M src/lib-program-client/program-client-private.h
    M src/lib-program-client/program-client-remote.c
    M src/lib-program-client/program-client.c
    M src/lib-program-client/program-client.h

  Log Message:
  -----------
  lib-program-client: Use event logging.

This also makes the overall log messages better match similar messages produced
by other parts of Dovecot.

  Commit: 557d4e6b20bd52cb0e998e2f775dc82bc0394d28
      https://github.com/dovecot/core/commit/557d4e6b20bd52cb0e998e2f775dc82bc0394d28
  Author: Stephan Bosch <stephan.bosch at dovecot.fi>
  Date:   2018-03-18 (Sun, 18 Mar 2018)

  Changed paths:
    M src/lib-program-client/program-client-local.c
    M src/lib-program-client/program-client-remote.c
    M src/lib-program-client/program-client.c

  Log Message:
  -----------
  lib-program-client: Add more detailed debug logging.

Compare: https://github.com/dovecot/core/compare/807112358d22...557d4e6b20bd