[Midnightbsd-cvs] src: crypto/openssh: resolve merge conflicts

[laffer1 at midnightbsd.org]

Log Message:
-----------
resolve merge conflicts

Modified Files:
--------------
    src/crypto/openssh:
        ChangeLog (r1.6 -> r1.7)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/ChangeLog?r1=1.6&r2=1.7)
        Makefile.in (r1.6 -> r1.7)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/Makefile.in?r1=1.6&r2=1.7)
        README (r1.6 -> r1.7)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/README?r1=1.6&r2=1.7)
        README.platform (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/README.platform?r1=1.4&r2=1.5)
        auth-pam.c (r1.5 -> r1.6)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/auth-pam.c?r1=1.5&r2=1.6)
        auth-passwd.c (r1.5 -> r1.6)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/auth-passwd.c?r1=1.5&r2=1.6)
        auth1.c (r1.6 -> r1.7)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/auth1.c?r1=1.6&r2=1.7)
        auth2-kbdint.c (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/auth2-kbdint.c?r1=1.4&r2=1.5)
        auth2-pubkey.c (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/auth2-pubkey.c?r1=1.4&r2=1.5)
        auth2.c (r1.6 -> r1.7)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/auth2.c?r1=1.6&r2=1.7)
        canohost.c (r1.5 -> r1.6)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/canohost.c?r1=1.5&r2=1.6)
        channels.c (r1.7 -> r1.8)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/channels.c?r1=1.7&r2=1.8)
        clientloop.c (r1.6 -> r1.7)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/clientloop.c?r1=1.6&r2=1.7)
        configure.ac (r1.6 -> r1.7)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/configure.ac?r1=1.6&r2=1.7)
        defines.h (r1.5 -> r1.6)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/defines.h?r1=1.5&r2=1.6)
        gss-genr.c (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/gss-genr.c?r1=1.4&r2=1.5)
        includes.h (r1.6 -> r1.7)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/includes.h?r1=1.6&r2=1.7)
        kex.c (r1.6 -> r1.7)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/kex.c?r1=1.6&r2=1.7)
        kex.h (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/kex.h?r1=1.4&r2=1.5)
        kexdhs.c (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/kexdhs.c?r1=1.4&r2=1.5)
        kexgexs.c (r1.5 -> r1.6)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/kexgexs.c?r1=1.5&r2=1.6)
        monitor.c (r1.6 -> r1.7)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/monitor.c?r1=1.6&r2=1.7)
        monitor_wrap.c (r1.6 -> r1.7)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/monitor_wrap.c?r1=1.6&r2=1.7)
        monitor_wrap.h (r1.5 -> r1.6)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/monitor_wrap.h?r1=1.5&r2=1.6)
        packet.c (r1.6 -> r1.7)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/packet.c?r1=1.6&r2=1.7)
        readconf.c (r1.6 -> r1.7)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/readconf.c?r1=1.6&r2=1.7)
        readconf.h (r1.5 -> r1.6)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/readconf.h?r1=1.5&r2=1.6)
        servconf.c (r1.8 -> r1.9)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/servconf.c?r1=1.8&r2=1.9)
        serverloop.c (r1.6 -> r1.7)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/serverloop.c?r1=1.6&r2=1.7)
        session.c (r1.6 -> r1.7)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/session.c?r1=1.6&r2=1.7)
        sftp-client.c (r1.6 -> r1.7)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/sftp-client.c?r1=1.6&r2=1.7)
        sftp-server.c (r1.6 -> r1.7)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/sftp-server.c?r1=1.6&r2=1.7)
        ssh-agent.1 (r1.5 -> r1.6)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/ssh-agent.1?r1=1.5&r2=1.6)
        ssh-agent.c (r1.6 -> r1.7)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/ssh-agent.c?r1=1.6&r2=1.7)
        ssh-keygen.c (r1.6 -> r1.7)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/ssh-keygen.c?r1=1.6&r2=1.7)
        ssh.1 (r1.5 -> r1.6)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/ssh.1?r1=1.5&r2=1.6)
        ssh.c (r1.6 -> r1.7)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/ssh.c?r1=1.6&r2=1.7)
        sshconnect.c (r1.6 -> r1.7)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/sshconnect.c?r1=1.6&r2=1.7)
        sshconnect.h (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/sshconnect.h?r1=1.4&r2=1.5)
        sshconnect2.c (r1.5 -> r1.6)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/sshconnect2.c?r1=1.5&r2=1.6)
        sshd.8 (r1.6 -> r1.7)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/sshd.8?r1=1.6&r2=1.7)
        sshd.c (r1.10 -> r1.11)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/sshd.c?r1=1.10&r2=1.11)
        sshd_config.5 (r1.7 -> r1.8)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/sshd_config.5?r1=1.7&r2=1.8)
        version.h (r1.13 -> r1.14)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/version.h?r1=1.13&r2=1.14)
    src/crypto/openssh/openbsd-compat:
        daemon.c (r1.3 -> r1.4)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/openbsd-compat/daemon.c?r1=1.3&r2=1.4)
        getrrsetbyname.c (r1.5 -> r1.6)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/openbsd-compat/getrrsetbyname.c?r1=1.5&r2=1.6)
        openssl-compat.h (r1.4 -> r1.5)
        (http://cvsweb.midnightbsd.org/src/crypto/openssh/openbsd-compat/openssl-compat.h?r1=1.4&r2=1.5)