Sync Kerberos man pages with reality:

* remove useless MLINKS and create missing ones
* don't install doxygen generated man pages
* add missing ones

ok miod@ robert@

8 files changed, 222 insertions, 362 deletions

diff --git a/kerberosV/lib/libhdb/Makefile b/kerberosV/lib/libhdb/Makefile
index 85daebf5886..789e649104e 100644
--- a/kerberosV/lib/libhdb/Makefile
+++ b/kerberosV/lib/libhdb/Makefile
@@ -1,33 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2013/07/10 05:07:53 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2013/11/03 11:56:40 ajacoutot Exp $
 
 LIB=	hdb
 
-MPAGES=	HDB.3 hdb_entry_ex.3
 MSRC=		${KRB5DIR}/doc/doxyout/hdb/man/man3
 
-MLINKS=	HDB.3 hdb__del.3 \
-	HDB.3 hdb__get.3 \
-	HDB.3 hdb__put.3 \
-	HDB.3 hdb_auth_status.3 \
-	HDB.3 hdb_check_constrained_delegation.3 \
-	HDB.3 hdb_check_pkinit_ms_upn_match.3 \
-	HDB.3 hdb_check_s4u2self.3 \
-	HDB.3 hdb_close.3 \
-	HDB.3 hdb_destroy.3 \
-	HDB.3 hdb_fetch_kvno.3 \
-	HDB.3 hdb_firstkey.3 \
-	HDB.3 hdb_free.3 \
-	HDB.3 hdb_get_realms.3 \
-	HDB.3 hdb_lock.3 \
-	HDB.3 hdb_name.3 \
-	HDB.3 hdb_nextkey.3 \
-	HDB.3 hdb_open.3 \
-	HDB.3 hdb_password.3 \
-	HDB.3 hdb_remove.3 \
-	HDB.3 hdb_rename.3 \
-	HDB.3 hdb_store.3 \
-	HDB.3 hdb_unlock.3
-
 INCS=	hdb-protos.h \
 	hdb.h
 
diff --git a/kerberosV/lib/libkafs/Makefile b/kerberosV/lib/libkafs/Makefile
index 964be437e9a..922b39d1fb5 100644
--- a/kerberosV/lib/libkafs/Makefile
+++ b/kerberosV/lib/libkafs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2013/08/10 09:07:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.2 2013/11/03 11:56:40 ajacoutot Exp $
 
 LIB=	kafs
 INCS=	kafs.h
@@ -7,6 +7,7 @@ MSRC=	${KRB5DIR}/lib/kafs
 
 MLINKS=	kafs.3 k_afs_cell_of_file.3 \
 	kafs.3 k_hasafs.3 \
+	kafs.3 k_hasafs_recheck.3 \
 	kafs.3 k_pioctl.3 \
 	kafs.3 k_setpag.3 \
 	kafs.3 k_unlog.3 \
diff --git a/kerberosV/lib/libkrb5/Makefile b/kerberosV/lib/libkrb5/Makefile
index 95fc30eb446..b33d61f7857 100644
--- a/kerberosV/lib/libkrb5/Makefile
+++ b/kerberosV/lib/libkrb5/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2013/07/22 12:55:29 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2013/11/03 11:56:40 ajacoutot Exp $
 
 LIB=	krb5
 
@@ -20,30 +20,19 @@ KRB5INCS=	locate_plugin.h \
 KRB5INCSDIR=	${INCSDIR}/krb5
 INCSGROUPS=	INCS KRB5INCS
 
-MPAGES=	krb5.3 \
-	krb524_convert_creds_kdc.3 \
+MPAGES=	krb524_convert_creds_kdc.3 \
 	krb5_425_conv_principal.3 \
 	krb5_acl_match_file.3 \
-	krb5_address.3 \
 	krb5_aname_to_localname.3 \
 	krb5_appdefault.3 \
-	krb5_auth.3 \
 	krb5_auth_context.3 \
 	krb5_c_make_checksum.3 \
-	krb5_ccache.3 \
-	krb5_ccache_intro.3 \
 	krb5_check_transited.3 \
 	krb5_create_checksum.3 \
-	krb5_credential.3 \
 	krb5_creds.3 \
-	krb5_crypto.3 \
-	krb5_crypto_iov.3 \
-	krb5_deprecated.3 \
 	krb5_digest.3 \
 	krb5_eai_to_heim_errno.3 \
 	krb5_encrypt.3 \
-	krb5_error.3 \
-	krb5_fileformats.3 \
 	krb5_find_padata.3 \
 	krb5_generate_random_block.3 \
 	krb5_get_all_client_addrs.3 \
@@ -55,30 +44,20 @@ MPAGES=	krb5.3 \
 	krb5_get_krbhst.3 \
 	krb5_getportbyname.3 \
 	krb5_init_context.3 \
-	krb5_init_creds_intro.3 \
-	krb5_introduction.3 \
 	krb5_is_thread_safe.3 \
-	krb5_keytab.3 \
-	krb5_keytab_intro.3 \
 	krb5_krbhst_init.3 \
 	krb5_mk_req.3 \
 	krb5_mk_safe.3 \
 	krb5_openlog.3 \
-	krb5_pac.3 \
 	krb5_parse_name.3 \
 	krb5_principal.3 \
-	krb5_principal_intro.3 \
 	krb5_rcache.3 \
 	krb5_rd_error.3 \
 	krb5_rd_safe.3 \
 	krb5_set_default_realm.3 \
 	krb5_set_password.3 \
-	krb5_storage.3 \
 	krb5_string_to_key.3 \
-	krb5_support.3 \
-	krb5_ticket.3 \
 	krb5_timeofday.3 \
-	krb5_v4compat.3 \
 	krb5_verify_init_creds.3 \
 	krb5_verify_user.3
 
@@ -88,90 +67,20 @@ MPAGES+=	kerberos.8
 MSRC=	${KRB5DIR}/lib/krb5 \
 	${KRB5DIR}/doc/doxyout/krb5/man/man3
 
-MLINKS=	krb5.3 krb5_add_et_list.3 \
-	krb5.3 krb5_add_extra_addresses.3 \
-	krb5.3 krb5_add_ignore_addresses.3 \
-	krb5.3 krb5_compare_creds.3 \
-	krb5.3 krb5_copy_context.3 \
-	krb5.3 krb5_copy_creds.3 \
-	krb5.3 krb5_copy_creds_contents.3 \
-	krb5.3 krb5_copy_data.3 \
-	krb5.3 krb5_copy_host_realm.3 \
-	krb5.3 krb5_copy_ticket.3 \
-	krb5.3 krb5_creds_get_ticket_flags.3 \
-	krb5.3 krb5_data_alloc.3 \
-	krb5.3 krb5_data_cmp.3 \
-	krb5.3 krb5_data_copy.3 \
-	krb5.3 krb5_data_ct_cmp.3 \
-	krb5.3 krb5_data_free.3 \
-	krb5.3 krb5_data_realloc.3 \
-	krb5.3 krb5_data_zero.3 \
-	krb5.3 krb5_free_config_files.3 \
-	krb5.3 krb5_free_cred_contents.3 \
-	krb5.3 krb5_free_creds.3 \
-	krb5.3 krb5_free_data.3 \
-	krb5.3 krb5_free_ticket.3 \
-	krb5.3 krb5_get_default_config_files.3 \
-	krb5.3 krb5_get_default_in_tkt_etypes.3 \
-	krb5.3 krb5_get_dns_canonicalize_hostname.3 \
-	krb5.3 krb5_get_extra_addresses.3 \
-	krb5.3 krb5_get_fcache_version.3 \
-	krb5.3 krb5_get_ignore_addresses.3 \
-	krb5.3 krb5_get_kdc_sec_offset.3 \
-	krb5.3 krb5_get_max_time_skew.3 \
-	krb5.3 krb5_get_use_admin_kdc.3 \
-	krb5.3 krb5_init_ets.3 \
-	krb5.3 krb5_kerberos_enctypes.3 \
-	krb5.3 krb5_prepend_config_files_default.3 \
-	krb5.3 krb5_set_config_files.3 \
-	krb5.3 krb5_set_default_in_tkt_etypes.3 \
-	krb5.3 krb5_set_dns_canonicalize_hostname.3 \
-	krb5.3 krb5_set_extra_addresses.3 \
-	krb5.3 krb5_set_fcache_version.3 \
-	krb5.3 krb5_set_home_dir_access.3 \
-	krb5.3 krb5_set_ignore_addresses.3 \
-	krb5.3 krb5_set_kdc_sec_offset.3 \
-	krb5.3 krb5_set_max_time_skew.3 \
-	krb5.3 krb5_set_real_time.3 \
-	krb5.3 krb5_set_use_admin_kdc.3 \
-	krb5.3 krb5_ticket_get_authorization_data_type.3 \
-	krb5.3 krb5_ticket_get_client.3 \
-	krb5.3 krb5_ticket_get_endtime.3 \
-	krb5.3 krb5_ticket_get_server.3 \
+MLINKS= \
+	krb524_convert_creds_kdc.3 krb524_convert_creds_kdc_ccache.3 \
 	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_prefixlen_boundary.3 \
-	krb5_address.3 krb5_address_search.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_acl_match_file.3 krb5_acl_match_string.3 \
 	krb5_appdefault.3 krb5_appdefault_boolean.3 \
 	krb5_appdefault.3 krb5_appdefault_string.3 \
 	krb5_appdefault.3 krb5_appdefault_time.3 \
-	krb5_auth.3 krb5_rd_req_ctx.3 \
-	krb5_auth.3 krb5_rd_req_in_ctx_alloc.3 \
-	krb5_auth.3 krb5_rd_req_in_set_keytab.3 \
-	krb5_auth.3 krb5_rd_req_in_set_pac_check.3 \
-	krb5_auth.3 krb5_rd_req_out_ctx_free.3 \
-	krb5_auth.3 krb5_rd_req_out_get_server.3 \
+	krb5_auth_context.3 krb5_auth_con_addflags.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_generatelocalsubkey.3 \
 	krb5_auth_context.3 krb5_auth_con_getaddrs.3 \
+	krb5_auth_context.3 krb5_auth_con_getauthenticator.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 \
@@ -180,6 +89,7 @@ MLINKS=	krb5.3 krb5_add_et_list.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_removeflags.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 \
@@ -189,179 +99,185 @@ MLINKS=	krb5.3 krb5_add_et_list.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_ccache.3 krb5_acc_ops.3 \
-	krb5_ccache.3 krb5_cc_cache_end_seq_get.3 \
-	krb5_ccache.3 krb5_cc_cache_get_first.3 \
-	krb5_ccache.3 krb5_cc_cache_match.3 \
-	krb5_ccache.3 krb5_cc_cache_next.3 \
-	krb5_ccache.3 krb5_cc_clear_mcred.3 \
-	krb5_ccache.3 krb5_cc_close.3 \
-	krb5_ccache.3 krb5_cc_copy_cache.3 \
-	krb5_ccache.3 krb5_cc_copy_creds.3 \
-	krb5_ccache.3 krb5_cc_copy_match_f.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_config.3 \
-	krb5_ccache.3 krb5_cc_get_flags.3 \
-	krb5_ccache.3 krb5_cc_get_friendly_name.3 \
-	krb5_ccache.3 krb5_cc_get_full_name.3 \
-	krb5_ccache.3 krb5_cc_get_kdc_offset.3 \
-	krb5_ccache.3 krb5_cc_get_lifetime.3 \
-	krb5_ccache.3 krb5_cc_get_name.3 \
-	krb5_ccache.3 krb5_cc_get_ops.3 \
-	krb5_ccache.3 krb5_cc_get_prefix_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_last_change_time.3 \
-	krb5_ccache.3 krb5_cc_move.3 \
-	krb5_ccache.3 krb5_cc_new_unique.3 \
-	krb5_ccache.3 krb5_cc_next_cred.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_config.3 \
-	krb5_ccache.3 krb5_cc_set_default_name.3 \
-	krb5_ccache.3 krb5_cc_set_flags.3 \
-	krb5_ccache.3 krb5_cc_set_friendly_name.3 \
-	krb5_ccache.3 krb5_cc_set_kdc_offset.3 \
-	krb5_ccache.3 krb5_cc_start_seq_get.3 \
-	krb5_ccache.3 krb5_cc_store_cred.3 \
-	krb5_ccache.3 krb5_cc_support_switch.3 \
-	krb5_ccache.3 krb5_cc_switch.3 \
-	krb5_ccache.3 krb5_cccol_cursor_free.3 \
-	krb5_ccache.3 krb5_cccol_cursor_new.3 \
-	krb5_ccache.3 krb5_cccol_cursor_next.3 \
-	krb5_ccache.3 krb5_cccol_last_change_time.3 \
-	krb5_ccache.3 krb5_fcc_ops.3 \
-	krb5_ccache.3 krb5_get_validated_creds.3 \
-	krb5_ccache.3 krb5_is_config_principal.3 \
-	krb5_ccache.3 krb5_mcc_ops.3 \
+	krb5_auth_context.3 krb5_free_authenticator.3 \
+	krb5_c_make_checksum.3 krb5_c_block_size.3 \
+	krb5_c_make_checksum.3 krb5_c_checksum_length.3 \
+	krb5_c_make_checksum.3 krb5_c_decrypt.3 \
+	krb5_c_make_checksum.3 krb5_c_encrypt.3 \
+	krb5_c_make_checksum.3 krb5_c_encrypt_length.3 \
+	krb5_c_make_checksum.3 krb5_c_enctype_compare.3 \
+	krb5_c_make_checksum.3 krb5_c_get_checksum.3 \
+	krb5_c_make_checksum.3 krb5_c_is_coll_proof_cksum.3 \
+	krb5_c_make_checksum.3 krb5_c_is_keyed_cksum.3 \
+	krb5_c_make_checksum.3 krb5_c_keylength.3 \
+	krb5_c_make_checksum.3 krb5_c_make_random_key.3 \
+	krb5_c_make_checksum.3 krb5_c_set_checksum.3 \
+	krb5_c_make_checksum.3 krb5_c_valid_cksumtype.3 \
+	krb5_c_make_checksum.3 krb5_c_valid_enctype.3 \
+	krb5_c_make_checksum.3 krb5_c_verify_checksum.3 \
+	krb5_check_transited.3 krb5_check_transited_realms.3 \
+	krb5_check_transited.3 krb5_domain_x500_decode.3 \
+	krb5_check_transited.3 krb5_domain_x500_encode.3 \
+	krb5_create_checksum.3 krb5_checksum.3 \
+	krb5_create_checksum.3 krb5_checksum_disable.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_cksumtype_valid.3 \
+	krb5_create_checksum.3 krb5_copy_checksum.3 \
+	krb5_create_checksum.3 krb5_crypto_get_checksum_type.3 \
+	krb5_create_checksum.3 krb5_free_checksum.3 \
+	krb5_create_checksum.3 krb5_free_checksum_contents.3 \
+	krb5_create_checksum.3 krb5_hmac.3 \
 	krb5_create_checksum.3 krb5_verify_checksum.3 \
-	krb5_credential.3 krb5_fwd_tgt_creds.3 \
-	krb5_credential.3 krb5_get_init_creds_keyblock.3 \
-	krb5_credential.3 krb5_get_init_creds_keytab.3 \
-	krb5_credential.3 krb5_get_init_creds_opt_alloc.3 \
-	krb5_credential.3 krb5_get_init_creds_opt_free.3 \
-	krb5_credential.3 krb5_get_init_creds_password.3 \
-	krb5_credential.3 krb5_init_creds_free.3 \
-	krb5_credential.3 krb5_init_creds_get.3 \
-	krb5_credential.3 krb5_init_creds_get_error.3 \
-	krb5_credential.3 krb5_init_creds_init.3 \
-	krb5_credential.3 krb5_init_creds_set_keytab.3 \
-	krb5_credential.3 krb5_init_creds_set_password.3 \
-	krb5_credential.3 krb5_init_creds_set_service.3 \
-	krb5_credential.3 krb5_init_creds_step.3 \
-	krb5_crypto.3 krb5_allow_weak_crypto.3 \
-	krb5_crypto.3 krb5_cksumtype_to_enctype.3 \
-	krb5_crypto.3 krb5_copy_keyblock.3 \
-	krb5_crypto.3 krb5_copy_keyblock_contents.3 \
-	krb5_crypto.3 krb5_create_checksum_iov.3 \
-	krb5_crypto.3 krb5_crypto_destroy.3 \
-	krb5_crypto.3 krb5_crypto_fx_cf2.3 \
-	krb5_crypto.3 krb5_crypto_getblocksize.3 \
-	krb5_crypto.3 krb5_crypto_getconfoundersize.3 \
-	krb5_crypto.3 krb5_crypto_getenctype.3 \
-	krb5_crypto.3 krb5_crypto_getpadsize.3 \
-	krb5_crypto.3 krb5_crypto_init.3 \
-	krb5_crypto.3 krb5_decrypt_iov_ivec.3 \
-	krb5_crypto.3 krb5_encrypt_iov_ivec.3 \
-	krb5_crypto.3 krb5_enctype_disable.3 \
-	krb5_crypto.3 krb5_enctype_enable.3 \
-	krb5_crypto.3 krb5_enctype_valid.3 \
-	krb5_crypto.3 krb5_free_keyblock.3 \
-	krb5_crypto.3 krb5_free_keyblock_contents.3 \
-	krb5_crypto.3 krb5_generate_subkey_extended.3 \
-	krb5_crypto.3 krb5_keyblock_get_enctype.3 \
-	krb5_crypto.3 krb5_keyblock_init.3 \
-	krb5_crypto.3 krb5_keyblock_zero.3 \
-	krb5_crypto.3 krb5_random_to_key.3 \
-	krb5_crypto.3 krb5_verify_checksum_iov.3 \
-	krb5_deprecated.3 krb5_auth_getremoteseqnumber.3 \
-	krb5_deprecated.3 krb5_c_enctype_compare.3 \
-	krb5_deprecated.3 krb5_change_password.3 \
-	krb5_deprecated.3 krb5_clear_error_string.3 \
-	krb5_deprecated.3 krb5_config_parse_string_multi.3 \
-	krb5_deprecated.3 krb5_enctypes_compatible_keys.3 \
-	krb5_deprecated.3 krb5_free_creds_contents.3 \
-	krb5_deprecated.3 krb5_free_data_contents.3 \
-	krb5_deprecated.3 krb5_free_error_string.3 \
-	krb5_deprecated.3 krb5_free_unparsed_name.3 \
-	krb5_deprecated.3 krb5_generate_subkey.3 \
-	krb5_deprecated.3 krb5_get_cred_from_kdc.3 \
-	krb5_deprecated.3 krb5_get_cred_from_kdc_opt.3 \
-	krb5_deprecated.3 krb5_get_in_tkt_with_keytab.3 \
-	krb5_deprecated.3 krb5_get_in_tkt_with_password.3 \
-	krb5_deprecated.3 krb5_get_in_tkt_with_skey.3 \
-	krb5_deprecated.3 krb5_get_init_creds_opt_get_error.3 \
-	krb5_deprecated.3 krb5_get_init_creds_opt_init.3 \
-	krb5_deprecated.3 krb5_keytab_key_proc.3 \
-	krb5_deprecated.3 krb5_keytype_to_enctypes.3 \
-	krb5_deprecated.3 krb5_keytype_to_enctypes_default.3 \
-	krb5_deprecated.3 krb5_keytype_to_string.3 \
-	krb5_deprecated.3 krb5_password_key_proc.3 \
-	krb5_deprecated.3 krb5_princ_realm.3 \
-	krb5_deprecated.3 krb5_princ_set_realm.3 \
-	krb5_deprecated.3 krb5_set_error_string.3 \
-	krb5_deprecated.3 krb5_string_to_keytype.3 \
-	krb5_deprecated.3 krb5_vset_error_string.3 \
-	krb5_digest.3 krb5_digest_probe.3 \
+	krb5_creds.3 krb5_copy_creds.3 \
+	krb5_creds.3 krb5_copy_creds_contents.3 \
+	krb5_creds.3 krb5_free_cred_contents.3 \
+	krb5_creds.3 krb5_free_creds.3 \
+	krb5_digest.3 krb5_digest_alloc.3 \
+	krb5_digest.3 krb5_digest_free.3 \
+	krb5_digest.3 krb5_digest_get_a1_hash.3 \
+	krb5_digest.3 krb5_digest_get_client_binding.3 \
+	krb5_digest.3 krb5_digest_get_identifier.3 \
+	krb5_digest.3 krb5_digest_get_opaque.3 \
+	krb5_digest.3 krb5_digest_get_responseData.3 \
+	krb5_digest.3 krb5_digest_get_rsp.3 \
+	krb5_digest.3 krb5_digest_get_server_nonce.3 \
+	krb5_digest.3 krb5_digest_get_tickets.3 \
+	krb5_digest.3 krb5_digest_init_request.3 \
+	krb5_digest.3 krb5_digest_request.3 \
+	krb5_digest.3 krb5_digest_set_authentication_user.3 \
+	krb5_digest.3 krb5_digest_set_authid.3 \
+	krb5_digest.3 krb5_digest_set_client_nonce.3 \
+	krb5_digest.3 krb5_digest_set_digest.3 \
+	krb5_digest.3 krb5_digest_set_hostname.3 \
+	krb5_digest.3 krb5_digest_set_identifier.3 \
+	krb5_digest.3 krb5_digest_set_method.3 \
+	krb5_digest.3 krb5_digest_set_nonceCount.3 \
+	krb5_digest.3 krb5_digest_set_opaque.3 \
+	krb5_digest.3 krb5_digest_set_qop.3 \
+	krb5_digest.3 krb5_digest_set_realm.3 \
+	krb5_digest.3 krb5_digest_set_server_cb.3 \
+	krb5_digest.3 krb5_digest_set_server_nonce.3 \
+	krb5_digest.3 krb5_digest_set_type.3 \
+	krb5_digest.3 krb5_digest_set_uri.3 \
+	krb5_digest.3 krb5_digest_set_username.3 \
+	krb5_eai_to_heim_errno.3 krb5_h_errno_to_heim_errno.3 \
+	krb5_encrypt.3 krb5_crypto_getblocksize.3 \
+	krb5_encrypt.3 krb5_crypto_getconfoundersize.3 \
+	krb5_encrypt.3 krb5_crypto_getenctype.3 \
+	krb5_encrypt.3 krb5_crypto_getpadsize.3 \
+	krb5_encrypt.3 krb5_crypto_overhead.3 \
 	krb5_encrypt.3 krb5_decrypt.3 \
 	krb5_encrypt.3 krb5_decrypt_EncryptedData.3 \
+	krb5_encrypt.3 krb5_decrypt_ivec.3 \
+	krb5_encrypt.3 krb5_decrypt_ticket.3 \
 	krb5_encrypt.3 krb5_encrypt_EncryptedData.3 \
-	krb5_error.3 krb5_clear_error_message.3 \
-	krb5_error.3 krb5_h_errno_to_heim_errno.3 \
-	krb5_error.3 krb5_set_error_message.3 \
-	krb5_error.3 krb5_vwarn.3 \
+	krb5_encrypt.3 krb5_encrypt_ivec.3 \
+	krb5_encrypt.3 krb5_enctype_disable.3 \
+	krb5_encrypt.3 krb5_enctype_keysize.3 \
+	krb5_encrypt.3 krb5_enctype_to_string.3 \
+	krb5_encrypt.3 krb5_enctype_valid.3 \
+	krb5_encrypt.3 krb5_get_wrapped_length.3 \
+	krb5_encrypt.3 krb5_string_to_enctype.3 \
+	krb5_find_padata.3 krb5_padata_add.3 \
 	krb5_get_all_client_addrs.3 krb5_get_all_server_addrs.3 \
+	krb5_get_credentials.3 krb5_get_cred_from_kdc.3 \
+	krb5_get_credentials.3 krb5_get_cred_from_kdc_opt.3 \
+	krb5_get_credentials.3 krb5_get_credentials_with_flags.3 \
+	krb5_get_credentials.3 krb5_get_kdc_cred.3 \
+	krb5_get_credentials.3 krb5_get_renewed_creds.3 \
+	krb5_get_creds.3 krb5_get_creds_opt_add_options.3 \
+	krb5_get_creds.3 krb5_get_creds_opt_alloc.3 \
+	krb5_get_creds.3 krb5_get_creds_opt_free.3 \
+	krb5_get_creds.3 krb5_get_creds_opt_set_enctype.3 \
+	krb5_get_creds.3 krb5_get_creds_opt_set_impersonate.3 \
+	krb5_get_creds.3 krb5_get_creds_opt_set_options.3 \
+	krb5_get_creds.3 krb5_get_creds_opt_set_ticket.3 \
+	krb5_get_forwarded_creds.3 krb5_fwd_tgt_creds.3 \
+	krb5_get_in_cred.3 krb5_free_kdc_rep.3 \
+	krb5_get_in_cred.3 krb5_get_in_tkt.3 \
+	krb5_get_in_cred.3 krb5_get_in_tkt_with_keytab.3 \
+	krb5_get_in_cred.3 krb5_get_in_tkt_with_password.3 \
+	krb5_get_in_cred.3 krb5_get_in_tkt_with_skey.3 \
+	krb5_get_in_cred.3 krb5_password_key_proc.3 \
+	krb5_get_init_creds.3 krb5_get_init_creds_keytab.3 \
+	krb5_get_init_creds.3 krb5_get_init_creds_opt.3 \
+	krb5_get_init_creds.3 krb5_get_init_creds_opt_alloc.3 \
+	krb5_get_init_creds.3 krb5_get_init_creds_opt_free.3 \
+	krb5_get_init_creds.3 krb5_get_init_creds_opt_init.3 \
+	krb5_get_init_creds.3 krb5_get_init_creds_opt_set_address_list.3 \
+	krb5_get_init_creds.3 krb5_get_init_creds_opt_set_addressless.3 \
+	krb5_get_init_creds.3 krb5_get_init_creds_opt_set_anonymous.3 \
+	krb5_get_init_creds.3 krb5_get_init_creds_opt_set_canonicalize.3 \
+	krb5_get_init_creds.3 krb5_get_init_creds_opt_set_default_flags.3 \
+	krb5_get_init_creds.3 krb5_get_init_creds_opt_set_etype_list.3 \
+	krb5_get_init_creds.3 krb5_get_init_creds_opt_set_forwardable.3 \
+	krb5_get_init_creds.3 krb5_get_init_creds_opt_set_pa_password.3 \
+	krb5_get_init_creds.3 krb5_get_init_creds_opt_set_paq_request.3 \
+	krb5_get_init_creds.3 krb5_get_init_creds_opt_set_preauth_list.3 \
+	krb5_get_init_creds.3 krb5_get_init_creds_opt_set_proxiable.3 \
+	krb5_get_init_creds.3 krb5_get_init_creds_opt_set_renew_life.3 \
+	krb5_get_init_creds.3 krb5_get_init_creds_opt_set_salt.3 \
+	krb5_get_init_creds.3 krb5_get_init_creds_opt_set_tkt_life.3 \
+	krb5_get_init_creds.3 krb5_get_init_creds_opt_set_win2k.3 \
+	krb5_get_init_creds.3 krb5_get_init_creds_password.3 \
+	krb5_get_init_creds.3 krb5_prompt.3 \
+	krb5_get_init_creds.3 krb5_prompter_posix.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_add_et_list.3 \
+	krb5_init_context.3 krb5_add_extra_addresses.3 \
+	krb5_init_context.3 krb5_add_ignore_addresses.3 \
+	krb5_init_context.3 krb5_context.3 \
+	krb5_init_context.3 krb5_free_config_files.3 \
 	krb5_init_context.3 krb5_free_context.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_default.3 \
-	krb5_keytab.3 krb5_kt_default_modify_name.3 \
-	krb5_keytab.3 krb5_kt_default_name.3 \
-	krb5_keytab.3 krb5_kt_destroy.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_full_name.3 \
-	krb5_keytab.3 krb5_kt_get_name.3 \
-	krb5_keytab.3 krb5_kt_get_type.3 \
-	krb5_keytab.3 krb5_kt_have_content.3 \
-	krb5_keytab.3 krb5_kt_next_entry.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_init_context.3 krb5_get_default_config_files.3 \
+	krb5_init_context.3 krb5_get_dns_canonize_hostname.3 \
+	krb5_init_context.3 krb5_get_extra_addresses.3 \
+	krb5_init_context.3 krb5_get_fcache_version.3 \
+	krb5_init_context.3 krb5_get_ignore_addresses.3 \
+	krb5_init_context.3 krb5_get_kdc_sec_offset.3 \
+	krb5_init_context.3 krb5_get_max_time_skew.3 \
+	krb5_init_context.3 krb5_get_use_admin_kdc.3 \
+	krb5_init_context.3 krb5_init_ets.3 \
+	krb5_init_context.3 krb5_prepend_config_files.3 \
+	krb5_init_context.3 krb5_prepend_config_files_default.3 \
+	krb5_init_context.3 krb5_set_config_files.3 \
+	krb5_init_context.3 krb5_set_dns_canonize_hostname.3 \
+	krb5_init_context.3 krb5_set_extra_addresses.3 \
+	krb5_init_context.3 krb5_set_fcache_version.3 \
+	krb5_init_context.3 krb5_set_ignore_addresses.3 \
+	krb5_init_context.3 krb5_set_max_time_skew.3 \
+	krb5_init_context.3 krb5_set_use_admin_kdc.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_init_flags.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_mk_safe.3 krb5_mk_priv.3 \
+	krb5_mk_req.3 krb5_build_ap_req.3 \
+	krb5_mk_req.3 krb5_mk_rep.3 \
+	krb5_mk_req.3 krb5_mk_rep_exact.3 \
+	krb5_mk_req.3 krb5_mk_rep_extended.3 \
+	krb5_mk_req.3 krb5_mk_req_exact.3 \
+	krb5_mk_req.3 krb5_mk_req_extended.3 \
+	krb5_mk_req.3 krb5_rd_rep.3 \
+	krb5_mk_req.3 krb5_rd_req.3 \
+	krb5_mk_req.3 krb5_rd_req_with_keyblock.3 \
+	krb5_mk_req.3 krb5_verify_ap_req.3 \
 	krb5_openlog.3 krb5_addlog_dest.3 \
 	krb5_openlog.3 krb5_addlog_func.3 \
 	krb5_openlog.3 krb5_closelog.3 \
@@ -370,8 +286,6 @@ MLINKS=	krb5.3 krb5_add_et_list.3 \
 	krb5_openlog.3 krb5_log_msg.3 \
 	krb5_openlog.3 krb5_vlog.3 \
 	krb5_openlog.3 krb5_vlog_msg.3 \
-	krb5_pac.3 krb5_pac_get_buffer.3 \
-	krb5_pac.3 krb5_pac_verify.3 \
 	krb5_principal.3 krb5_build_principal.3 \
 	krb5_principal.3 krb5_build_principal_ext.3 \
 	krb5_principal.3 krb5_build_principal_va.3 \
@@ -380,17 +294,17 @@ MLINKS=	krb5.3 krb5_add_et_list.3 \
 	krb5_principal.3 krb5_free_principal.3 \
 	krb5_principal.3 krb5_get_default_principal.3 \
 	krb5_principal.3 krb5_make_principal.3 \
+	krb5_principal.3 krb5_parse.3 \
 	krb5_principal.3 krb5_parse_name_flags.3 \
 	krb5_principal.3 krb5_parse_nametype.3 \
+	krb5_principal.3 krb5_princ_realm.3 \
+	krb5_principal.3 krb5_princ_set_realm.3 \
 	krb5_principal.3 krb5_principal_compare.3 \
 	krb5_principal.3 krb5_principal_compare_any_realm.3 \
 	krb5_principal.3 krb5_principal_get_comp_string.3 \
-	krb5_principal.3 krb5_principal_get_num_comp.3 \
 	krb5_principal.3 krb5_principal_get_realm.3 \
 	krb5_principal.3 krb5_principal_get_type.3 \
-	krb5_principal.3 krb5_principal_is_krbtgt.3 \
 	krb5_principal.3 krb5_principal_match.3 \
-	krb5_principal.3 krb5_principal_set_realm.3 \
 	krb5_principal.3 krb5_principal_set_type.3 \
 	krb5_principal.3 krb5_realm_compare.3 \
 	krb5_principal.3 krb5_sname_to_principal.3 \
@@ -401,91 +315,51 @@ MLINKS=	krb5.3 krb5_add_et_list.3 \
 	krb5_principal.3 krb5_unparse_name_fixed_short.3 \
 	krb5_principal.3 krb5_unparse_name_flags.3 \
 	krb5_principal.3 krb5_unparse_name_short.3 \
+	krb5_rcache.3 krb5_get_server_rcache.3 \
+	krb5_rcache.3 krb5_rc_close.3 \
+	krb5_rcache.3 krb5_rc_default.3 \
+	krb5_rcache.3 krb5_rc_default_name.3 \
+	krb5_rcache.3 krb5_rc_default_type.3 \
+	krb5_rcache.3 krb5_rc_destroy.3 \
+	krb5_rcache.3 krb5_rc_expunge.3 \
+	krb5_rcache.3 krb5_rc_get_lifespan.3 \
+	krb5_rcache.3 krb5_rc_get_name.3 \
+	krb5_rcache.3 krb5_rc_get_type.3 \
+	krb5_rcache.3 krb5_rc_initialize.3 \
+	krb5_rcache.3 krb5_rc_recover.3 \
+	krb5_rcache.3 krb5_rc_resolve.3 \
+	krb5_rcache.3 krb5_rc_resolve_full.3 \
+	krb5_rcache.3 krb5_rc_resolve_type.3 \
+	krb5_rcache.3 krb5_rc_store.3 \
+	krb5_rd_error.3 krb5_error_from_rd_error.3 \
+	krb5_rd_error.3 krb5_free_error.3 \
+	krb5_rd_error.3 krb5_free_error_contents.3 \
+	krb5_rd_safe.3 krb5_rd_priv.3 \
+	krb5_set_default_realm.3 krb5_copy_host_realm.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_storage.3 krb5_ret_address.3 \
-	krb5_storage.3 krb5_ret_addrs.3 \
-	krb5_storage.3 krb5_ret_authdata.3 \
-	krb5_storage.3 krb5_ret_creds.3 \
-	krb5_storage.3 krb5_ret_creds_tag.3 \
-	krb5_storage.3 krb5_ret_data.3 \
-	krb5_storage.3 krb5_ret_int16.3 \
-	krb5_storage.3 krb5_ret_int32.3 \
-	krb5_storage.3 krb5_ret_int8.3 \
-	krb5_storage.3 krb5_ret_keyblock.3 \
-	krb5_storage.3 krb5_ret_principal.3 \
-	krb5_storage.3 krb5_ret_string.3 \
-	krb5_storage.3 krb5_ret_stringz.3 \
-	krb5_storage.3 krb5_ret_times.3 \
-	krb5_storage.3 krb5_ret_uint16.3 \
-	krb5_storage.3 krb5_ret_uint32.3 \
-	krb5_storage.3 krb5_ret_uint8.3 \
-	krb5_storage.3 krb5_storage_clear_flags.3 \
-	krb5_storage.3 krb5_storage_emem.3 \
-	krb5_storage.3 krb5_storage_free.3 \
-	krb5_storage.3 krb5_storage_from_data.3 \
-	krb5_storage.3 krb5_storage_from_fd.3 \
-	krb5_storage.3 krb5_storage_from_mem.3 \
-	krb5_storage.3 krb5_storage_from_readonly_mem.3 \
-	krb5_storage.3 krb5_storage_get_byteorder.3 \
-	krb5_storage.3 krb5_storage_get_eof_code.3 \
-	krb5_storage.3 krb5_storage_is_flags.3 \
-	krb5_storage.3 krb5_storage_read.3 \
-	krb5_storage.3 krb5_storage_seek.3 \
-	krb5_storage.3 krb5_storage_set_byteorder.3 \
-	krb5_storage.3 krb5_storage_set_eof_code.3 \
-	krb5_storage.3 krb5_storage_set_flags.3 \
-	krb5_storage.3 krb5_storage_set_max_alloc.3 \
-	krb5_storage.3 krb5_storage_to_data.3 \
-	krb5_storage.3 krb5_storage_truncate.3 \
-	krb5_storage.3 krb5_storage_write.3 \
-	krb5_storage.3 krb5_store_address.3 \
-	krb5_storage.3 krb5_store_addrs.3 \
-	krb5_storage.3 krb5_store_authdata.3 \
-	krb5_storage.3 krb5_store_creds.3 \
-	krb5_storage.3 krb5_store_creds_tag.3 \
-	krb5_storage.3 krb5_store_data.3 \
-	krb5_storage.3 krb5_store_int16.3 \
-	krb5_storage.3 krb5_store_int32.3 \
-	krb5_storage.3 krb5_store_int8.3 \
-	krb5_storage.3 krb5_store_keyblock.3 \
-	krb5_storage.3 krb5_store_principal.3 \
-	krb5_storage.3 krb5_store_string.3 \
-	krb5_storage.3 krb5_store_stringz.3 \
-	krb5_storage.3 krb5_store_times.3 \
-	krb5_storage.3 krb5_store_uint16.3 \
-	krb5_storage.3 krb5_store_uint32.3 \
-	krb5_storage.3 krb5_store_uint8.3 \
-	krb5_support.3 krb5_acl_match_string.3 \
-	krb5_support.3 krb5_config_file_free.3 \
-	krb5_support.3 krb5_config_free_strings.3 \
-	krb5_support.3 krb5_config_get_bool.3 \
-	krb5_support.3 krb5_config_get_bool_default.3 \
-	krb5_support.3 krb5_config_get_list.3 \
-	krb5_support.3 krb5_config_get_string.3 \
-	krb5_support.3 krb5_config_get_string_default.3 \
-	krb5_support.3 krb5_config_get_strings.3 \
-	krb5_support.3 krb5_config_get_time.3 \
-	krb5_support.3 krb5_config_get_time_default.3 \
-	krb5_support.3 krb5_config_parse_file_multi.3 \
-	krb5_support.3 krb5_config_vget_bool.3 \
-	krb5_support.3 krb5_config_vget_bool_default.3 \
-	krb5_support.3 krb5_config_vget_list.3 \
-	krb5_support.3 krb5_config_vget_string.3 \
-	krb5_support.3 krb5_config_vget_string_default.3 \
-	krb5_support.3 krb5_config_vget_strings.3 \
-	krb5_support.3 krb5_config_vget_time.3 \
-	krb5_support.3 krb5_config_vget_time_default.3 \
-	krb5_support.3 krb5_expand_hostname.3 \
-	krb5_support.3 krb5_expand_hostname_realms.3 \
-	krb5_support.3 krb5_kuserok.3 \
-	krb5_support.3 krb5_plugin_register.3 \
-	krb5_ticket.3 krb5_ticket_get_flags.3 \
+	krb5_set_password.3 krb5_change_password.3 \
+	krb5_set_password.3 krb5_passwd_result_to_string.3 \
+	krb5_set_password.3 krb5_set_password_using_ccache.3 \
+	krb5_string_to_key.3 krb5_free_salt.3 \
+	krb5_string_to_key.3 krb5_get_pw_salt.3 \
+	krb5_string_to_key.3 krb5_string_to_key_data.3 \
+	krb5_string_to_key.3 krb5_string_to_key_data_salt.3 \
+	krb5_string_to_key.3 krb5_string_to_key_data_salt_opaque.3 \
+	krb5_string_to_key.3 krb5_string_to_key_salt.3 \
+	krb5_string_to_key.3 krb5_string_to_key_salt_opaque.3 \
+	krb5_timeofday.3 krb5_format_time.3 \
+	krb5_timeofday.3 krb5_set_real_time.3 \
+	krb5_timeofday.3 krb5_string_to_deltat.3 \
 	krb5_timeofday.3 krb5_us_timeofday.3 \
-	krb5_v4compat.3 krb524_convert_creds_kdc_ccache.3 \
+	krb5_verify_init_creds.3 krb5_verify_init_creds_opt_init.3 \
+	krb5_verify_init_creds.3 krb5_verify_init_creds_opt_set_ap_req_nofail.3 \
+	krb5_verify_user.3 krb5_verify_opt_alloc.3 \
+	krb5_verify_user.3 krb5_verify_opt_free.3 \
 	krb5_verify_user.3 krb5_verify_opt_init.3 \
+	krb5_verify_user.3 krb5_verify_opt_set_ccache.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 \
diff --git a/kerberosV/lib/libroken/Makefile b/kerberosV/lib/libroken/Makefile
index 612a9300335..3ef94de62fe 100644
--- a/kerberosV/lib/libroken/Makefile
+++ b/kerberosV/lib/libroken/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2013/07/22 12:55:29 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2013/11/03 11:56:40 ajacoutot Exp $
 
 LIB=	roken
 INCS=	roken.h \
@@ -73,6 +73,9 @@ SRCS=	base64.c \
 	write_pid.c \
 	xfree.c
 
+MPAGES=		getarg.3 parse_time.3 rtbl.3 ecalloc.3
+MSRC=		${KRB5DIR}/lib/roken
+
 CPPFLAGS=	-I${KRB5DIR}/lib/roken -I.
 CPPFLAGS+=	-DBUILD_ROKEN_LIB
 
diff --git a/kerberosV/libexec/ipropd-master/Makefile b/kerberosV/libexec/ipropd-master/Makefile
index 975606a22c4..4b03ad5deed 100644
--- a/kerberosV/libexec/ipropd-master/Makefile
+++ b/kerberosV/libexec/ipropd-master/Makefile
@@ -1,7 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2013/07/10 11:14:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.16 2013/11/03 11:56:40 ajacoutot Exp $
 
 PROG=	ipropd-master
 MPAGES=	iprop.8
+MLINKS= iprop.8	ipropd-master.8 \
+	iprop.8	ipropd-master.8
 MSRC=	${KRB5DIR}/lib/kadm5
 SRCS=	ipropd_common.c ipropd_master.c kadm5_err.h
 CPPFLAGS=	-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
diff --git a/kerberosV/usr.bin/kcc/Makefile b/kerberosV/usr.bin/kcc/Makefile
index 06f0d236ae8..8a4a4481f28 100644
--- a/kerberosV/usr.bin/kcc/Makefile
+++ b/kerberosV/usr.bin/kcc/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.10 2013/08/10 14:54:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.11 2013/11/03 11:56:40 ajacoutot Exp $
 
 PROG=	kcc
-MPAGES=	klist.1
+MPAGES=	klist.1 kswitch.1
 MSRC=	${KRB5DIR}/kuser
 LINKS=	${BINDIR}/kcc ${BINDIR}/klist
 CPPFLAGS=	-I${KRB5DIR}/lib/asn1 \
diff --git a/kerberosV/usr.bin/kgetcred/Makefile b/kerberosV/usr.bin/kgetcred/Makefile
index e0e2a344e99..088adcaae41 100644
--- a/kerberosV/usr.bin/kgetcred/Makefile
+++ b/kerberosV/usr.bin/kgetcred/Makefile
@@ -1,6 +1,8 @@
-# $OpenBSD: Makefile,v 1.4 2013/07/10 10:43:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.5 2013/11/03 11:56:40 ajacoutot Exp $
 
 PROG=	kgetcred
+MPAGES=	kgetcred.1
+MSRC=	${KRB5DIR}/kuser
 CPPFLAGS=	-I${KRB5DIR}/lib/asn1 \
 		-I${KRB5DIR}/lib/roken
 DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBASN1} ${LIBCRYPTO} ${LIBVERS}
diff --git a/kerberosV/usr.bin/kinit/Makefile b/kerberosV/usr.bin/kinit/Makefile
index 1727e5f4d07..e6ee8d5685e 100644
--- a/kerberosV/usr.bin/kinit/Makefile
+++ b/kerberosV/usr.bin/kinit/Makefile
@@ -1,6 +1,8 @@
-# $OpenBSD: Makefile,v 1.16 2013/08/10 14:54:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.17 2013/11/03 11:56:40 ajacoutot Exp $
 
 PROG=	kinit
+MPAGES=	kinit.1
+MSRC=	${KRB5DIR}/kuser
 CPPFLAGS=	-I${KRB5DIR}/lib/roken
 DPADD=	${LIBKAFS} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO}