diff options
author | des <des@FreeBSD.org> | 2002-06-27 22:42:11 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2002-06-27 22:42:11 +0000 |
commit | 5ba29faa04960f19c0c3ff005c2b897c3094c1d6 (patch) | |
tree | 8b0c3ca50a9406d306d417f78b63f73616b80615 /crypto/openssh/ssh.h | |
parent | 434f33d82438442b1dab7090fab90db4c3d02cdb (diff) | |
download | FreeBSD-src-5ba29faa04960f19c0c3ff005c2b897c3094c1d6.zip FreeBSD-src-5ba29faa04960f19c0c3ff005c2b897c3094c1d6.tar.gz |
Forcibly revert to mainline.
Diffstat (limited to 'crypto/openssh/ssh.h')
-rw-r--r-- | crypto/openssh/ssh.h | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/crypto/openssh/ssh.h b/crypto/openssh/ssh.h index fd9fd50..e23bb1d 100644 --- a/crypto/openssh/ssh.h +++ b/crypto/openssh/ssh.h @@ -1,5 +1,4 @@ /* $OpenBSD: ssh.h,v 1.70 2002/06/03 12:04:07 deraadt Exp $ */ -/* $FreeBSD$ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -16,6 +15,16 @@ #ifndef SSH_H #define SSH_H +#include <netinet/in.h> /* For struct sockaddr_in */ +#include <pwd.h> /* For struct pw */ +#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 + /* Cipher used for encrypting authentication files. */ #define SSH_AUTHFILE_CIPHER SSH_CIPHER_3DES @@ -51,6 +60,10 @@ */ #define SSH_SERVICE_NAME "ssh" +#if defined(USE_PAM) && !defined(SSHD_PAM_SERVICE) +# define SSHD_PAM_SERVICE __progname +#endif + /* * Name of the environment variable containing the pathname of the * authentication socket. @@ -91,13 +104,11 @@ * sshd will change its privileges to this user and its * primary group. */ +#ifndef SSH_PRIVSEP_USER #define SSH_PRIVSEP_USER "sshd" +#endif /* Minimum modulus size (n) for RSA keys. */ #define SSH_RSA_MINIMUM_MODULUS_SIZE 768 -#ifdef USE_PAM -#include "auth-pam.h" -#endif /* USE_PAM */ - #endif /* SSH_H */ |