The branch main has been updated by cy:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=f58febc4cefa7a34044c0c80b9300d289cead642

commit f58febc4cefa7a34044c0c80b9300d289cead642
Author:     Cy Schubert <c...@freebsd.org>
AuthorDate: 2025-07-22 17:43:24 +0000
Commit:     Cy Schubert <c...@freebsd.org>
CommitDate: 2025-07-22 19:09:23 +0000

    krb5: Correct version maps
    
    Fixes:          ae07a5805b19
---
 krb5/lib/gssapi/version.map |   1 -
 krb5/lib/krb5/version.map   |  41 -------
 krb5/lib/rpc/version.map    | 288 ++++++++++++++++++++++----------------------
 3 files changed, 144 insertions(+), 186 deletions(-)

diff --git a/krb5/lib/gssapi/version.map b/krb5/lib/gssapi/version.map
index 95f7ed5151db..afdfe9a0a83a 100644
--- a/krb5/lib/gssapi/version.map
+++ b/krb5/lib/gssapi/version.map
@@ -111,7 +111,6 @@ KRB5_GSSAPI_1.0 {
                gss_localname;
                gss_map_name_to_any;
                gss_mech_iakerb;
-               gss_mech_initialize;
                gss_mech_krb5;
                gss_mech_krb5_old;
                gss_mech_krb5_wrong;
diff --git a/krb5/lib/krb5/version.map b/krb5/lib/krb5/version.map
index bd852023ff6c..3f37ce0dce31 100644
--- a/krb5/lib/krb5/version.map
+++ b/krb5/lib/krb5/version.map
@@ -105,19 +105,6 @@ KRB5_KRB5_1.0 {
                encode_krb5_ticket;
                encode_krb5_typed_data;
                encode_utf8_strings;
-               et_asn1_error_table;
-               et_k524_error_table;
-               et_kdb5_error_table;
-               et_krb5_error_table;
-               et_kv5m_error_table;
-               et_prof_error_table;
-               initialize_asn1_error_table;
-               initialize_k524_error_table;
-               initialize_kdb5_error_table;
-               initialize_krb5_error_table;
-               initialize_k5e1_error_table;
-               initialize_kv5m_error_table;
-               initialize_prof_error_table;
                k5_add_empty_pa_data;
                k5_add_pa_data_element;
                k5_add_pa_data_from_data;
@@ -627,32 +614,4 @@ KRB5_KRB5_1.0 {
                krb5int_parse_enctype_list;
                krb5int_random_string;
                krb5int_trace;
-               profile_abandon;
-               profile_add_relation;
-               profile_clear_relation;
-               profile_flush;
-               profile_flush_to_buffer;
-               profile_flush_to_file;
-               profile_free_buffer;
-               profile_free_list;
-               profile_get_boolean;
-               profile_get_integer;
-               profile_get_relation_names;
-               profile_get_string;
-               profile_get_subsection_names;
-               profile_get_values;
-               profile_init;
-               profile_init_flags;
-               profile_init_path;
-               profile_init_vtable;
-               profile_iterator;
-               profile_iterator_create;
-               profile_iterator_free;
-               profile_release;
-               profile_release_string;
-               profile_rename_section;
-               profile_ser_externalize;
-               profile_ser_internalize;
-               profile_ser_size;
-               profile_update_relation;
 };
diff --git a/krb5/lib/rpc/version.map b/krb5/lib/rpc/version.map
index 195808a93ca0..4a5052b71536 100644
--- a/krb5/lib/rpc/version.map
+++ b/krb5/lib/rpc/version.map
@@ -1,147 +1,147 @@
 KRB5_RPC_1.0 {
        global:
-               gssrpc_auth_debug_gss
-               gssrpc_auth_debug_gssapi
-               gssrpc_auth_gssapi_create
-               gssrpc_auth_gssapi_create_default
-               gssrpc_auth_gssapi_display_status
-               gssrpc_auth_gssapi_seal_seq
-               gssrpc_auth_gssapi_unseal_seq
-               gssrpc_auth_gssapi_unwrap_data
-               gssrpc_auth_gssapi_wrap_data
-               gssrpc_authgss_create
-               gssrpc_authgss_create_default
-               gssrpc_authgss_get_private_data
-               gssrpc_authgss_service
-               gssrpc_authnone_create
-               gssrpc_authunix_create
-               gssrpc_authunix_create_default
-               gssrpc_bindresvport
-               gssrpc_bindresvport_sa
-               gssrpc_callrpc
-               gssrpc_clnt_broadcast
-               gssrpc_clnt_create
-               gssrpc_clnt_pcreateerror
-               gssrpc_clnt_perrno
-               gssrpc_clnt_perror
-               gssrpc_clnt_spcreateerror
-               gssrpc_clnt_sperrno
-               gssrpc_clnt_sperror
-               gssrpc_clntraw_create
-               gssrpc_clnttcp_create
-               gssrpc_clntudp_bufcreate
-               gssrpc_clntudp_create
-               gssrpc_get_myaddress
-               gssrpc_getrpcport
-               gssrpc_log_debug
-               gssrpc_log_hexdump
-               gssrpc_log_status
-               gssrpc_misc_debug_gss
-               gssrpc_misc_debug_gssapi
-               gssrpc_pmap_getmaps
-               gssrpc_pmap_getport
-               gssrpc_pmap_rmtcall
-               gssrpc_pmap_set
-               gssrpc_pmap_unset
-               gssrpc_registerrpc
-               gssrpc_rpc_createrr
-               gssrpc_svc_auth_gss_ops
-               gssrpc_svc_auth_gssapi_ops
-               gssrpc_svc_auth_none
-               gssrpc_svc_auth_none_ops
-               gssrpc_svc_debug_gss
-               gssrpc_svc_debug_gssapi
-               gssrpc_svc_fdset
-               gssrpc_svc_fdset_init
-               gssrpc_svc_getreq
-               gssrpc_svc_getreqset
-               gssrpc_svc_maxfd
-               gssrpc_svc_register
-               gssrpc_svc_run
-               gssrpc_svc_sendreply
-               gssrpc_svc_unregister
-               gssrpc_svcauth_gss_get_principal
-               gssrpc_svcauth_gss_set_log_badauth_func
-               gssrpc_svcauth_gss_set_log_badauth2_func
-               gssrpc_svcauth_gss_set_log_badverf_func
-               gssrpc_svcauth_gss_set_log_miscerr_func
-               gssrpc_svcauth_gss_set_svc_name
-               gssrpc_svcauth_gssapi_set_log_badauth_func
-               gssrpc_svcauth_gssapi_set_log_badauth2_func
-               gssrpc_svcauth_gssapi_set_log_badverf_func
-               gssrpc_svcauth_gssapi_set_log_miscerr_func
-               gssrpc_svcauth_gssapi_set_names
-               gssrpc_svcauth_gssapi_unset_names
-               gssrpc_svcerr_auth
-               gssrpc_svcerr_decode
-               gssrpc_svcerr_noproc
-               gssrpc_svcerr_noprog
-               gssrpc_svcerr_progvers
-               gssrpc_svcerr_systemerr
-               gssrpc_svcerr_weakauth
-               gssrpc_svcfd_create
-               gssrpc_svcraw_create
-               gssrpc_svctcp_create
-               gssrpc_svcudp_bufcreate
-               gssrpc_svcudp_create
-               gssrpc_svcudp_enablecache
-               gssrpc_xdr_accepted_reply
-               gssrpc_xdr_array
-               gssrpc_xdr_authgssapi_creds
-               gssrpc_xdr_authgssapi_init_arg
-               gssrpc_xdr_authgssapi_init_res
-               gssrpc_xdr_authunix_parms
-               gssrpc_xdr_bool
-               gssrpc_xdr_bytes
-               gssrpc_xdr_callhdr
-               gssrpc_xdr_callmsg
-               gssrpc_xdr_char
-               gssrpc_xdr_des_block
-               gssrpc_xdr_enum
-               gssrpc_xdr_free
-               gssrpc_xdr_gss_buf
-               gssrpc_xdr_int
-               gssrpc_xdr_int32
-               gssrpc_xdr_long
-               gssrpc_xdr_netobj
-               gssrpc_xdr_opaque
-               gssrpc_xdr_opaque_auth
-               gssrpc_xdr_pmap
-               gssrpc_xdr_pmaplist
-               gssrpc_xdr_pointer
-               gssrpc_xdr_reference
-               gssrpc_xdr_rejected_reply
-               gssrpc_xdr_replymsg
-               gssrpc_xdr_rmtcall_args
-               gssrpc_xdr_rmtcallres
-               gssrpc_xdr_rpc_gss_buf
-               gssrpc_xdr_rpc_gss_cred
-               gssrpc_xdr_rpc_gss_data
-               gssrpc_xdr_rpc_gss_init_args
-               gssrpc_xdr_rpc_gss_init_res
-               gssrpc_xdr_rpc_gss_unwrap_data
-               gssrpc_xdr_rpc_gss_wrap_data
-               gssrpc_xdr_short
-               gssrpc_xdr_sizeof
-               gssrpc_xdr_string
-               gssrpc_xdr_u_char
-               gssrpc_xdr_u_int
-               gssrpc_xdr_u_int32
-               gssrpc_xdr_u_long
-               gssrpc_xdr_u_short
-               gssrpc_xdr_union
-               gssrpc_xdr_vector
-               gssrpc_xdr_void
-               gssrpc_xdr_wrapstring
-               gssrpc_xdralloc_create
-               gssrpc_xdralloc_getdata
-               gssrpc_xdralloc_release
-               gssrpc_xdrmem_create
-               gssrpc_xdrrec_create
-               gssrpc_xdrrec_endofrecord
-               gssrpc_xdrrec_eof
-               gssrpc_xdrrec_skiprecord
-               gssrpc_xdrstdio_create
-               gssrpc_xprt_register
-               gssrpc_xprt_unregister
+               gssrpc_auth_debug_gss;
+               gssrpc_auth_debug_gssapi;
+               gssrpc_auth_gssapi_create;
+               gssrpc_auth_gssapi_create_default;
+               gssrpc_auth_gssapi_display_status;
+               gssrpc_auth_gssapi_seal_seq;
+               gssrpc_auth_gssapi_unseal_seq;
+               gssrpc_auth_gssapi_unwrap_data;
+               gssrpc_auth_gssapi_wrap_data;
+               gssrpc_authgss_create;
+               gssrpc_authgss_create_default;
+               gssrpc_authgss_get_private_data;
+               gssrpc_authgss_service;
+               gssrpc_authnone_create;
+               gssrpc_authunix_create;
+               gssrpc_authunix_create_default;
+               gssrpc_bindresvport;
+               gssrpc_bindresvport_sa;
+               gssrpc_callrpc;
+               gssrpc_clnt_broadcast;
+               gssrpc_clnt_create;
+               gssrpc_clnt_pcreateerror;
+               gssrpc_clnt_perrno;
+               gssrpc_clnt_perror;
+               gssrpc_clnt_spcreateerror;
+               gssrpc_clnt_sperrno;
+               gssrpc_clnt_sperror;
+               gssrpc_clntraw_create;
+               gssrpc_clnttcp_create;
+               gssrpc_clntudp_bufcreate;
+               gssrpc_clntudp_create;
+               gssrpc_get_myaddress;
+               gssrpc_getrpcport;
+               gssrpc_log_debug;
+               gssrpc_log_hexdump;
+               gssrpc_log_status;
+               gssrpc_misc_debug_gss;
+               gssrpc_misc_debug_gssapi;
+               gssrpc_pmap_getmaps;
+               gssrpc_pmap_getport;
+               gssrpc_pmap_rmtcall;
+               gssrpc_pmap_set;
+               gssrpc_pmap_unset;
+               gssrpc_registerrpc;
+               gssrpc_rpc_createrr;
+               gssrpc_svc_auth_gss_ops;
+               gssrpc_svc_auth_gssapi_ops;
+               gssrpc_svc_auth_none;
+               gssrpc_svc_auth_none_ops;
+               gssrpc_svc_debug_gss;
+               gssrpc_svc_debug_gssapi;
+               gssrpc_svc_fdset;
+               gssrpc_svc_fdset_init;
+               gssrpc_svc_getreq;
+               gssrpc_svc_getreqset;
+               gssrpc_svc_maxfd;
+               gssrpc_svc_register;
+               gssrpc_svc_run;
+               gssrpc_svc_sendreply;
+               gssrpc_svc_unregister;
+               gssrpc_svcauth_gss_get_principal;
+               gssrpc_svcauth_gss_set_log_badauth_func;
+               gssrpc_svcauth_gss_set_log_badauth2_func;
+               gssrpc_svcauth_gss_set_log_badverf_func;
+               gssrpc_svcauth_gss_set_log_miscerr_func;
+               gssrpc_svcauth_gss_set_svc_name;
+               gssrpc_svcauth_gssapi_set_log_badauth_func;
+               gssrpc_svcauth_gssapi_set_log_badauth2_func;
+               gssrpc_svcauth_gssapi_set_log_badverf_func;
+               gssrpc_svcauth_gssapi_set_log_miscerr_func;
+               gssrpc_svcauth_gssapi_set_names;
+               gssrpc_svcauth_gssapi_unset_names;
+               gssrpc_svcerr_auth;
+               gssrpc_svcerr_decode;
+               gssrpc_svcerr_noproc;
+               gssrpc_svcerr_noprog;
+               gssrpc_svcerr_progvers;
+               gssrpc_svcerr_systemerr;
+               gssrpc_svcerr_weakauth;
+               gssrpc_svcfd_create;
+               gssrpc_svcraw_create;
+               gssrpc_svctcp_create;
+               gssrpc_svcudp_bufcreate;
+               gssrpc_svcudp_create;
+               gssrpc_svcudp_enablecache;
+               gssrpc_xdr_accepted_reply;
+               gssrpc_xdr_array;
+               gssrpc_xdr_authgssapi_creds;
+               gssrpc_xdr_authgssapi_init_arg;
+               gssrpc_xdr_authgssapi_init_res;
+               gssrpc_xdr_authunix_parms;
+               gssrpc_xdr_bool;
+               gssrpc_xdr_bytes;
+               gssrpc_xdr_callhdr;
+               gssrpc_xdr_callmsg;
+               gssrpc_xdr_char;
+               gssrpc_xdr_des_block;
+               gssrpc_xdr_enum;
+               gssrpc_xdr_free;
+               gssrpc_xdr_gss_buf;
+               gssrpc_xdr_int;
+               gssrpc_xdr_int32;
+               gssrpc_xdr_long;
+               gssrpc_xdr_netobj;
+               gssrpc_xdr_opaque;
+               gssrpc_xdr_opaque_auth;
+               gssrpc_xdr_pmap;
+               gssrpc_xdr_pmaplist;
+               gssrpc_xdr_pointer;
+               gssrpc_xdr_reference;
+               gssrpc_xdr_rejected_reply;
+               gssrpc_xdr_replymsg;
+               gssrpc_xdr_rmtcall_args;
+               gssrpc_xdr_rmtcallres;
+               gssrpc_xdr_rpc_gss_buf;
+               gssrpc_xdr_rpc_gss_cred;
+               gssrpc_xdr_rpc_gss_data;
+               gssrpc_xdr_rpc_gss_init_args;
+               gssrpc_xdr_rpc_gss_init_res;
+               gssrpc_xdr_rpc_gss_unwrap_data;
+               gssrpc_xdr_rpc_gss_wrap_data;
+               gssrpc_xdr_short;
+               gssrpc_xdr_sizeof;
+               gssrpc_xdr_string;
+               gssrpc_xdr_u_char;
+               gssrpc_xdr_u_int;
+               gssrpc_xdr_u_int32;
+               gssrpc_xdr_u_long;
+               gssrpc_xdr_u_short;
+               gssrpc_xdr_union;
+               gssrpc_xdr_vector;
+               gssrpc_xdr_void;
+               gssrpc_xdr_wrapstring;
+               gssrpc_xdralloc_create;
+               gssrpc_xdralloc_getdata;
+               gssrpc_xdralloc_release;
+               gssrpc_xdrmem_create;
+               gssrpc_xdrrec_create;
+               gssrpc_xdrrec_endofrecord;
+               gssrpc_xdrrec_eof;
+               gssrpc_xdrrec_skiprecord;
+               gssrpc_xdrstdio_create;
+               gssrpc_xprt_register;
+               gssrpc_xprt_unregister;
 };

Reply via email to