Module Name: src
Committed By: christos
Date: Mon Jan 30 20:27:58 UTC 2017
Modified Files:
src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon:
accept_sec_context.c acquire_cred.c add_cred.c canonicalize_name.c
compare_name.c display_name.c duplicate_name.c export_name.c
init_sec_context.c inquire_cred.c inquire_cred_by_mech.c
inquire_mechs_for_name.c
Log Message:
minimize changes with branch
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/accept_sec_context.c \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/acquire_cred.c \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/add_cred.c \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/canonicalize_name.c \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/compare_name.c \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/display_name.c \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/duplicate_name.c \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/export_name.c \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/init_sec_context.c
\
src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred.c \
src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred_by_mech.c
\
src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_mechs_for_name.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/netlogon/accept_sec_context.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/accept_sec_context.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/accept_sec_context.c:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/accept_sec_context.c:1.2 Sat Jan 28 16:31:46 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/accept_sec_context.c Mon Jan 30 15:27:58 2017
@@ -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,
Index: src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/acquire_cred.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/acquire_cred.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/acquire_cred.c:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/acquire_cred.c:1.2 Sat Jan 28 16:31:46 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/acquire_cred.c Mon Jan 30 15:27:58 2017
@@ -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_s
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,
Index: src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/add_cred.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/add_cred.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/add_cred.c:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/add_cred.c:1.2 Sat Jan 28 16:31:46 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/add_cred.c Mon Jan 30 15:27:58 2017
@@ -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,
Index: src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/canonicalize_name.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/canonicalize_name.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/canonicalize_name.c:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/canonicalize_name.c:1.2 Sat Jan 28 16:31:46 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/canonicalize_name.c Mon Jan 30 15:27:58 2017
@@ -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
)
Index: src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/compare_name.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/compare_name.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/compare_name.c:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/compare_name.c:1.2 Sat Jan 28 16:31:46 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/compare_name.c Mon Jan 30 15:27:58 2017
@@ -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
)
{
Index: src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/display_name.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/display_name.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/display_name.c:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/display_name.c:1.2 Sat Jan 28 16:31:46 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/display_name.c Mon Jan 30 15:27:58 2017
@@ -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
)
Index: src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/duplicate_name.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/duplicate_name.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/duplicate_name.c:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/duplicate_name.c:1.2 Sat Jan 28 16:31:46 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/duplicate_name.c Mon Jan 30 15:27:58 2017
@@ -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
)
{
Index: src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/export_name.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/export_name.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/export_name.c:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/export_name.c:1.2 Sat Jan 28 16:31:46 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/export_name.c Mon Jan 30 15:27:58 2017
@@ -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
)
{
Index: src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/init_sec_context.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/init_sec_context.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/init_sec_context.c:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/init_sec_context.c:1.2 Sat Jan 28 16:31:46 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/init_sec_context.c Mon Jan 30 15:27:58 2017
@@ -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
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,
Index: src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred.c:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred.c:1.2 Sat Jan 28 16:31:46 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred.c Mon Jan 30 15:27:58 2017
@@ -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;
}
Index: src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred_by_mech.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred_by_mech.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred_by_mech.c:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred_by_mech.c:1.2 Sat Jan 28 16:31:46 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_cred_by_mech.c Mon Jan 30 15:27:58 2017
@@ -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;
}
Index: src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_mechs_for_name.c
diff -u src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_mechs_for_name.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_mechs_for_name.c:1.3
--- src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_mechs_for_name.c:1.2 Sat Jan 28 16:31:46 2017
+++ src/crypto/external/bsd/heimdal/dist/lib/gssapi/netlogon/inquire_mechs_for_name.c Mon Jan 30 15:27:58 2017
@@ -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
)
{
