CVS commit: src/crypto/external/bsd/openssh/dist

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Fri Apr 15 14:00:07 UTC 2022

Modified Files:
        src/crypto/external/bsd/openssh/dist: PROTOCOL auth-rhosts.c
            auth2-pubkey.c channels.c channels.h misc.c monitor.c myproposal.h
            scp.1 scp.c servconf.c servconf.h sftp-client.c sftp-client.h
            sftp-glob.c sftp-server.c sftp.1 sftp.c ssh-agent.1 ssh-keygen.c
            ssh-keysign.8 ssh.1 ssh.c ssh_config.5 sshd.8 sshd.c sshd_config.5
            sshsig.c version.h xmalloc.c

Log Message:
merge conflicts between OpenSSH-8.9 and OpenSSH-9.0


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssh/dist/PROTOCOL
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssh/dist/auth-rhosts.c
cvs rdiff -u -r1.30 -r1.31 \
    src/crypto/external/bsd/openssh/dist/auth2-pubkey.c \
    src/crypto/external/bsd/openssh/dist/misc.c \
    src/crypto/external/bsd/openssh/dist/sftp-client.c
cvs rdiff -u -r1.35 -r1.36 src/crypto/external/bsd/openssh/dist/channels.c
cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssh/dist/channels.h
cvs rdiff -u -r1.39 -r1.40 src/crypto/external/bsd/openssh/dist/monitor.c \
    src/crypto/external/bsd/openssh/dist/servconf.c \
    src/crypto/external/bsd/openssh/dist/ssh.c \
    src/crypto/external/bsd/openssh/dist/version.h
cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssh/dist/myproposal.h
cvs rdiff -u -r1.26 -r1.27 src/crypto/external/bsd/openssh/dist/scp.1 \
    src/crypto/external/bsd/openssh/dist/servconf.h \
    src/crypto/external/bsd/openssh/dist/sftp-server.c \
    src/crypto/external/bsd/openssh/dist/sshd.8
cvs rdiff -u -r1.34 -r1.35 src/crypto/external/bsd/openssh/dist/scp.c \
    src/crypto/external/bsd/openssh/dist/sftp.c
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/dist/sftp-client.h
cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/openssh/dist/sftp-glob.c \
    src/crypto/external/bsd/openssh/dist/xmalloc.c
cvs rdiff -u -r1.25 -r1.26 src/crypto/external/bsd/openssh/dist/sftp.1
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/ssh-agent.1
cvs rdiff -u -r1.42 -r1.43 src/crypto/external/bsd/openssh/dist/ssh-keygen.c
cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssh/dist/ssh-keysign.8
cvs rdiff -u -r1.32 -r1.33 src/crypto/external/bsd/openssh/dist/ssh.1
cvs rdiff -u -r1.33 -r1.34 src/crypto/external/bsd/openssh/dist/ssh_config.5
cvs rdiff -u -r1.45 -r1.46 src/crypto/external/bsd/openssh/dist/sshd.c
cvs rdiff -u -r1.37 -r1.38 src/crypto/external/bsd/openssh/dist/sshd_config.5
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/dist/sshsig.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.