Module Name: src
Committed By: elric
Date: Wed Apr 13 18:30:04 UTC 2011
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5:
init_sec_context.c
Log Message:
_gss_DES3_get_mic_compat() requires that ctx->target has been defined, and,
well, it hasn't yet. Move the call down to after it is defined and things
are better.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/init_sec_context.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/init_sec_context.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/init_sec_context.c:1.1.1.1 src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/init_sec_context.c:1.2
--- src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/init_sec_context.c:1.1.1.1 Wed Apr 13 18:14:45 2011
+++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/krb5/init_sec_context.c Wed Apr 13 18:30:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: init_sec_context.c,v 1.1.1.1 2011/04/13 18:14:45 elric Exp $ */
+/* $NetBSD: init_sec_context.c,v 1.2 2011/04/13 18:30:04 elric Exp $ */
/*
* Copyright (c) 1997 - 2008 Kungliga Tekniska Högskolan
@@ -424,10 +424,6 @@
goto failure;
}
- ret = _gss_DES3_get_mic_compat(minor_status, ctx, context);
- if (ret)
- goto failure;
-
/*
* This is hideous glue for (NFS) clients that wants to limit the
@@ -471,6 +467,10 @@
ctx->lifetime = ctx->kcred->times.endtime;
+ ret = _gss_DES3_get_mic_compat(minor_status, ctx, context);
+ if (ret)
+ goto failure;
+
ret = _gsskrb5_lifetime_left(minor_status,
context,
ctx->lifetime,
