cvs commit: src/crypto/openssh acconfig.h auth-krb5.c auth-pam.c auth2.c bufaux.c canohost.c channels.c channels.h cipher.c configure.ac envpass.sh hostfile.c includes.h loginrec.c monitor.c monitor_wrap.c readconf.c readconf.h scp.c servconf.c servconf.h ...

[Dag-Erling Smorgrav]

des         2006-03-22 20:41:38 UTC

  FreeBSD src repository

  Modified files:
    crypto/openssh       auth-krb5.c auth-pam.c auth2.c bufaux.c 
                         canohost.c channels.c channels.h cipher.c 
                         configure.ac hostfile.c includes.h 
                         loginrec.c monitor.c monitor_wrap.c 
                         readconf.c readconf.h scp.c servconf.c 
                         servconf.h serverloop.c session.c 
                         ssh-add.c ssh-agent.c ssh-keyscan.c ssh.1 
                         ssh.c ssh_config ssh_config.5 
                         sshconnect.c sshconnect.h sshconnect1.c 
                         sshconnect2.c sshd.8 sshd.c sshd_config 
                         sshd_config.5 version.h 
  Removed files:
    crypto/openssh       acconfig.h envpass.sh 
  Log:
  Merge conflicts.
  
  Revision  Changes    Path
  1.13      +0 -462    src/crypto/openssh/acconfig.h (dead)
  1.21      +4 -7      src/crypto/openssh/auth-krb5.c
  1.18      +14 -4     src/crypto/openssh/auth-pam.c
  1.27      +5 -9      src/crypto/openssh/auth2.c
  1.18      +5 -2      src/crypto/openssh/bufaux.c
  1.19      +20 -21    src/crypto/openssh/canohost.c
  1.22      +130 -38   src/crypto/openssh/channels.c
  1.15      +14 -6     src/crypto/openssh/channels.h
  1.22      +2 -2      src/crypto/openssh/cipher.c
  1.13      +577 -265  src/crypto/openssh/configure.ac
  1.2       +0 -44     src/crypto/openssh/envpass.sh (dead)
  1.16      +3 -3      src/crypto/openssh/hostfile.c
  1.21      +4 -3      src/crypto/openssh/includes.h
  1.11      +4 -4      src/crypto/openssh/loginrec.c
  1.19      +7 -9      src/crypto/openssh/monitor.c
  1.12      +1 -2      src/crypto/openssh/monitor_wrap.c
  1.27      +72 -4     src/crypto/openssh/readconf.c
  1.19      +9 -1      src/crypto/openssh/readconf.h
  1.10      +102 -50   src/crypto/openssh/scp.c
  1.48      +29 -3     src/crypto/openssh/servconf.c
  1.19      +5 -2      src/crypto/openssh/servconf.h
  1.15      +85 -3     src/crypto/openssh/serverloop.c
  1.48      +31 -29    src/crypto/openssh/session.c
  1.17      +6 -2      src/crypto/openssh/ssh-add.c
  1.26      +6 -3      src/crypto/openssh/ssh-agent.c
  1.13      +16 -7     src/crypto/openssh/ssh-keyscan.c
  1.33      +763 -549  src/crypto/openssh/ssh.1
  1.30      +67 -24    src/crypto/openssh/ssh.c
  1.29      +6 -3      src/crypto/openssh/ssh_config
  1.19      +118 -39   src/crypto/openssh/ssh_config.5
  1.31      +39 -4     src/crypto/openssh/sshconnect.c
  1.8       +2 -2      src/crypto/openssh/sshconnect.h
  1.21      +4 -4      src/crypto/openssh/sshconnect1.c
  1.17      +2 -2      src/crypto/openssh/sshconnect2.c
  1.33      +130 -127  src/crypto/openssh/sshd.8
  1.42      +38 -16    src/crypto/openssh/sshd.c
  1.44      +4 -3      src/crypto/openssh/sshd_config
  1.25      +18 -6     src/crypto/openssh/sshd_config.5
  1.32      +4 -4      src/crypto/openssh/version.h