diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-08-30 07:38:02 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-08-30 07:38:02 +1000 |
| commit | e82f2187325274d728ec7470990f971e7b3db13c (patch) | |
| tree | 25ce940a5b2a57c6191265664fad0e70aee951fa /source4/heimdal/lib/gssapi/mech/context.c | |
| parent | 9817f3d785ceb67819a9def0e8030272e4ba9e14 (diff) | |
| parent | 81dcc99e9acb9a7e4c2358e5e44998e4718dc658 (diff) | |
| download | samba-e82f2187325274d728ec7470990f971e7b3db13c.tar.gz samba-e82f2187325274d728ec7470990f971e7b3db13c.tar.bz2 samba-e82f2187325274d728ec7470990f971e7b3db13c.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit f008c3b6ee324056fd9b63f6151ad6849640c959)
Diffstat (limited to 'source4/heimdal/lib/gssapi/mech/context.c')
| -rw-r--r-- | source4/heimdal/lib/gssapi/mech/context.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source4/heimdal/lib/gssapi/mech/context.c b/source4/heimdal/lib/gssapi/mech/context.c index 926630c42d..bfb303ac8e 100644 --- a/source4/heimdal/lib/gssapi/mech/context.c +++ b/source4/heimdal/lib/gssapi/mech/context.c @@ -1,7 +1,7 @@ #include "mech/mech_locl.h" #include "heim_threads.h" -RCSID("$Id: context.c 22600 2008-02-21 12:46:24Z lha $"); +RCSID("$Id$"); struct mg_thread_ctx { gss_OID mech; @@ -74,8 +74,14 @@ _gss_mg_get_error(const gss_OID mech, OM_uint32 type, if (mg == NULL) return GSS_S_BAD_STATUS; +#if 0 + /* + * We cant check the mech here since a pseudo-mech might have + * called an lower layer and then the mech info is all broken + */ if (mech != NULL && gss_oid_equal(mg->mech, mech) == 0) return GSS_S_BAD_STATUS; +#endif switch (type) { case GSS_C_GSS_CODE: { |