diff options
author | Colin Watson <cjwatson@debian.org> | 2013-05-07 10:06:42 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-05-07 10:06:42 +0100 |
commit | ecebda56da46a03dafff923d91c382f31faa9eec (patch) | |
tree | 449614b6c06a2622c74a609b31fcc46c60037c56 /ssh-gss.h | |
parent | c6a2c0334e45419875687d250aed9bea78480f2e (diff) | |
parent | ffc06452028ba78cd693d4ed43df8b60a10d6163 (diff) |
merge 6.2p1; reorder additions to monitor.h for easier merging in future
Diffstat (limited to 'ssh-gss.h')
-rw-r--r-- | ssh-gss.h | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -42,12 +42,13 @@ | |||
42 | # include <gssapi/gssapi_generic.h> | 42 | # include <gssapi/gssapi_generic.h> |
43 | # endif | 43 | # endif |
44 | 44 | ||
45 | /* MIT Kerberos doesn't seem to define GSS_NT_HOSTBASED_SERVICE */ | 45 | /* Old MIT Kerberos doesn't seem to define GSS_NT_HOSTBASED_SERVICE */ |
46 | 46 | ||
47 | #ifndef GSS_C_NT_HOSTBASED_SERVICE | 47 | # if !HAVE_DECL_GSS_C_NT_HOSTBASED_SERVICE |
48 | #define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name | 48 | # define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name |
49 | #endif /* GSS_C_NT_... */ | 49 | # endif /* !HAVE_DECL_GSS_C_NT_... */ |
50 | #endif /* !HEIMDAL */ | 50 | |
51 | # endif /* !HEIMDAL */ | ||
51 | #endif /* KRB5 */ | 52 | #endif /* KRB5 */ |
52 | 53 | ||
53 | /* draft-ietf-secsh-gsskeyex-06 */ | 54 | /* draft-ietf-secsh-gsskeyex-06 */ |