diff options
author | Colin Watson <cjwatson@debian.org> | 2007-11-08 20:00:43 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2007-11-08 20:00:43 +0000 |
commit | 341ea58223fcd7c5627096e91e90ad6c51f9a338 (patch) | |
tree | 77c047b102526cb20437c0e9b5256c377a7ec3e0 | |
parent | 67d535a2fbf5ce66b56e28ca8337c2955abde102 (diff) |
revert mistakenly committed experiment
-rw-r--r-- | gss-genr.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/gss-genr.c b/gss-genr.c index 6eb8e4754..42f942b58 100644 --- a/gss-genr.c +++ b/gss-genr.c | |||
@@ -44,11 +44,6 @@ | |||
44 | #include "kex.h" | 44 | #include "kex.h" |
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | 46 | ||
47 | #ifdef KRB5 | ||
48 | # include <krb5.h> | ||
49 | # include <profile.h> | ||
50 | #endif /* KRB5 */ | ||
51 | |||
52 | #include "ssh-gss.h" | 47 | #include "ssh-gss.h" |
53 | 48 | ||
54 | extern u_char *session_id2; | 49 | extern u_char *session_id2; |
@@ -295,32 +290,6 @@ ssh_gssapi_last_error(Gssctxt *ctxt, OM_uint32 *major_status, | |||
295 | void | 290 | void |
296 | ssh_gssapi_build_ctx(Gssctxt **ctx) | 291 | ssh_gssapi_build_ctx(Gssctxt **ctx) |
297 | { | 292 | { |
298 | #ifdef KRB5 | ||
299 | static int gss_configured = 0; | ||
300 | |||
301 | if (!gss_configured) { | ||
302 | /* Tell the GSSAPI library not to canonicalise names. */ | ||
303 | krb5_context krb5_ctx; | ||
304 | profile_t profile; | ||
305 | krb5_error_code problem; | ||
306 | |||
307 | problem = krb5_init_context(&krb5_ctx); | ||
308 | if (!problem) { | ||
309 | problem = krb5_get_profile(krb5_ctx, &profile); | ||
310 | if (!problem) { | ||
311 | const char *names[3]; | ||
312 | names[0] = "libdefaults"; | ||
313 | names[1] = "rdns"; | ||
314 | names[2] = 0; | ||
315 | profile_clear_relation(profile, names); | ||
316 | profile_add_relation(profile, names, "n"); | ||
317 | } | ||
318 | } | ||
319 | |||
320 | gss_configured = 1; | ||
321 | } | ||
322 | #endif /* KRB5 */ | ||
323 | |||
324 | *ctx = xcalloc(1, sizeof (Gssctxt)); | 293 | *ctx = xcalloc(1, sizeof (Gssctxt)); |
325 | (*ctx)->context = GSS_C_NO_CONTEXT; | 294 | (*ctx)->context = GSS_C_NO_CONTEXT; |
326 | (*ctx)->name = GSS_C_NO_NAME; | 295 | (*ctx)->name = GSS_C_NO_NAME; |