[openssh-commits] [openssh] branch master updated (fcd78e31 -> 2709809f)

Thu May 25 18:26:12 AEST 2023

This is an automated email from the git hooks/post-receive script.

dtucker pushed a change to branch master
in repository openssh.

      from  fcd78e31  upstream: fix AuthorizedPrincipalsCommand when AuthorizedKeysCommand
       new  b4a1efdc  update copyright notices
       new  cf84498f  ssh-copy-id: add -x option (for debugging)
       new  bdcaf793  Special case OpenWrt instead of Dropbear.
       new  bd382dca  Remove outdated comment
       new  914f4ad1  Fix test error for /bin/sh on Solaris 10 and older
       new  b79e7b88  add -t option to specify the target path
       new  288482f5  make -x also apply to the target script
       new  801cda54  drop whitespace
       new  9de79df6  if -s & -p specified, mention 'sftp -P' on success
       new  204e0bf0  Make ssh-copy-id(1) consistent with OpenSSH.
       new  2709809f  fixup! if -s & -p specified, mention 'sftp -P' on

The 11 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.

Detailed log of new commits:

commit 2709809fd616a0991dc18e3a58dea10fb383c3f0
Author: Philip Hands <phil at hands.com>
Date:   Wed May 24 19:41:14 2023 +0200

    fixup! if -s & -p specified, mention 'sftp -P' on

    success

    SSH-Copy-ID-Upstream: 32686e7c65b4fa2846e474d3315102dfa0f043b0

commit 204e0bf05161b7641500d7ab266c21217412379f
Author: Darren Tucker <dtucker at dtucker.net>
Date:   Tue Aug 3 21:25:48 2021 +1000

    Make ssh-copy-id(1) consistent with OpenSSH.

    This makes the ssh-copy-id man page more consistent with the rest of the
    OpenSSH man pages:
    - new sentence, new line
    - no sentences >80
    - N.B. -> NB
    - zap unused .Pp
    - zap trailing whitespace

    Report from Debian via mindrot bz#3331, diff from jmc at openbsd.org.

    SSH-Copy-ID-Upstream: d8974cfb6242316460ed22a1ccc662800a50c5d3

commit 9de79df66d1430d290fab670bb4b18612875e518
Author: Philip Hands <phil at hands.com>
Date:   Wed May 24 11:45:43 2023 +0200

    if -s & -p specified, mention 'sftp -P' on success

    This was inspired by this:
     https://github.com/openssh/openssh-portable/pull/321
    but I thought that it was better to not do the sed patching.

    BTW the reason one can get away with using $SSH_OPTS throughout, despite
    the lowercase -p in there, even if sftp is in use, is that the sftp call
    is using the already-established ssh master connection, so the port was
    passed to the earlier ssh.

    SSH-Copy-ID-Upstream: 1c124d9bfafdbe28a00b683367ebf5750ce12eb2

commit 801cda54c00e0f4e7d89345a90874c8d05dc233a
Author: Philip Hands <phil at hands.com>
Date:   Tue May 23 23:07:11 2023 +0200

    drop whitespace

    SSH-Copy-ID-Upstream: e604fae1cdee35c18055d35dcec530cf12ef00ad

commit 288482f53613f3e74544eb92deeb24f7c7f1f371
Author: Philip Hands <phil at hands.com>
Date:   Tue May 23 20:52:13 2023 +0200

    make -x also apply to the target script

    SSH-Copy-ID-Upstream: 3c4214704f427bd0654adf9b0fc079253db21cf4

commit b79e7b88ed44f0e4339f0ff35c96c78a92175a8d
Author: Philip Hands <phil at hands.com>
Date:   Tue May 23 16:46:42 2023 +0200

    add -t option to specify the target path

    Allow the default target path (.ssh/authorized_files) to be over-riden

    This was inspired by this MR from Panagiotis Cheilaris <philaris at cs.ntua.gr>

     https://gitlab.com/phil_hands/ssh-copy-id/-/merge_requests/8

    SSH-Copy-ID-Upstream: a942a0e076874adb6d8b2f0fb76d6c7918190fcd

commit 914f4ad138714c471ba72fb6d5496b6235320edd
Author: Carlos Rodríguez Gili <carlos.rodriguez-gili at upc.edu>
Date:   Tue Apr 20 19:23:57 2021 +0200

    Fix test error for /bin/sh on Solaris 10 and older

    On Solaris 10 and older targets /bin/sh is not POSIX-compliant.
    Test -z `...` fails with error 'sh: test: argument expected'.
    Using quotes around backticks fixes this and doesn't break
    POSIX compatibility.

    SSH-Copy-ID-Upstream: 98394072a3f985b2650c1e8eab2fef84e38cc065

commit bd382dca316c721aed1e45edcf4c4e0f6374afb0
Author: Jakub Jelen <jjelen at redhat.com>
Date:   Tue Mar 2 21:34:05 2021 +0000

    Remove outdated comment

    The commit b068122 removed the code dropping the trailing colon, but the comment stayed leaving the code confusing for future readers

    SSH-Copy-ID-Upstream: 930d39f238117cd53810240ec989d0356aa1c1f6

commit bdcaf7939029433635d63aade8f9ac762aca2bbe
Author: Darren Tucker <dtucker at dtucker.net>
Date:   Wed May 10 18:50:46 2023 +1000

    Special case OpenWrt instead of Dropbear.

    OpenWrt overrides the location of authorized_keys for root.  Currently we
    assume that all Dropbear installations behave this way, which is not the
    case.  Check for OpenWrt and root user before using that location instead
    of assuming that for all Dropbear servers.  Prompted by Github PR#250.

    SSH-Copy-ID-Upstream: 0e1f5d443a9967483c33945793107ae3f3e4af2d

commit cf84498f67abe93f813a296167b406a0db7b288e
Author: Philip Hands <phil at hands.com>
Date:   Thu May 18 18:20:55 2023 +0200

    ssh-copy-id: add -x option (for debugging)

    This option causes the ssh-copy-id to run with set -x

    SSH-Copy-ID-Upstream: a0ee367ea8c0a29c8b4515245e408d2d349e7844

commit b4a1efdcb88f03394c08e7f68ed4e11676830002
Author: Philip Hands <phil at hands.com>
Date:   Thu May 18 17:14:41 2023 +0200

    update copyright notices

    SSH-Copy-ID-Upstream: c284ed33b361814ea48ff68cbd01ca525b2bf117

Summary of changes:
 contrib/ssh-copy-id   | 75 +++++++++++++++++++++++++++---------------------
 contrib/ssh-copy-id.1 | 79 +++++++++++++++++++++++++++++++++------------------
 2 files changed, 94 insertions(+), 60 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.