diff options
| author | des <des@FreeBSD.org> | 2004-01-07 11:16:27 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-01-07 11:16:27 +0000 |
| commit | 7545fb1c7eaf9a0f07cf592ab1b5aa8f59a59866 (patch) | |
| tree | 5fffd9d1fcec3a05be383fc9aa81e1eb5e7935de /crypto/openssh/ssh.h | |
| parent | b5f9e06a6d8d64c8429e25a1bc1ebfad436bf477 (diff) | |
| download | FreeBSD-src-7545fb1c7eaf9a0f07cf592ab1b5aa8f59a59866.zip FreeBSD-src-7545fb1c7eaf9a0f07cf592ab1b5aa8f59a59866.tar.gz | |
Resolve conflicts and remove obsolete files.
Sponsored by: registrar.no
Diffstat (limited to 'crypto/openssh/ssh.h')
| -rw-r--r-- | crypto/openssh/ssh.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/crypto/openssh/ssh.h b/crypto/openssh/ssh.h index 0a6ad13..e88b9b8 100644 --- a/crypto/openssh/ssh.h +++ b/crypto/openssh/ssh.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.h,v 1.71 2002/06/22 02:00:29 stevesk Exp $ */ +/* $OpenBSD: ssh.h,v 1.74 2003/09/01 13:52:18 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -20,7 +20,6 @@ #include <stdarg.h> /* For va_list */ #include <syslog.h> /* For LOG_AUTH and friends */ #include <sys/socket.h> /* For struct sockaddr_storage */ -#include "openbsd-compat/fake-socket.h" /* For struct sockaddr_storage */ #ifdef HAVE_SYS_SELECT_H # include <sys/select.h> #endif @@ -89,9 +88,6 @@ */ #define SSH_SESSION_KEY_LENGTH 32 -/* Name of Kerberos service for SSH to use. */ -#define KRB4_SERVICE_NAME "rcmd" - /* Used to identify ``EscapeChar none'' */ #define SSH_ESCAPECHAR_NONE -2 |
