diff options
| author | Colin Watson <cjwatson@debian.org> | 2013-05-07 11:47:26 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2013-05-07 11:47:26 +0100 |
| commit | 2ea3f720daeb1ca9f765365fce3a9546961fe624 (patch) | |
| tree | c4fb7d1f51fa51e7677232de806aae150e29e2ac /includes.h | |
| parent | f5efcd3450bbf8261915e0c4a6f851229dddaa79 (diff) | |
| parent | ecebda56da46a03dafff923d91c382f31faa9eec (diff) | |
* New upstream release (http://www.openssh.com/txt/release-6.2).
- Add support for multiple required authentication in SSH protocol 2 via
an AuthenticationMethods option (closes: #195716).
- Fix Sophie Germain formula in moduli(5) (closes: #698612).
- Update ssh-copy-id to Phil Hands' greatly revised version (closes:
#99785, #322228, #620428; LP: #518883, #835901, #1074798).
Diffstat (limited to 'includes.h')
| -rw-r--r-- | includes.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/includes.h b/includes.h index b4c53d9b4..3e206c899 100644 --- a/includes.h +++ b/includes.h | |||
| @@ -137,8 +137,10 @@ | |||
| 137 | # include <tmpdir.h> | 137 | # include <tmpdir.h> |
| 138 | #endif | 138 | #endif |
| 139 | 139 | ||
| 140 | #ifdef HAVE_LIBUTIL_H | 140 | #if defined(HAVE_BSD_LIBUTIL_H) |
| 141 | # include <libutil.h> /* Openpty on FreeBSD at least */ | 141 | # include <bsd/libutil.h> |
| 142 | #elif defined(HAVE_LIBUTIL_H) | ||
| 143 | # include <libutil.h> | ||
| 142 | #endif | 144 | #endif |
| 143 | 145 | ||
| 144 | #if defined(KRB5) && defined(USE_AFS) | 146 | #if defined(KRB5) && defined(USE_AFS) |