diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:38:40 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:38:40 +0000 |
commit | 1b816ea846aca3ee89e7995373ace609e9518424 (patch) | |
tree | b41cdc8495cae7fa9c2e0f98a5f2e71656b61f9a /auth-krb5.c | |
parent | fa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (diff) | |
parent | 086ea76990b1e6287c24b6db74adffd4605eb3b0 (diff) |
import openssh-4.6p1-gsskex-20070312.patch
Diffstat (limited to 'auth-krb5.c')
-rw-r--r-- | auth-krb5.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/auth-krb5.c b/auth-krb5.c index bc37675a2..38164fda8 100644 --- a/auth-krb5.c +++ b/auth-krb5.c | |||
@@ -1,3 +1,4 @@ | |||
1 | /* $OpenBSD: auth-krb5.c,v 1.19 2006/08/03 03:34:41 deraadt Exp $ */ | ||
1 | /* | 2 | /* |
2 | * Kerberos v5 authentication and ticket-passing routines. | 3 | * Kerberos v5 authentication and ticket-passing routines. |
3 | * | 4 | * |
@@ -28,18 +29,27 @@ | |||
28 | */ | 29 | */ |
29 | 30 | ||
30 | #include "includes.h" | 31 | #include "includes.h" |
31 | RCSID("$OpenBSD: auth-krb5.c,v 1.16 2005/11/21 09:42:10 dtucker Exp $"); | ||
32 | 32 | ||
33 | #include <sys/types.h> | ||
34 | #include <pwd.h> | ||
35 | #include <stdarg.h> | ||
36 | |||
37 | #include "xmalloc.h" | ||
33 | #include "ssh.h" | 38 | #include "ssh.h" |
34 | #include "ssh1.h" | 39 | #include "ssh1.h" |
35 | #include "packet.h" | 40 | #include "packet.h" |
36 | #include "xmalloc.h" | ||
37 | #include "log.h" | 41 | #include "log.h" |
42 | #include "buffer.h" | ||
38 | #include "servconf.h" | 43 | #include "servconf.h" |
39 | #include "uidswap.h" | 44 | #include "uidswap.h" |
45 | #include "key.h" | ||
46 | #include "hostfile.h" | ||
40 | #include "auth.h" | 47 | #include "auth.h" |
41 | 48 | ||
42 | #ifdef KRB5 | 49 | #ifdef KRB5 |
50 | #include <errno.h> | ||
51 | #include <unistd.h> | ||
52 | #include <string.h> | ||
43 | #include <krb5.h> | 53 | #include <krb5.h> |
44 | 54 | ||
45 | extern ServerOptions options; | 55 | extern ServerOptions options; |