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 /gss-serv-krb5.c | |
parent | fa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (diff) | |
parent | 086ea76990b1e6287c24b6db74adffd4605eb3b0 (diff) |
import openssh-4.6p1-gsskex-20070312.patch
Diffstat (limited to 'gss-serv-krb5.c')
-rw-r--r-- | gss-serv-krb5.c | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/gss-serv-krb5.c b/gss-serv-krb5.c index 5c5837ffb..b400081f6 100644 --- a/gss-serv-krb5.c +++ b/gss-serv-krb5.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: gss-serv-krb5.c,v 1.4 2005/10/13 19:08:08 stevesk Exp $ */ | 1 | /* $OpenBSD: gss-serv-krb5.c,v 1.7 2006/08/03 03:34:42 deraadt Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. | 4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. |
@@ -29,11 +29,19 @@ | |||
29 | #ifdef GSSAPI | 29 | #ifdef GSSAPI |
30 | #ifdef KRB5 | 30 | #ifdef KRB5 |
31 | 31 | ||
32 | #include "auth.h" | 32 | #include <sys/types.h> |
33 | |||
34 | #include <stdarg.h> | ||
35 | #include <string.h> | ||
36 | |||
33 | #include "xmalloc.h" | 37 | #include "xmalloc.h" |
38 | #include "key.h" | ||
39 | #include "hostfile.h" | ||
40 | #include "auth.h" | ||
34 | #include "log.h" | 41 | #include "log.h" |
35 | #include "servconf.h" | 42 | #include "servconf.h" |
36 | 43 | ||
44 | #include "buffer.h" | ||
37 | #include "ssh-gss.h" | 45 | #include "ssh-gss.h" |
38 | 46 | ||
39 | extern ServerOptions options; | 47 | extern ServerOptions options; |
@@ -41,9 +49,9 @@ extern ServerOptions options; | |||
41 | #ifdef HEIMDAL | 49 | #ifdef HEIMDAL |
42 | # include <krb5.h> | 50 | # include <krb5.h> |
43 | #else | 51 | #else |
44 | # ifdef HAVE_GSSAPI_KRB5 | 52 | # ifdef HAVE_GSSAPI_KRB5_H |
45 | # include <gssapi_krb5.h> | 53 | # include <gssapi_krb5.h> |
46 | # elif HAVE_GSSAPI_GSSAPI_KRB5 | 54 | # elif HAVE_GSSAPI_GSSAPI_KRB5_H |
47 | # include <gssapi/gssapi_krb5.h> | 55 | # include <gssapi/gssapi_krb5.h> |
48 | # endif | 56 | # endif |
49 | #endif | 57 | #endif |
@@ -112,6 +120,7 @@ ssh_gssapi_krb5_storecreds(ssh_gssapi_client *client) | |||
112 | krb5_principal princ; | 120 | krb5_principal princ; |
113 | OM_uint32 maj_status, min_status; | 121 | OM_uint32 maj_status, min_status; |
114 | int len; | 122 | int len; |
123 | const char *new_ccname; | ||
115 | 124 | ||
116 | if (client->creds == NULL) { | 125 | if (client->creds == NULL) { |
117 | debug("No credentials stored"); | 126 | debug("No credentials stored"); |
@@ -160,11 +169,16 @@ ssh_gssapi_krb5_storecreds(ssh_gssapi_client *client) | |||
160 | return; | 169 | return; |
161 | } | 170 | } |
162 | 171 | ||
163 | client->store.filename = xstrdup(krb5_cc_get_name(krb_context, ccache)); | 172 | new_ccname = krb5_cc_get_name(krb_context, ccache); |
173 | |||
164 | client->store.envvar = "KRB5CCNAME"; | 174 | client->store.envvar = "KRB5CCNAME"; |
165 | len = strlen(client->store.filename) + 6; | 175 | #ifdef USE_CCAPI |
166 | client->store.envval = xmalloc(len); | 176 | xasprintf(&client->store.envval, "API:%s", new_ccname); |
167 | snprintf(client->store.envval, len, "FILE:%s", client->store.filename); | 177 | client->store.filename = NULL; |
178 | #else | ||
179 | xasprintf(&client->store.envval, "FILE:%s", new_ccname); | ||
180 | client->store.filename = xstrdup(new_ccname); | ||
181 | #endif | ||
168 | 182 | ||
169 | #ifdef USE_PAM | 183 | #ifdef USE_PAM |
170 | if (options.use_pam) | 184 | if (options.use_pam) |