3 files changed, 240 insertions, 5 deletions

diff --git a/kerberos5/lib/libgssapi/Makefile b/kerberos5/lib/libgssapi/Makefile
index f5abca508641..5e3f5c63d805 100644
--- a/kerberos5/lib/libgssapi/Makefile
+++ b/kerberos5/lib/libgssapi/Makefile
@@ -65,6 +65,51 @@ INCS=	gssapi.h			\
 	${.OBJDIR}/krb5_err.h		\
 	${.OBJDIR}/k524_err.h
 
+MAN=	\
+	gss_acquire_cred.3		\
+	gssapi.3
+
+MLINKS=	\
+	gss_acquire_cred.3 gss_accept_sec_context.3	\
+	gss_acquire_cred.3 gss_add_cred.3	\
+	gss_acquire_cred.3 gss_add_oid_set_member.3	\
+	gss_acquire_cred.3 gss_canonicalize_name.3	\
+	gss_acquire_cred.3 gss_compare_name.3	\
+	gss_acquire_cred.3 gss_context_time.3	\
+	gss_acquire_cred.3 gss_create_empty_oid_set.3	\
+	gss_acquire_cred.3 gss_delete_sec_context.3	\
+	gss_acquire_cred.3 gss_display_name.3	\
+	gss_acquire_cred.3 gss_display_status.3	\
+	gss_acquire_cred.3 gss_duplicate_name.3	\
+	gss_acquire_cred.3 gss_export_name.3	\
+	gss_acquire_cred.3 gss_export_sec_context.3	\
+	gss_acquire_cred.3 gss_get_mic.3	\
+	gss_acquire_cred.3 gss_import_name.3	\
+	gss_acquire_cred.3 gss_import_sec_context.3	\
+	gss_acquire_cred.3 gss_indicate_mechs.3	\
+	gss_acquire_cred.3 gss_init_sec_context.3	\
+	gss_acquire_cred.3 gss_inquire_context.3	\
+	gss_acquire_cred.3 gss_inquire_cred.3	\
+	gss_acquire_cred.3 gss_inquire_cred_by_mech.3	\
+	gss_acquire_cred.3 gss_inquire_mechs_for_name.3	\
+	gss_acquire_cred.3 gss_inquire_names_for_mech.3	\
+	gss_acquire_cred.3 gss_krb5_compat_des3_mic.3	\
+	gss_acquire_cred.3 gss_krb5_copy_ccache.3	\
+	gss_acquire_cred.3 gss_process_context_token.3	\
+	gss_acquire_cred.3 gss_release_buffer.3	\
+	gss_acquire_cred.3 gss_release_cred.3	\
+	gss_acquire_cred.3 gss_release_name.3	\
+	gss_acquire_cred.3 gss_release_oid_set.3	\
+	gss_acquire_cred.3 gss_seal.3	\
+	gss_acquire_cred.3 gss_sign.3	\
+	gss_acquire_cred.3 gss_test_oid_set_member.3	\
+	gss_acquire_cred.3 gss_unseal.3	\
+	gss_acquire_cred.3 gss_unwrap.3	\
+	gss_acquire_cred.3 gss_verify.3	\
+	gss_acquire_cred.3 gss_verify_mic.3	\
+	gss_acquire_cred.3 gss_wrap.3	\
+	gss_acquire_cred.3 gss_wrap_size_limit.3
+
 .include <bsd.lib.mk>
 
 .PATH:		${KRB5DIR}/lib/gssapi
diff --git a/kerberos5/lib/libkafs5/Makefile b/kerberos5/lib/libkafs5/Makefile
index c9769ea29853..ebc8f4f25bf3 100644
--- a/kerberos5/lib/libkafs5/Makefile
+++ b/kerberos5/lib/libkafs5/Makefile
@@ -11,6 +11,27 @@ CFLAGS+=-I${KRB5DIR}/lib/kafs \
 INCS=	kafs.h
 SRCS=	afssys.c afskrb5.c common.c
 
+MAN=	kafs5.3
+
+MLINKS=	\
+	kafs5.3 k_afs_cell_of_file.3	\
+	kafs5.3 k_hasafs.3	\
+	kafs5.3 k_pioctl.3	\
+	kafs5.3 k_setpag.3	\
+	kafs5.3 k_unlog.3	\
+	kafs5.3 kafs.3	\
+	kafs5.3 kafs_set_verbose.3	\
+	kafs5.3 kafs_settoken.3	\
+	kafs5.3 kafs_settoken5.3	\
+	kafs5.3 kafs_settoken_rxkad.3	\
+	kafs5.3 krb5_afslog.3	\
+	kafs5.3 krb5_afslog_uid.3	\
+	kafs5.3 krb_afslog.3	\
+	kafs5.3 krb_afslog_uid.3
+
+kafs5.3:	kafs.3
+	sed -e 's/libkafs, -lkafs/libkafs5, -lkafs5/g' ${.ALLSRC} >${.TARGET}
+
 .include <bsd.lib.mk>
 
 .PATH:		${KRB5DIR}/lib/kafs
diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile
index e08130920947..8c58d4577278 100644
--- a/kerberos5/lib/libkrb5/Makefile
+++ b/kerberos5/lib/libkrb5/Makefile
@@ -120,13 +120,17 @@ INCS=	krb5.h				\
 MAN=	\
 	krb5.3				\
 	krb5_425_conv_principal.3	\
+	krb5_address.3			\
+	krb5_aname_to_localname.3	\
 	krb5_appdefault.3		\
 	krb5_auth_context.3		\
 	krb5_build_principal.3		\
+	krb5_ccache.3			\
 	krb5_config.3			\
 	krb5_context.3			\
 	krb5_create_checksum.3		\
 	krb5_crypto_init.3		\
+	krb5_data.3			\
 	krb5_encrypt.3			\
 	krb5_free_addresses.3		\
 	krb5_free_principal.3		\
@@ -135,21 +139,186 @@ MAN=	\
 	krb5_init_context.3		\
 	krb5_keytab.3			\
 	krb5_krbhst_init.3		\
+	krb5_kuserok.3			\
 	krb5_openlog.3			\
 	krb5_parse_name.3		\
 	krb5_principal_get_realm.3	\
+	krb5_set_default_realm.3	\
 	krb5_sname_to_principal.3	\
 	krb5_timeofday.3		\
 	krb5_unparse_name.3		\
 	krb5_verify_user.3		\
 	krb5_warn.3
 
-MAN+=	\
-	krb5.conf.5
+MAN+=	krb5.conf.5
+MAN+=	kerberos.8
 
-MAN+=	\
-	kerberos.8			\
-	verify_krb5_conf.8
+MLINKS=	\
+	krb5_425_conv_principal.3 krb5_425_conv_principal_ext.3	\
+	krb5_425_conv_principal.3 krb5_524_conv_principal.3	\
+	krb5_address.3 krb5_addr2sockaddr.3	\
+	krb5_address.3 krb5_address_compare.3	\
+	krb5_address.3 krb5_address_order.3	\
+	krb5_address.3 krb5_address_search.3	\
+	krb5_address.3 krb5_addresses.3	\
+	krb5_address.3 krb5_anyaddr.3	\
+	krb5_address.3 krb5_append_addresses.3	\
+	krb5_address.3 krb5_copy_address.3	\
+	krb5_address.3 krb5_copy_addresses.3	\
+	krb5_address.3 krb5_free_address.3	\
+	krb5_address.3 krb5_free_addresses.3	\
+	krb5_address.3 krb5_h_addr2addr.3	\
+	krb5_address.3 krb5_h_addr2sockaddr.3	\
+	krb5_address.3 krb5_make_addrport.3	\
+	krb5_address.3 krb5_max_sockaddr_size.3	\
+	krb5_address.3 krb5_parse_address.3	\
+	krb5_address.3 krb5_print_address.3	\
+	krb5_address.3 krb5_sockaddr2address.3	\
+	krb5_address.3 krb5_sockaddr2port.3	\
+	krb5_address.3 krb5_sockaddr_uninteresting.3	\
+	krb5_appdefault.3 krb5_appdefault_boolean.3	\
+	krb5_appdefault.3 krb5_appdefault_string.3	\
+	krb5_appdefault.3 krb5_appdefault_time.3	\
+	krb5_auth_context.3 krb5_auth_con_free.3	\
+	krb5_auth_context.3 krb5_auth_con_genaddrs.3	\
+	krb5_auth_context.3 krb5_auth_con_getaddrs.3	\
+	krb5_auth_context.3 krb5_auth_con_getflags.3	\
+	krb5_auth_context.3 krb5_auth_con_getkey.3	\
+	krb5_auth_context.3 krb5_auth_con_getlocalsubkey.3	\
+	krb5_auth_context.3 krb5_auth_con_getrcache.3	\
+	krb5_auth_context.3 krb5_auth_con_getremotesubkey.3	\
+	krb5_auth_context.3 krb5_auth_con_getuserkey.3	\
+	krb5_auth_context.3 krb5_auth_con_init.3	\
+	krb5_auth_context.3 krb5_auth_con_initivector.3	\
+	krb5_auth_context.3 krb5_auth_con_setaddrs.3	\
+	krb5_auth_context.3 krb5_auth_con_setaddrs_from_fd.3	\
+	krb5_auth_context.3 krb5_auth_con_setflags.3	\
+	krb5_auth_context.3 krb5_auth_con_setivector.3	\
+	krb5_auth_context.3 krb5_auth_con_setkey.3	\
+	krb5_auth_context.3 krb5_auth_con_setlocalsubkey.3	\
+	krb5_auth_context.3 krb5_auth_con_setrcache.3	\
+	krb5_auth_context.3 krb5_auth_con_setremotesubkey.3	\
+	krb5_auth_context.3 krb5_auth_con_setuserkey.3	\
+	krb5_auth_context.3 krb5_auth_getauthenticator.3	\
+	krb5_auth_context.3 krb5_auth_getcksumtype.3	\
+	krb5_auth_context.3 krb5_auth_getkeytype.3	\
+	krb5_auth_context.3 krb5_auth_getlocalseqnumber.3	\
+	krb5_auth_context.3 krb5_auth_getremoteseqnumber.3	\
+	krb5_auth_context.3 krb5_auth_setcksumtype.3	\
+	krb5_auth_context.3 krb5_auth_setkeytype.3	\
+	krb5_auth_context.3 krb5_auth_setlocalseqnumber.3	\
+	krb5_auth_context.3 krb5_auth_setremoteseqnumber.3	\
+	krb5_build_principal.3 krb5_build_principal_ext.3	\
+	krb5_build_principal.3 krb5_build_principal_va.3	\
+	krb5_build_principal.3 krb5_build_principal_va_ext.3	\
+	krb5_build_principal.3 krb5_make_principal.3	\
+	krb5_ccache.3 krb5_cc_close.3	\
+	krb5_ccache.3 krb5_cc_copy_cache.3	\
+	krb5_ccache.3 krb5_cc_cursor.3	\
+	krb5_ccache.3 krb5_cc_default.3	\
+	krb5_ccache.3 krb5_cc_default_name.3	\
+	krb5_ccache.3 krb5_cc_destroy.3	\
+	krb5_ccache.3 krb5_cc_end_seq_get.3	\
+	krb5_ccache.3 krb5_cc_gen_new.3	\
+	krb5_ccache.3 krb5_cc_get_name.3	\
+	krb5_ccache.3 krb5_cc_get_ops.3	\
+	krb5_ccache.3 krb5_cc_get_principal.3	\
+	krb5_ccache.3 krb5_cc_get_type.3	\
+	krb5_ccache.3 krb5_cc_get_version.3	\
+	krb5_ccache.3 krb5_cc_initialize.3	\
+	krb5_ccache.3 krb5_cc_next_cred.3	\
+	krb5_ccache.3 krb5_cc_ops.3	\
+	krb5_ccache.3 krb5_cc_register.3	\
+	krb5_ccache.3 krb5_cc_remove_cred.3	\
+	krb5_ccache.3 krb5_cc_resolve.3	\
+	krb5_ccache.3 krb5_cc_retrieve_cred.3	\
+	krb5_ccache.3 krb5_cc_set_default_name.3	\
+	krb5_ccache.3 krb5_cc_set_flags.3	\
+	krb5_ccache.3 krb5_cc_store_cred.3	\
+	krb5_ccache.3 krb5_fcc_ops.3	\
+	krb5_ccache.3 krb5_mcc_ops.3	\
+	krb5_config.3 krb5_config_get_bool_default.3	\
+	krb5_config.3 krb5_config_get_int_default.3	\
+	krb5_config.3 krb5_config_get_string_default.3	\
+	krb5_config.3 krb5_config_get_time_default.3	\
+	krb5_create_checksum.3 krb5_checksum_is_collision_proof.3	\
+	krb5_create_checksum.3 krb5_checksum_is_keyed.3	\
+	krb5_create_checksum.3 krb5_checksumsize.3	\
+	krb5_create_checksum.3 krb5_verify_checksum.3	\
+	krb5_crypto_init.3 krb5_crypto_destroy.3	\
+	krb5_data.3 krb5_copy_data.3	\
+	krb5_data.3 krb5_data_alloc.3	\
+	krb5_data.3 krb5_data_copy.3	\
+	krb5_data.3 krb5_data_free.3	\
+	krb5_data.3 krb5_data_realloc.3	\
+	krb5_data.3 krb5_data_zero.3	\
+	krb5_data.3 krb5_free_data.3	\
+	krb5_data.3 krb5_free_data_contents.3	\
+	krb5_encrypt.3 krb5_decrypt.3	\
+	krb5_encrypt.3 krb5_decrypt_EncryptedData.3	\
+	krb5_encrypt.3 krb5_encrypt_EncryptedData.3	\
+	krb5_get_all_client_addrs.3 krb5_get_all_server_addrs.3	\
+	krb5_get_krbhst.3 krb5_free_krbhst.3	\
+	krb5_get_krbhst.3 krb5_get_krb524hst.3	\
+	krb5_get_krbhst.3 krb5_get_krb_admin_hst.3	\
+	krb5_get_krbhst.3 krb5_get_krb_changepw_hst.3	\
+	krb5_init_context.3 krb5_free_context.3	\
+	krb5_keytab.3 krb5_keytab_entry.3	\
+	krb5_keytab.3 krb5_kt_add_entry.3	\
+	krb5_keytab.3 krb5_kt_close.3	\
+	krb5_keytab.3 krb5_kt_compare.3	\
+	krb5_keytab.3 krb5_kt_copy_entry_contents.3	\
+	krb5_keytab.3 krb5_kt_cursor.3	\
+	krb5_keytab.3 krb5_kt_default.3	\
+	krb5_keytab.3 krb5_kt_default_name.3	\
+	krb5_keytab.3 krb5_kt_end_seq_get.3	\
+	krb5_keytab.3 krb5_kt_free_entry.3	\
+	krb5_keytab.3 krb5_kt_get_entry.3	\
+	krb5_keytab.3 krb5_kt_get_name.3	\
+	krb5_keytab.3 krb5_kt_get_type.3	\
+	krb5_keytab.3 krb5_kt_next_entry.3	\
+	krb5_keytab.3 krb5_kt_ops.3	\
+	krb5_keytab.3 krb5_kt_read_service_key.3	\
+	krb5_keytab.3 krb5_kt_register.3	\
+	krb5_keytab.3 krb5_kt_remove_entry.3	\
+	krb5_keytab.3 krb5_kt_resolve.3	\
+	krb5_keytab.3 krb5_kt_start_seq_get.3	\
+	krb5_krbhst_init.3 krb5_krbhst_format_string.3	\
+	krb5_krbhst_init.3 krb5_krbhst_free.3	\
+	krb5_krbhst_init.3 krb5_krbhst_get_addrinfo.3	\
+	krb5_krbhst_init.3 krb5_krbhst_next.3	\
+	krb5_krbhst_init.3 krb5_krbhst_next_as_string.3	\
+	krb5_krbhst_init.3 krb5_krbhst_reset.3	\
+	krb5_openlog.3 krb5_addlog_dest.3	\
+	krb5_openlog.3 krb5_addlog_func.3	\
+	krb5_openlog.3 krb5_closelog.3	\
+	krb5_openlog.3 krb5_initlog.3	\
+	krb5_openlog.3 krb5_log.3	\
+	krb5_openlog.3 krb5_log_msg.3	\
+	krb5_openlog.3 krb5_vlog.3	\
+	krb5_openlog.3 krb5_vlog_msg.3	\
+	krb5_principal_get_realm.3 krb5_principal_get_comp_string.3	\
+	krb5_set_default_realm.3 krb5_free_host_realm.3	\
+	krb5_set_default_realm.3 krb5_get_default_realm.3	\
+	krb5_set_default_realm.3 krb5_get_default_realms.3	\
+	krb5_set_default_realm.3 krb5_get_host_realm.3	\
+	krb5_sname_to_principal.3 krb5_sock_to_principal.3	\
+	krb5_timeofday.3 krb5_us_timeofday.3	\
+	krb5_verify_user.3 krb5_verify_opt_init.3	\
+	krb5_verify_user.3 krb5_verify_opt_set_flags.3	\
+	krb5_verify_user.3 krb5_verify_opt_set_keytab.3	\
+	krb5_verify_user.3 krb5_verify_opt_set_secure.3	\
+	krb5_verify_user.3 krb5_verify_opt_set_service.3	\
+	krb5_verify_user.3 krb5_verify_user_lrealm.3	\
+	krb5_verify_user.3 krb5_verify_user_opt.3	\
+	krb5_warn.3 krb5_err.3	\
+	krb5_warn.3 krb5_errx.3	\
+	krb5_warn.3 krb5_set_warn_dest.3	\
+	krb5_warn.3 krb5_verr.3	\
+	krb5_warn.3 krb5_verrx.3	\
+	krb5_warn.3 krb5_vwarn.3	\
+	krb5_warn.3 krb5_vwarnx.3	\
+	krb5_warn.3 krb5_warnx.3
 
 .include <bsd.lib.mk>