diff options
| author | Matthieu Patou <mat@matws.net> | 2010-08-15 18:31:28 +0400 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-10-03 01:15:04 +0000 |
| commit | ab6e3fce040f9ad27cbce44e9038a24f15b601c8 (patch) | |
| tree | ab99a431c9610927b5d0d26335d2712b509fd6dc /source4/heimdal/lib/gssapi/krb5/import_name.c | |
| parent | 197a1514d62494cc8b862d169c841a26e04b8925 (diff) | |
| download | samba-ab6e3fce040f9ad27cbce44e9038a24f15b601c8.tar.gz samba-ab6e3fce040f9ad27cbce44e9038a24f15b601c8.tar.bz2 samba-ab6e3fce040f9ad27cbce44e9038a24f15b601c8.zip | |
s4:heimdal: import lorikeet-heimdal-201009250123 (commit 42cabfb5b683dbcb97d583c397b897507689e382)
I based this on Matthieu's import of lorikeet-heimdal, and then
updated it to this commit.
Andrew Bartlett
Diffstat (limited to 'source4/heimdal/lib/gssapi/krb5/import_name.c')
| -rw-r--r-- | source4/heimdal/lib/gssapi/krb5/import_name.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/heimdal/lib/gssapi/krb5/import_name.c b/source4/heimdal/lib/gssapi/krb5/import_name.c index f1aca93ffd..2a071a305e 100644 --- a/source4/heimdal/lib/gssapi/krb5/import_name.c +++ b/source4/heimdal/lib/gssapi/krb5/import_name.c @@ -215,7 +215,7 @@ import_export_name (OM_uint32 *minor_status, return ret; } -OM_uint32 _gsskrb5_import_name +OM_uint32 GSSAPI_CALLCONV _gsskrb5_import_name (OM_uint32 * minor_status, const gss_buffer_t input_name_buffer, const gss_OID input_name_type, @@ -235,7 +235,7 @@ OM_uint32 _gsskrb5_import_name context, input_name_buffer, output_name); - else if (gss_oid_equal(input_name_type, GSS_C_NO_OID) + else if (input_name_type == GSS_C_NO_OID || gss_oid_equal(input_name_type, GSS_C_NT_USER_NAME) || gss_oid_equal(input_name_type, GSS_KRB5_NT_PRINCIPAL_NAME)) /* default printable syntax */ |