From 54028cfbafa9639668d2168de874027e7bc6e77c Mon Sep 17 00:00:00 2001 From: christos Date: Mon, 30 Jan 2017 20:27:58 +0000 Subject: [PATCH] minimize changes with branch --- .../heimdal/dist/lib/gssapi/netlogon/accept_sec_context.c | 4 ++-- .../bsd/heimdal/dist/lib/gssapi/netlogon/acquire_cred.c | 6 +++--- .../bsd/heimdal/dist/lib/gssapi/netlogon/add_cred.c | 6 +++--- .../heimdal/dist/lib/gssapi/netlogon/canonicalize_name.c | 4 ++-- .../bsd/heimdal/dist/lib/gssapi/netlogon/compare_name.c | 6 +++--- .../bsd/heimdal/dist/lib/gssapi/netlogon/display_name.c | 4 ++-- .../bsd/heimdal/dist/lib/gssapi/netlogon/duplicate_name.c | 4 ++-- .../bsd/heimdal/dist/lib/gssapi/netlogon/export_name.c | 4 ++-- .../bsd/heimdal/dist/lib/gssapi/netlogon/init_sec_context.c | 6 +++--- .../bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred.c | 6 +++--- .../heimdal/dist/lib/gssapi/netlogon/inquire_cred_by_mech.c | 6 +++--- .../dist/lib/gssapi/netlogon/inquire_mechs_for_name.c | 4 ++-- 12 files changed, 30 insertions(+), 30 deletions(-) diff --git a/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/accept_sec_context.c b/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/accept_sec_context.c index afec576a7979..b7577a6f1fff 100644 --- a/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/accept_sec_context.c +++ b/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/accept_sec_context.c @@ -1,4 +1,4 @@ -/* $NetBSD: accept_sec_context.c,v 1.2 2017/01/28 21:31:46 christos Exp $ */ +/* $NetBSD: accept_sec_context.c,v 1.3 2017/01/30 20:27:58 christos Exp $ */ /* * Copyright (c) 2009 Kungliga Tekniska Högskolan @@ -45,7 +45,7 @@ OM_uint32 _netlogon_accept_sec_context (OM_uint32 * minor_status, gss_ctx_id_t * context_handle, - const gss_cred_id_t acceptor_cred_handle, + gss_const_cred_id_t acceptor_cred_handle, const gss_buffer_t input_token_buffer, const gss_channel_bindings_t input_chan_bindings, gss_name_t * src_name, diff --git a/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/acquire_cred.c b/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/acquire_cred.c index 7c7e5f1c7e48..3169e42fa210 100644 --- a/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/acquire_cred.c +++ b/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/acquire_cred.c @@ -1,4 +1,4 @@ -/* $NetBSD: acquire_cred.c,v 1.2 2017/01/28 21:31:46 christos Exp $ */ +/* $NetBSD: acquire_cred.c,v 1.3 2017/01/30 20:27:58 christos Exp $ */ /* * Copyright (c) 2010 Kungliga Tekniska Högskolan @@ -40,7 +40,7 @@ OM_uint32 _netlogon_acquire_cred(OM_uint32 * min_stat, - const gss_name_t desired_name, + gss_const_name_t desired_name, OM_uint32 time_req, const gss_OID_set desired_mechs, gss_cred_usage_t cred_usage, @@ -84,7 +84,7 @@ _netlogon_acquire_cred(OM_uint32 * min_stat, OM_uint32 _netlogon_acquire_cred_ex(gss_status_id_t status, - const gss_name_t desired_name, + gss_const_name_t desired_name, OM_uint32 flags, OM_uint32 time_req, gss_cred_usage_t cred_usage, diff --git a/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/add_cred.c b/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/add_cred.c index d650bf14f45d..8eeed7a3edac 100644 --- a/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/add_cred.c +++ b/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/add_cred.c @@ -1,4 +1,4 @@ -/* $NetBSD: add_cred.c,v 1.2 2017/01/28 21:31:46 christos Exp $ */ +/* $NetBSD: add_cred.c,v 1.3 2017/01/30 20:27:58 christos Exp $ */ /* * Copyright (c) 2010 Kungliga Tekniska Högskolan @@ -39,8 +39,8 @@ OM_uint32 _netlogon_add_cred ( OM_uint32 *minor_status, - const gss_cred_id_t input_cred_handle, - const gss_name_t desired_name, + gss_const_cred_id_t input_cred_handle, + gss_const_name_t desired_name, const gss_OID desired_mech, gss_cred_usage_t cred_usage, OM_uint32 initiator_time_req, diff --git a/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/canonicalize_name.c b/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/canonicalize_name.c index 8931388885d6..76dbbf24bdb7 100644 --- a/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/canonicalize_name.c +++ b/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/canonicalize_name.c @@ -1,4 +1,4 @@ -/* $NetBSD: canonicalize_name.c,v 1.2 2017/01/28 21:31:46 christos Exp $ */ +/* $NetBSD: canonicalize_name.c,v 1.3 2017/01/30 20:27:58 christos Exp $ */ /* * Copyright (c) 2009 Kungliga Tekniska Högskolan @@ -39,7 +39,7 @@ OM_uint32 _netlogon_canonicalize_name ( OM_uint32 * minor_status, - const gss_name_t input_name, + gss_const_name_t input_name, const gss_OID mech_type, gss_name_t * output_name ) diff --git a/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/compare_name.c b/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/compare_name.c index 21d77a0f7275..dd65099ace12 100644 --- a/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/compare_name.c +++ b/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/compare_name.c @@ -1,4 +1,4 @@ -/* $NetBSD: compare_name.c,v 1.2 2017/01/28 21:31:46 christos Exp $ */ +/* $NetBSD: compare_name.c,v 1.3 2017/01/30 20:27:58 christos Exp $ */ /* * Copyright (c) 2010 Kungliga Tekniska Högskolan @@ -39,8 +39,8 @@ OM_uint32 _netlogon_compare_name (OM_uint32 * minor_status, - const gss_name_t name1, - const gss_name_t name2, + gss_const_name_t name1, + gss_const_name_t name2, int * name_equal ) { diff --git a/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/display_name.c b/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/display_name.c index 317444b7c165..3bc517b8a7d3 100644 --- a/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/display_name.c +++ b/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/display_name.c @@ -1,4 +1,4 @@ -/* $NetBSD: display_name.c,v 1.2 2017/01/28 21:31:46 christos Exp $ */ +/* $NetBSD: display_name.c,v 1.3 2017/01/30 20:27:58 christos Exp $ */ /* * Copyright (c) 2010 Kungliga Tekniska Högskolan @@ -39,7 +39,7 @@ OM_uint32 _netlogon_display_name (OM_uint32 * minor_status, - const gss_name_t input_name, + gss_const_name_t input_name, gss_buffer_t output_name_buffer, gss_OID * output_name_type ) diff --git a/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/duplicate_name.c b/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/duplicate_name.c index 14cd1b3da25b..3a096ec04f75 100644 --- a/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/duplicate_name.c +++ b/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/duplicate_name.c @@ -1,4 +1,4 @@ -/* $NetBSD: duplicate_name.c,v 1.2 2017/01/28 21:31:46 christos Exp $ */ +/* $NetBSD: duplicate_name.c,v 1.3 2017/01/30 20:27:58 christos Exp $ */ /* * Copyright (c) 2010 Kungliga Tekniska Högskolan @@ -39,7 +39,7 @@ OM_uint32 _netlogon_duplicate_name ( OM_uint32 * minor_status, - const gss_name_t src_name, + gss_const_name_t src_name, gss_name_t * dest_name ) { diff --git a/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/export_name.c b/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/export_name.c index 8e11a3fe1294..2c083f77e5d3 100644 --- a/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/export_name.c +++ b/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/export_name.c @@ -1,4 +1,4 @@ -/* $NetBSD: export_name.c,v 1.2 2017/01/28 21:31:46 christos Exp $ */ +/* $NetBSD: export_name.c,v 1.3 2017/01/30 20:27:58 christos Exp $ */ /* * Copyright (c) 2009 Kungliga Tekniska Högskolan @@ -39,7 +39,7 @@ OM_uint32 _netlogon_export_name (OM_uint32 * minor_status, - const gss_name_t input_name, + gss_const_name_t input_name, gss_buffer_t exported_name ) { diff --git a/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/init_sec_context.c b/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/init_sec_context.c index 4675ac9ed9da..41f8a94daa3e 100644 --- a/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/init_sec_context.c +++ b/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/init_sec_context.c @@ -1,4 +1,4 @@ -/* $NetBSD: init_sec_context.c,v 1.2 2017/01/28 21:31:46 christos Exp $ */ +/* $NetBSD: init_sec_context.c,v 1.3 2017/01/30 20:27:58 christos Exp $ */ /* * Copyright (c) 2010 Kungliga Tekniska Högskolan @@ -203,9 +203,9 @@ _netlogon_alloc_context(OM_uint32 *minor_status, OM_uint32 _netlogon_init_sec_context(OM_uint32 * minor_status, - const gss_cred_id_t initiator_cred_handle, + gss_const_cred_id_t initiator_cred_handle, gss_ctx_id_t * context_handle, - const gss_name_t target_name, + gss_const_name_t target_name, const gss_OID mech_type, OM_uint32 req_flags, OM_uint32 time_req, diff --git a/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred.c b/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred.c index 4f5d5b2e31eb..9c2dd620f898 100644 --- a/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred.c +++ b/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred.c @@ -1,4 +1,4 @@ -/* $NetBSD: inquire_cred.c,v 1.2 2017/01/28 21:31:46 christos Exp $ */ +/* $NetBSD: inquire_cred.c,v 1.3 2017/01/30 20:27:58 christos Exp $ */ /* * Copyright (c) 2010 Kungliga Tekniska Högskolan @@ -39,7 +39,7 @@ OM_uint32 _netlogon_inquire_cred (OM_uint32 * minor_status, - const gss_cred_id_t cred_handle, + gss_const_cred_id_t cred_handle, gss_name_t * name, OM_uint32 * lifetime, gss_cred_usage_t * cred_usage, @@ -56,7 +56,7 @@ OM_uint32 _netlogon_inquire_cred if (name != NULL) { ret = _netlogon_duplicate_name(minor_status, - (const gss_name_t)cred->Name, name); + (gss_const_name_t)cred->Name, name); if (GSS_ERROR(ret)) return ret; } diff --git a/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred_by_mech.c b/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred_by_mech.c index 3b7d73c70ee4..0e6c113c873a 100644 --- a/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred_by_mech.c +++ b/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred_by_mech.c @@ -1,4 +1,4 @@ -/* $NetBSD: inquire_cred_by_mech.c,v 1.2 2017/01/28 21:31:46 christos Exp $ */ +/* $NetBSD: inquire_cred_by_mech.c,v 1.3 2017/01/30 20:27:58 christos Exp $ */ /* * Copyright (c) 2010 Kungliga Tekniska Högskolan @@ -39,7 +39,7 @@ OM_uint32 _netlogon_inquire_cred_by_mech ( OM_uint32 * minor_status, - const gss_cred_id_t cred_handle, + gss_const_cred_id_t cred_handle, const gss_OID mech_type, gss_name_t * name, OM_uint32 * initiator_lifetime, @@ -52,7 +52,7 @@ OM_uint32 _netlogon_inquire_cred_by_mech ( if (name != NULL) { ret = _netlogon_duplicate_name(minor_status, - (const gss_name_t)cred->Name, name); + (gss_const_name_t)cred->Name, name); if (GSS_ERROR(ret)) return ret; } diff --git a/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_mechs_for_name.c b/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_mechs_for_name.c index ffd1c69eb57e..677419582c6d 100644 --- a/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_mechs_for_name.c +++ b/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_mechs_for_name.c @@ -1,4 +1,4 @@ -/* $NetBSD: inquire_mechs_for_name.c,v 1.2 2017/01/28 21:31:46 christos Exp $ */ +/* $NetBSD: inquire_mechs_for_name.c,v 1.3 2017/01/30 20:27:58 christos Exp $ */ /* * Copyright (c) 2010 Kungliga Tekniska Högskolan @@ -39,7 +39,7 @@ OM_uint32 _netlogon_inquire_mechs_for_name ( OM_uint32 * minor_status, - const gss_name_t input_name, + gss_const_name_t input_name, gss_OID_set * mech_types ) {