diff options
| author | Luke Howard <lukeh@padl.com> | 2010-09-25 13:04:56 +0000 |
|---|---|---|
| committer | Luke Howard <lukeh@padl.com> | 2010-09-25 13:04:56 +0000 |
| commit | 6374a535dd1a1518e2aa68e9b22d8a9b8bc259e9 (patch) | |
| tree | 84e7f75b96f1e66a1ea341d1e212b8b6697f764b | |
| parent | bacf1ed918b09f984e2054154313d74833296871 (diff) | |
| download | krb5-6374a535dd1a1518e2aa68e9b22d8a9b8bc259e9.zip krb5-6374a535dd1a1518e2aa68e9b22d8a9b8bc259e9.tar.gz krb5-6374a535dd1a1518e2aa68e9b22d8a9b8bc259e9.tar.bz2 | |
Fix nits in krb5/spnego SASL mapping
git-svn-id: svn://anonsvn.mit.edu/krb5/users/lhoward/sasl-gs2@24343 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/gssapi/krb5/gssapi_krb5.c | 2 | ||||
| -rw-r--r-- | src/lib/gssapi/spnego/gssapiP_spnego.h | 2 | ||||
| -rw-r--r-- | src/lib/gssapi/spnego/spnego_mech.c | 12 |
3 files changed, 9 insertions, 7 deletions
diff --git a/src/lib/gssapi/krb5/gssapi_krb5.c b/src/lib/gssapi/krb5/gssapi_krb5.c index c38997c..13f3b5f 100644 --- a/src/lib/gssapi/krb5/gssapi_krb5.c +++ b/src/lib/gssapi/krb5/gssapi_krb5.c @@ -739,8 +739,8 @@ static struct gss_config krb5_mechanism = { krb5_gss_release_any_name_mapping, krb5_gss_pseudo_random, NULL, /* set_neg_mechs */ - krb5_gss_inquire_mech_for_saslname, krb5_gss_inquire_saslname_for_mech, + krb5_gss_inquire_mech_for_saslname, }; static struct gss_config_ext krb5_mechanism_ext = { diff --git a/src/lib/gssapi/spnego/gssapiP_spnego.h b/src/lib/gssapi/spnego/gssapiP_spnego.h index 0f433f0..0a66666 100644 --- a/src/lib/gssapi/spnego/gssapiP_spnego.h +++ b/src/lib/gssapi/spnego/gssapiP_spnego.h @@ -574,7 +574,7 @@ spnego_gss_inquire_mech_for_saslname ); OM_uint32 -spnego_inquire_saslname_for_mech +spnego_gss_inquire_saslname_for_mech ( OM_uint32 *minor_status, const gss_OID desired_mech, diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c index 6ba6620..14b6fa4 100644 --- a/src/lib/gssapi/spnego/spnego_mech.c +++ b/src/lib/gssapi/spnego/spnego_mech.c @@ -272,6 +272,8 @@ static struct gss_config spnego_mechanism = spnego_gss_release_any_name_mapping, spnego_gss_pseudo_random, spnego_gss_set_neg_mechs, + spnego_gss_inquire_saslname_for_mech, + spnego_gss_inquire_mech_for_saslname, }; static struct gss_config_ext spnego_mechanism_ext = @@ -2705,11 +2707,11 @@ spnego_gss_inquire_mech_for_saslname(OM_uint32 *minor_status, } OM_uint32 -spnego_inquire_saslname_for_mech(OM_uint32 *minor_status, - const gss_OID desired_mech, - gss_buffer_t sasl_mech_name, - gss_buffer_t mech_name, - gss_buffer_t mech_description) +spnego_gss_inquire_saslname_for_mech(OM_uint32 *minor_status, + const gss_OID desired_mech, + gss_buffer_t sasl_mech_name, + gss_buffer_t mech_name, + gss_buffer_t mech_description) { OM_uint32 status; |