diff options
author | des <des@FreeBSD.org> | 2010-03-09 19:16:43 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2010-03-09 19:16:43 +0000 |
commit | c3510f9e73156eaabbbfc18da7d796b9f9ff7ea9 (patch) | |
tree | 286162d33ef4c84bb329fd42641bbe0dd68cc42c /crypto/openssh/config.h | |
parent | 68f48e51f9a4d71d7fb9c332592215895a206ff6 (diff) | |
parent | 57baac6b030508c9bcd74f3b995bd6a4a4f79211 (diff) | |
download | FreeBSD-src-c3510f9e73156eaabbbfc18da7d796b9f9ff7ea9.zip FreeBSD-src-c3510f9e73156eaabbbfc18da7d796b9f9ff7ea9.tar.gz |
Upgrade to OpenSSH 5.4p1.
MFC after: 1 month
Diffstat (limited to 'crypto/openssh/config.h')
-rw-r--r-- | crypto/openssh/config.h | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/crypto/openssh/config.h b/crypto/openssh/config.h index 2240a37..66e3c7a 100644 --- a/crypto/openssh/config.h +++ b/crypto/openssh/config.h @@ -123,6 +123,9 @@ /* Define if you don't want to use wtmpx */ #define DISABLE_WTMPX 1 +/* Enable for PKCS#11 support */ +#define ENABLE_PKCS11 + /* Builtin PRNG command timeout */ #define ENTROPY_TIMEOUT_MSEC 200 @@ -462,6 +465,9 @@ /* Define to 1 if you have the <glob.h> header file. */ #define HAVE_GLOB_H 1 +/* Define to 1 if you have the `group_from_gid' function. */ +#define HAVE_GROUP_FROM_GID 1 + /* Define to 1 if you have the <gssapi_generic.h> header file. */ /* #undef HAVE_GSSAPI_GENERIC_H */ @@ -552,9 +558,6 @@ /* Define to 1 if you have the `pam' library (-lpam). */ #define HAVE_LIBPAM 1 -/* Define to 1 if you have the `sectok' library (-lsectok). */ -/* #undef HAVE_LIBSECTOK */ - /* Define to 1 if you have the `socket' library (-lsocket). */ /* #undef HAVE_LIBSOCKET */ @@ -736,9 +739,6 @@ /* define if you have sa_family_t data type */ #define HAVE_SA_FAMILY_T 1 -/* Define to 1 if you have the <sectok.h> header file. */ -/* #undef HAVE_SECTOK_H */ - /* Define if you have SecureWare-based protected password database */ /* #undef HAVE_SECUREWARE */ @@ -763,6 +763,9 @@ /* Define to 1 if you have the `seteuid' function. */ #define HAVE_SETEUID 1 +/* Define to 1 if you have the `setgroupent' function. */ +#define HAVE_SETGROUPENT 1 + /* Define to 1 if you have the `setgroups' function. */ #define HAVE_SETGROUPS 1 @@ -772,6 +775,9 @@ /* Define to 1 if you have the `setluid' function. */ /* #undef HAVE_SETLUID */ +/* Define to 1 if you have the `setpassent' function. */ +#define HAVE_SETPASSENT 1 + /* Define to 1 if you have the `setpcred' function. */ /* #undef HAVE_SETPCRED */ @@ -1075,6 +1081,9 @@ /* Define to 1 if you have the <usersec.h> header file. */ /* #undef HAVE_USERSEC_H */ +/* Define to 1 if you have the `user_from_uid' function. */ +#define HAVE_USER_FROM_UID 1 + /* Define to 1 if you have the <util.h> header file. */ /* #undef HAVE_UTIL_H */ @@ -1184,6 +1193,9 @@ EOPNOTSUPP. */ /* #undef LINK_OPNOTSUPP_ERRNO */ +/* Adjust Linux out-of-memory killer */ +/* #undef LINUX_OOM_ADJUST */ + /* max value of long long calculated by configure */ /* #undef LLONG_MAX */ @@ -1303,9 +1315,6 @@ /* Define if your skeychallenge() function takes 4 arguments (NetBSD) */ /* #undef SKEYCHALLENGE_4ARG */ -/* Define if you want smartcard support */ -/* #undef SMARTCARD */ - /* Define as const if snprintf() can declare const char *fmt */ #define SNPRINTF_CONST const @@ -1373,9 +1382,6 @@ /* Use libedit for sftp */ #define USE_LIBEDIT 1 -/* Define if you want smartcard support using OpenSC */ -/* #undef USE_OPENSC */ - /* Enable OpenSSL engine support */ #define USE_OPENSSL_ENGINE 1 @@ -1385,9 +1391,6 @@ /* Use PIPES instead of a socketpair() */ /* #undef USE_PIPES */ -/* Define if you want smartcard support using sectok */ -/* #undef USE_SECTOK */ - /* Define if you have Solaris process contracts */ /* #undef USE_SOLARIS_PROCESS_CONTRACTS */ @@ -1413,8 +1416,8 @@ /* Define if you want SELinux support. */ /* #undef WITH_SELINUX */ -/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most - significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ +/* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ #if defined __BIG_ENDIAN__ # define WORDS_BIGENDIAN 1 #elif ! defined __LITTLE_ENDIAN__ |