From ad7b0104a39a799896d08b0958bb94ce96ae6fd9 Mon Sep 17 00:00:00 2001 From: ru Date: Thu, 5 Feb 2004 18:51:52 +0000 Subject: [PATCH] style.Makefile(5). OK'ed by: nectar --- kerberos5/Makefile.inc | 7 +- kerberos5/lib/libasn1/Makefile | 129 ++-- kerberos5/lib/libgssapi/Makefile | 183 +++--- kerberos5/lib/libhdb/Makefile | 56 +- kerberos5/lib/libkadm5clnt/Makefile | 56 +- kerberos5/lib/libkadm5srv/Makefile | 64 +- kerberos5/lib/libkafs5/Makefile | 39 +- kerberos5/lib/libkrb5/Makefile | 614 ++++++++++---------- kerberos5/lib/libroken/Makefile | 108 ++-- kerberos5/lib/libsl/Makefile | 7 +- kerberos5/lib/libvers/Makefile | 13 +- kerberos5/libexec/Makefile.inc | 2 +- kerberos5/libexec/hprop/Makefile | 23 +- kerberos5/libexec/hpropd/Makefile | 23 +- kerberos5/libexec/ipropd-master/Makefile | 25 +- kerberos5/libexec/ipropd-slave/Makefile | 25 +- kerberos5/libexec/kadmind/Makefile | 22 +- kerberos5/libexec/kdc/Makefile | 31 +- kerberos5/libexec/kpasswdd/Makefile | 16 +- kerberos5/tools/asn1_compile/Makefile | 9 +- kerberos5/usr.bin/kadmin/Makefile | 60 +- kerberos5/usr.bin/kdestroy/Makefile | 9 +- kerberos5/usr.bin/kinit/Makefile | 9 +- kerberos5/usr.bin/klist/Makefile | 9 +- kerberos5/usr.bin/kpasswd/Makefile | 9 +- kerberos5/usr.bin/krb5-config/Makefile | 29 +- kerberos5/usr.bin/ksu/Makefile | 22 +- kerberos5/usr.bin/verify_krb5_conf/Makefile | 16 +- kerberos5/usr.sbin/kstash/Makefile | 17 +- kerberos5/usr.sbin/ktutil/Makefile | 47 +- 30 files changed, 759 insertions(+), 920 deletions(-) diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc index 4320bbe7675..04e4eb50c27 100644 --- a/kerberos5/Makefile.inc +++ b/kerberos5/Makefile.inc @@ -1,13 +1,12 @@ # $FreeBSD$ DISTRIBUTION?= crypto -NOLINT= true +NOLINT= KRB5DIR= ${.CURDIR}/../../../crypto/heimdal -CFLAGS+= -I${.CURDIR}/../../include -DHAVE_CONFIG_H - -CFLAGS+=-DINET6 +CFLAGS+= -DHAVE_CONFIG_H -I${.CURDIR}/../../include +CFLAGS+= -DINET6 .if defined(WITH_OPENLDAP) OPENLDAPBASE?= /usr/local diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile index 662ccce25bb..e36df2c39d7 100644 --- a/kerberos5/lib/libasn1/Makefile +++ b/kerberos5/lib/libasn1/Makefile @@ -1,78 +1,73 @@ # $FreeBSD$ LIB= asn1 +INCS= asn1_err.h krb5_asn1.h -SRCS= \ - der_get.c \ - der_put.c \ - der_free.c \ - der_length.c \ - der_copy.c \ - timegm.c \ - asn1_err.c \ - asn1_err.h \ - krb5_asn1.h \ +SRCS= asn1_err.c \ + asn1_err.h \ + der_copy.c \ + der_free.c \ + der_get.c \ + der_length.c \ + der_put.c \ + krb5_asn1.h \ + timegm.c \ ${GEN:S/.x$/.c/} -CFLAGS+=-I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken \ - -I. +CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I. -GEN= \ - asn1_APOptions.x \ - asn1_AP_REP.x \ - asn1_AP_REQ.x \ - asn1_AS_REP.x \ - asn1_AS_REQ.x \ - asn1_Authenticator.x \ - asn1_AuthorizationData.x \ - asn1_CKSUMTYPE.x \ - asn1_Checksum.x \ - asn1_ENCTYPE.x \ - asn1_ETYPE_INFO.x \ - asn1_ETYPE_INFO_ENTRY.x \ - asn1_EncAPRepPart.x \ - asn1_EncASRepPart.x \ - asn1_EncKDCRepPart.x \ - asn1_EncKrbCredPart.x \ - asn1_EncKrbPrivPart.x \ - asn1_EncTGSRepPart.x \ - asn1_EncTicketPart.x \ - asn1_EncryptedData.x \ - asn1_EncryptionKey.x \ - asn1_HostAddress.x \ - asn1_HostAddresses.x \ - asn1_KDCOptions.x \ - asn1_KDC_REP.x \ - asn1_KDC_REQ.x \ - asn1_KDC_REQ_BODY.x \ - asn1_KRB_CRED.x \ - asn1_KRB_ERROR.x \ - asn1_KRB_PRIV.x \ - asn1_KRB_SAFE.x \ - asn1_KRB_SAFE_BODY.x \ - asn1_KerberosTime.x \ - asn1_KrbCredInfo.x \ - asn1_LastReq.x \ - asn1_LR_TYPE.x \ - asn1_MESSAGE_TYPE.x \ - asn1_METHOD_DATA.x \ - asn1_NAME_TYPE.x \ - asn1_PADATA_TYPE.x \ - asn1_PA_DATA.x \ - asn1_PA_ENC_TS_ENC.x \ - asn1_Principal.x \ - asn1_PrincipalName.x \ - asn1_Realm.x \ - asn1_TGS_REP.x \ - asn1_TGS_REQ.x \ - asn1_Ticket.x \ - asn1_TicketFlags.x \ - asn1_TransitedEncoding.x \ +GEN= asn1_APOptions.x \ + asn1_AP_REP.x \ + asn1_AP_REQ.x \ + asn1_AS_REP.x \ + asn1_AS_REQ.x \ + asn1_Authenticator.x \ + asn1_AuthorizationData.x \ + asn1_CKSUMTYPE.x \ + asn1_Checksum.x \ + asn1_ENCTYPE.x \ + asn1_ETYPE_INFO.x \ + asn1_ETYPE_INFO_ENTRY.x \ + asn1_EncAPRepPart.x \ + asn1_EncASRepPart.x \ + asn1_EncKDCRepPart.x \ + asn1_EncKrbCredPart.x \ + asn1_EncKrbPrivPart.x \ + asn1_EncTGSRepPart.x \ + asn1_EncTicketPart.x \ + asn1_EncryptedData.x \ + asn1_EncryptionKey.x \ + asn1_HostAddress.x \ + asn1_HostAddresses.x \ + asn1_KDCOptions.x \ + asn1_KDC_REP.x \ + asn1_KDC_REQ.x \ + asn1_KDC_REQ_BODY.x \ + asn1_KRB_CRED.x \ + asn1_KRB_ERROR.x \ + asn1_KRB_PRIV.x \ + asn1_KRB_SAFE.x \ + asn1_KRB_SAFE_BODY.x \ + asn1_KerberosTime.x \ + asn1_KrbCredInfo.x \ + asn1_LR_TYPE.x \ + asn1_LastReq.x \ + asn1_MESSAGE_TYPE.x \ + asn1_METHOD_DATA.x \ + asn1_NAME_TYPE.x \ + asn1_PADATA_TYPE.x \ + asn1_PA_DATA.x \ + asn1_PA_ENC_TS_ENC.x \ + asn1_Principal.x \ + asn1_PrincipalName.x \ + asn1_Realm.x \ + asn1_TGS_REP.x \ + asn1_TGS_REQ.x \ + asn1_Ticket.x \ + asn1_TicketFlags.x \ + asn1_TransitedEncoding.x \ asn1_UNSIGNED.x -INCS= krb5_asn1.h asn1_err.h - CLEANFILES= ${GEN} ${GEN:S/.x$/.c/} krb5_asn1.h asn1_files .ORDER: ${GEN} krb5_asn1.h @@ -89,4 +84,4 @@ ${I:R}.c: ${I} .include -.PATH: ${KRB5DIR}/lib/asn1 +.PATH: ${KRB5DIR}/lib/asn1 diff --git a/kerberos5/lib/libgssapi/Makefile b/kerberos5/lib/libgssapi/Makefile index 91afe3b0d1b..76746836b18 100644 --- a/kerberos5/lib/libgssapi/Makefile +++ b/kerberos5/lib/libgssapi/Makefile @@ -1,105 +1,96 @@ # $FreeBSD$ LIB= gssapi - -SRCS= \ - 8003.c \ - accept_sec_context.c \ - acquire_cred.c \ - add_cred.c \ - add_oid_set_member.c \ - canonicalize_name.c \ - compare_name.c \ - compat.c \ - context_time.c \ - copy_ccache.c \ - create_emtpy_oid_set.c \ - decapsulate.c \ - delete_sec_context.c \ - display_name.c \ - display_status.c \ - duplicate_name.c \ - encapsulate.c \ - export_name.c \ - export_sec_context.c \ - external.c \ - get_mic.c \ - gssapi.h \ - import_name.c \ - import_sec_context.c \ - indicate_mechs.c \ - init.c \ - init_sec_context.c \ - inquire_context.c \ - inquire_cred.c \ - inquire_cred_by_mech.c \ - inquire_mechs_for_name.c \ - inquire_names_for_mech.c \ - process_context_token.c \ - release_buffer.c \ - release_cred.c \ - release_name.c \ - release_oid_set.c \ - test_oid_set_member.c \ - unwrap.c \ - v1.c \ - verify_mic.c \ - wrap.c \ - address_to_krb5addr.c - -CFLAGS+=-I${KRB5DIR}/lib/gssapi \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken \ - -I. - INCS= gssapi.h +MAN= gss_acquire_cred.3 gssapi.3 -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 \ +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 +SRCS= 8003.c \ + accept_sec_context.c \ + acquire_cred.c \ + add_cred.c \ + add_oid_set_member.c \ + address_to_krb5addr.c \ + canonicalize_name.c \ + compare_name.c \ + compat.c \ + context_time.c \ + copy_ccache.c \ + create_emtpy_oid_set.c \ + decapsulate.c \ + delete_sec_context.c \ + display_name.c \ + display_status.c \ + duplicate_name.c \ + encapsulate.c \ + export_name.c \ + export_sec_context.c \ + external.c \ + get_mic.c \ + gssapi.h \ + import_name.c \ + import_sec_context.c \ + indicate_mechs.c \ + init.c \ + init_sec_context.c \ + inquire_context.c \ + inquire_cred.c \ + inquire_cred_by_mech.c \ + inquire_mechs_for_name.c \ + inquire_names_for_mech.c \ + process_context_token.c \ + release_buffer.c \ + release_cred.c \ + release_name.c \ + release_oid_set.c \ + test_oid_set_member.c \ + unwrap.c \ + v1.c \ + verify_mic.c \ + wrap.c + +CFLAGS+=-I${KRB5DIR}/lib/gssapi -I${KRB5DIR}/lib/krb5 \ + -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I. + .include -.PATH: ${KRB5DIR}/lib/gssapi +.PATH: ${KRB5DIR}/lib/gssapi diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile index a837dab4270..eef619f4a9e 100644 --- a/kerberos5/lib/libhdb/Makefile +++ b/kerberos5/lib/libhdb/Makefile @@ -2,41 +2,35 @@ LIB= hdb -INCS= \ - hdb-private.h \ - hdb-protos.h \ - hdb.h \ - hdb_asn1.h \ +INCS= hdb-private.h \ + hdb-protos.h \ + hdb.h \ + hdb_asn1.h \ hdb_err.h -SRCS= \ - common.c \ - db.c \ - db3.c \ - hdb-ldap.c \ - hdb.c \ - keytab.c \ - mkey.c \ - ndbm.c \ - print.c \ - hdb_err.c \ - hdb_err.h \ - hdb_asn1.h \ +SRCS= common.c \ + db.c \ + db3.c \ + hdb-ldap.c \ + hdb.c \ + hdb_asn1.h \ + hdb_err.c \ + hdb_err.h \ + keytab.c \ + mkey.c \ + ndbm.c \ + print.c \ ${GEN:S/.x$/.c/} -CFLAGS+=-I${KRB5DIR}/lib/hdb \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken \ - -I. \ - ${LDAPCFLAGS} +CFLAGS+=-I${KRB5DIR}/lib/hdb -I${KRB5DIR}/lib/asn1 \ + -I${KRB5DIR}/lib/roken -I. ${LDAPCFLAGS} -GEN= \ - asn1_Key.x \ - asn1_GENERATION.x \ - asn1_Event.x \ - asn1_HDBFlags.x \ - asn1_hdb_entry.x \ - asn1_Salt.x +GEN= asn1_Event.x \ + asn1_GENERATION.x \ + asn1_HDBFlags.x \ + asn1_Key.x \ + asn1_Salt.x \ + asn1_hdb_entry.x CLEANFILES= ${GEN} ${GEN:S/.x$/.c/} hdb_asn1.h asn1_files @@ -54,4 +48,4 @@ ${I:R}.c: ${I} .include -.PATH: ${KRB5DIR}/lib/hdb +.PATH: ${KRB5DIR}/lib/hdb diff --git a/kerberos5/lib/libkadm5clnt/Makefile b/kerberos5/lib/libkadm5clnt/Makefile index ea87af36322..32cc80b3b00 100644 --- a/kerberos5/lib/libkadm5clnt/Makefile +++ b/kerberos5/lib/libkadm5clnt/Makefile @@ -2,40 +2,36 @@ LIB= kadm5clnt -INCS= \ - admin.h \ - kadm5-private.h \ - kadm5-protos.h \ - kadm5_err.h \ +INCS= admin.h \ + kadm5-private.h \ + kadm5-protos.h \ + kadm5_err.h \ private.h + INCSDIR=${INCLUDEDIR}/kadm5 -SRCS= \ - chpass_c.c \ - common_glue.c \ - create_c.c \ - delete_c.c \ - destroy_c.c \ - flush_c.c \ - free.c \ - get_c.c \ - get_princs_c.c \ - init_c.c \ - kadm5_err.c \ - marshall.c \ - modify_c.c \ - privs_c.c \ - randkey_c.c \ - rename_c.c \ - send_recv.c \ - client_glue.c \ - kadm5_err.h +SRCS= chpass_c.c \ + client_glue.c \ + common_glue.c \ + create_c.c \ + delete_c.c \ + destroy_c.c \ + flush_c.c \ + free.c \ + get_c.c \ + get_princs_c.c \ + init_c.c \ + kadm5_err.c \ + kadm5_err.h \ + marshall.c \ + modify_c.c \ + privs_c.c \ + randkey_c.c \ + rename_c.c \ + send_recv.c -CFLAGS+=-I${KRB5DIR}/lib/kadm5 \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken \ - -I. +CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I. .include -.PATH: ${KRB5DIR}/lib/kadm5 +.PATH: ${KRB5DIR}/lib/kadm5 diff --git a/kerberos5/lib/libkadm5srv/Makefile b/kerberos5/lib/libkadm5srv/Makefile index 8a2a54bf2e2..086cb8f6317 100644 --- a/kerberos5/lib/libkadm5srv/Makefile +++ b/kerberos5/lib/libkadm5srv/Makefile @@ -2,41 +2,37 @@ LIB= kadm5srv -SRCS= \ - acl.c \ - bump_pw_expire.c \ - chpass_s.c \ - common_glue.c \ - context_s.c \ - create_s.c \ - delete_s.c \ - destroy_s.c \ - ent_setup.c \ - error.c \ - flush_s.c \ - free.c \ - get_princs_s.c \ - get_s.c \ - init_s.c \ - kadm5_err.c \ - kadm5_err.h \ - keys.c \ - log.c \ - marshall.c \ - modify_s.c \ - privs_s.c \ - randkey_s.c \ - rename_s.c \ - set_keys.c \ - set_modifier.c \ - password_quality.c \ - server_glue.c +SRCS= acl.c \ + bump_pw_expire.c \ + chpass_s.c \ + common_glue.c \ + context_s.c \ + create_s.c \ + delete_s.c \ + destroy_s.c \ + ent_setup.c \ + error.c \ + flush_s.c \ + free.c \ + get_princs_s.c \ + get_s.c \ + init_s.c \ + kadm5_err.c \ + kadm5_err.h \ + keys.c \ + log.c \ + marshall.c \ + modify_s.c \ + password_quality.c \ + privs_s.c \ + randkey_s.c \ + rename_s.c \ + server_glue.c \ + set_keys.c \ + set_modifier.c -CFLAGS+=-I${KRB5DIR}/lib/kadm5 \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken \ - -I. +CFLAGS+=-I${KRB5DIR}/lib/kadm5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I. .include -.PATH: ${KRB5DIR}/lib/kadm5 +.PATH: ${KRB5DIR}/lib/kadm5 diff --git a/kerberos5/lib/libkafs5/Makefile b/kerberos5/lib/libkafs5/Makefile index 03061031856..337c642be9d 100644 --- a/kerberos5/lib/libkafs5/Makefile +++ b/kerberos5/lib/libkafs5/Makefile @@ -1,35 +1,32 @@ # $FreeBSD$ LIB= kafs5 -CFLAGS+=-I${KRB5DIR}/lib/kafs \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/roken 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 \ +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 +SRCS= afssys.c afskrb5.c common.c +CFLAGS+=-I${KRB5DIR}/lib/kafs -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken + CLEANFILES= kafs5.3 -kafs5.3: kafs.3 +kafs5.3: kafs.3 sed -e 's/libkafs, -lkafs/libkafs5, -lkafs5/g' ${.ALLSRC} >${.TARGET} .include -.PATH: ${KRB5DIR}/lib/kafs +.PATH: ${KRB5DIR}/lib/kafs diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile index 4ece40e168f..40cddc361d7 100644 --- a/kerberos5/lib/libkrb5/Makefile +++ b/kerberos5/lib/libkrb5/Makefile @@ -2,323 +2,315 @@ LIB= krb5 -SRCS= \ - acl.c \ - add_et_list.c \ - addr_families.c \ - aname_to_localname.c \ - appdefault.c \ - asn1_glue.c \ - auth_context.c \ - build_ap_req.c \ - build_auth.c \ - cache.c \ - changepw.c \ - codec.c \ - config_file.c \ - config_file_netinfo.c \ - convert_creds.c \ - constants.c \ - context.c \ - copy_host_realm.c \ - crc.c \ - creds.c \ - crypto.c \ - data.c \ - eai_to_heim_errno.c \ - error_string.c \ - expand_hostname.c \ - fcache.c \ - free.c \ - free_host_realm.c \ - generate_seq_number.c \ - generate_subkey.c \ - get_addrs.c \ - get_cred.c \ - get_default_principal.c \ - get_default_realm.c \ - get_for_creds.c \ - get_host_realm.c \ - get_in_tkt.c \ - get_in_tkt_pw.c \ - get_in_tkt_with_keytab.c \ - get_in_tkt_with_skey.c \ - get_port.c \ - init_creds.c \ - init_creds_pw.c \ - keyblock.c \ - keytab.c \ - keytab_any.c \ - keytab_file.c \ - keytab_memory.c \ - keytab_keyfile.c \ - keytab_krb4.c \ - krbhst.c \ - kuserok.c \ - log.c \ - mcache.c \ - misc.c \ - mk_error.c \ - mk_priv.c \ - mk_rep.c \ - mk_req.c \ - mk_req_ext.c \ - mk_safe.c \ - net_read.c \ - net_write.c \ - n-fold.c \ - padata.c \ - principal.c \ - prog_setup.c \ - prompter_posix.c \ - rd_cred.c \ - rd_error.c \ - rd_priv.c \ - rd_rep.c \ - rd_req.c \ - rd_safe.c \ - read_message.c \ - recvauth.c \ - replay.c \ - send_to_kdc.c \ - sendauth.c \ - set_default_realm.c \ - sock_principal.c \ - store.c \ - store_emem.c \ - store_fd.c \ - store_mem.c \ - ticket.c \ - time.c \ - transited.c \ - verify_init.c \ - verify_user.c \ - version.c \ - warn.c \ - write_message.c \ - krb5_err.c \ - krb5_err.h \ - k524_err.c \ - k524_err.h \ - heim_err.c \ - heim_err.h +INCS= heim_err.h \ + k524_err.h \ + krb5-protos.h \ + krb5-types.h \ + krb5.h \ + krb5_err.h -CFLAGS+=-I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/roken \ - -I. - -INCS= krb5.h \ - krb5-protos.h \ - krb5-types.h \ - heim_err.h \ - krb5_err.h \ - k524_err.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 \ - krb5_get_all_client_addrs.3 \ - krb5_get_krbhst.3 \ - 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 \ +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 \ + krb5_get_all_client_addrs.3 \ + krb5_get_krbhst.3 \ + 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+= kerberos.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 \ +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 +SRCS= acl.c \ + add_et_list.c \ + addr_families.c \ + aname_to_localname.c \ + appdefault.c \ + asn1_glue.c \ + auth_context.c \ + build_ap_req.c \ + build_auth.c \ + cache.c \ + changepw.c \ + codec.c \ + config_file.c \ + config_file_netinfo.c \ + constants.c \ + context.c \ + convert_creds.c \ + copy_host_realm.c \ + crc.c \ + creds.c \ + crypto.c \ + data.c \ + eai_to_heim_errno.c \ + error_string.c \ + expand_hostname.c \ + fcache.c \ + free.c \ + free_host_realm.c \ + generate_seq_number.c \ + generate_subkey.c \ + get_addrs.c \ + get_cred.c \ + get_default_principal.c \ + get_default_realm.c \ + get_for_creds.c \ + get_host_realm.c \ + get_in_tkt.c \ + get_in_tkt_pw.c \ + get_in_tkt_with_keytab.c \ + get_in_tkt_with_skey.c \ + get_port.c \ + heim_err.c \ + heim_err.h \ + init_creds.c \ + init_creds_pw.c \ + k524_err.c \ + k524_err.h \ + keyblock.c \ + keytab.c \ + keytab_any.c \ + keytab_file.c \ + keytab_keyfile.c \ + keytab_krb4.c \ + keytab_memory.c \ + krb5_err.c \ + krb5_err.h \ + krbhst.c \ + kuserok.c \ + log.c \ + mcache.c \ + misc.c \ + mk_error.c \ + mk_priv.c \ + mk_rep.c \ + mk_req.c \ + mk_req_ext.c \ + mk_safe.c \ + n-fold.c \ + net_read.c \ + net_write.c \ + padata.c \ + principal.c \ + prog_setup.c \ + prompter_posix.c \ + rd_cred.c \ + rd_error.c \ + rd_priv.c \ + rd_rep.c \ + rd_req.c \ + rd_safe.c \ + read_message.c \ + recvauth.c \ + replay.c \ + send_to_kdc.c \ + sendauth.c \ + set_default_realm.c \ + sock_principal.c \ + store.c \ + store_emem.c \ + store_fd.c \ + store_mem.c \ + ticket.c \ + time.c \ + transited.c \ + verify_init.c \ + verify_user.c \ + version.c \ + warn.c \ + write_message.c + +CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken -I. + .include -.PATH: ${KRB5DIR}/lib/krb5 -.PATH: ${.CURDIR}/../../include +.PATH: ${KRB5DIR}/lib/krb5 ${.CURDIR}/../../include diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile index 047bea7d2ec..a0b60f1f63a 100644 --- a/kerberos5/lib/libroken/Makefile +++ b/kerberos5/lib/libroken/Makefile @@ -1,62 +1,60 @@ # $FreeBSD$ LIB= roken +INCS= roken.h roken-common.h -SRCS= \ - base64.c \ - bswap.c \ - concat.c \ - ecalloc.c \ - emalloc.c \ - environment.c \ - eread.c \ - erealloc.c \ - esetenv.c \ - estrdup.c \ - ewrite.c \ - getaddrinfo_hostspec.c \ - get_default_username.c \ - get_window_size.c \ - getarg.c \ - getnameinfo_verified.c \ - hostent_find_fqdn.c \ - issuid.c \ - k_getpwnam.c \ - k_getpwuid.c \ - mini_inetd.c \ - ndbm_wrap.c \ - net_read.c \ - net_write.c \ - parse_bytes.c \ - parse_time.c \ - parse_units.c \ - resolve.c \ - roken_gethostby.c \ - rtbl.c \ - simple_exec.c \ - snprintf.c \ - socket.c \ - strcollect.c \ - timeval.c \ - tm2time.c \ - unvis.c \ - verify.c \ - vis.c \ - warnerr.c \ - write_pid.c \ - copyhostent.c \ - strlwr.c \ - strndup.c \ - strnlen.c \ - strsep_copy.c \ - strupr.c \ - roken.h +SRCS= base64.c \ + bswap.c \ + concat.c \ + copyhostent.c \ + ecalloc.c \ + emalloc.c \ + environment.c \ + eread.c \ + erealloc.c \ + esetenv.c \ + estrdup.c \ + ewrite.c \ + get_default_username.c \ + get_window_size.c \ + getaddrinfo_hostspec.c \ + getarg.c \ + getnameinfo_verified.c \ + hostent_find_fqdn.c \ + issuid.c \ + k_getpwnam.c \ + k_getpwuid.c \ + mini_inetd.c \ + ndbm_wrap.c \ + net_read.c \ + net_write.c \ + parse_bytes.c \ + parse_time.c \ + parse_units.c \ + resolve.c \ + roken.h \ + roken_gethostby.c \ + rtbl.c \ + simple_exec.c \ + snprintf.c \ + socket.c \ + strcollect.c \ + strlwr.c \ + strndup.c \ + strnlen.c \ + strsep_copy.c \ + strupr.c \ + timeval.c \ + tm2time.c \ + unvis.c \ + verify.c \ + vis.c \ + warnerr.c \ + write_pid.c -CFLAGS+=-I${KRB5DIR}/lib/roken \ - -I. +CFLAGS+=-I${KRB5DIR}/lib/roken -I. -INCS= roken.h \ - roken-common.h +CLEANFILES= roken.h roken.h: ../../tools/make-roken/make-roken ../../tools/make-roken/make-roken > ${.TARGET} @@ -64,8 +62,6 @@ roken.h: ../../tools/make-roken/make-roken ../../tools/make-roken/make-roken: cd ${.CURDIR}/../../tools/make-roken && ${MAKE} -CLEANFILES= roken.h - .include -.PATH: ${KRB5DIR}/lib/roken +.PATH: ${KRB5DIR}/lib/roken diff --git a/kerberos5/lib/libsl/Makefile b/kerberos5/lib/libsl/Makefile index e94584df93b..71a38a5729d 100644 --- a/kerberos5/lib/libsl/Makefile +++ b/kerberos5/lib/libsl/Makefile @@ -1,13 +1,10 @@ # $FreeBSD$ LIB= sl - +INTERNALLIB= SRCS= sl.c - CFLAGS+=-I${KRB5DIR}/lib/sl -INTERNALLIB= yes - .include -.PATH: ${KRB5DIR}/lib/sl +.PATH: ${KRB5DIR}/lib/sl diff --git a/kerberos5/lib/libvers/Makefile b/kerberos5/lib/libvers/Makefile index 73c877a9c66..1b91ac172e2 100644 --- a/kerberos5/lib/libvers/Makefile +++ b/kerberos5/lib/libvers/Makefile @@ -1,14 +1,11 @@ # $FreeBSD$ LIB= vers - -SRCS= \ - print_version.c \ - print_version.h - +INTERNALLIB= +SRCS= print_version.c print_version.h CFLAGS+=-I. -INTERNALLIB= YES +CLEANFILES= print_version.h print_version.h: ../../tools/make-print-version/make-print-version ../../tools/make-print-version/make-print-version ${.TARGET} @@ -16,8 +13,6 @@ print_version.h: ../../tools/make-print-version/make-print-version ../../tools/make-print-version/make-print-version: cd ${.CURDIR}/../../tools/make-print-version && ${MAKE} -CLEANFILES= print_version.h - .include -.PATH: ${KRB5DIR}/lib/vers +.PATH: ${KRB5DIR}/lib/vers diff --git a/kerberos5/libexec/Makefile.inc b/kerberos5/libexec/Makefile.inc index 496b56efcc1..535597e7d2a 100644 --- a/kerberos5/libexec/Makefile.inc +++ b/kerberos5/libexec/Makefile.inc @@ -1,4 +1,4 @@ -# $Id$ +# $FreeBSD$ BINDIR= /usr/libexec diff --git a/kerberos5/libexec/hprop/Makefile b/kerberos5/libexec/hprop/Makefile index 74b1c7c4d97..84523cfac15 100644 --- a/kerberos5/libexec/hprop/Makefile +++ b/kerberos5/libexec/hprop/Makefile @@ -1,26 +1,15 @@ # $FreeBSD$ PROG= hprop - -SRCS= \ - hprop.c \ - mit_dump.c \ - v4_dump.c - -CFLAGS+=-I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/asn1 - -LDADD= -lhdb -lkrb5 -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} - +MAN= hprop.8 +SRCS= hprop.c mit_dump.c v4_dump.c +CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD} - +LDADD= -lhdb -lkrb5 -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} LDFLAGS=${LDAPLDFLAGS} -MAN= hprop.8 - .include -.PATH: ${KRB5DIR}/kdc +.PATH: ${KRB5DIR}/kdc diff --git a/kerberos5/libexec/hpropd/Makefile b/kerberos5/libexec/hpropd/Makefile index 54a6038e196..4db38fb4bb1 100644 --- a/kerberos5/libexec/hpropd/Makefile +++ b/kerberos5/libexec/hpropd/Makefile @@ -1,22 +1,15 @@ # $FreeBSD$ PROG= hpropd - -CFLAGS+=-I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/asn1 \ +MAN= hpropd.8 +CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 \ ${LDAPCFLAGS} - -LDADD= -lhdb -lkrb5 -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} - -DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD} - -LDFLAGS= ${LDAPLDFLAGS} - -MAN= hpropd.8 +DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD} +LDADD= -lhdb -lkrb5 -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +LDFLAGS=${LDAPLDFLAGS} .include -.PATH: ${KRB5DIR}/kdc +.PATH: ${KRB5DIR}/kdc diff --git a/kerberos5/libexec/ipropd-master/Makefile b/kerberos5/libexec/ipropd-master/Makefile index 5cdd575159c..73fcb8bd20b 100644 --- a/kerberos5/libexec/ipropd-master/Makefile +++ b/kerberos5/libexec/ipropd-master/Makefile @@ -1,27 +1,16 @@ # $FreeBSD$ PROG= ipropd-master - -SRCS= \ - ipropd_master.c \ - kadm5_err.h - -CFLAGS+=-I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/asn1 \ - -I. \ - ${LDAPCFLAGS} - +NOMAN= +SRCS= ipropd_master.c kadm5_err.h +CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ + -I. ${LDAPCFLAGS} +DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD} LDADD= -lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \ -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} - LDFLAGS=${LDAPLDFLAGS} -DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD} - -NOMAN= yes - .include -.PATH: ${KRB5DIR}/lib/kadm5 +.PATH: ${KRB5DIR}/lib/kadm5 diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile index 6a1dbefc304..e2dd6866520 100644 --- a/kerberos5/libexec/ipropd-slave/Makefile +++ b/kerberos5/libexec/ipropd-slave/Makefile @@ -1,27 +1,16 @@ # $FreeBSD$ PROG= ipropd-slave - -SRCS= \ - ipropd_slave.c \ - kadm5_err.h - -CFLAGS+=-I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/asn1 \ - -I. \ - ${LDAPCFLAGS} - +NOMAN= +SRCS= ipropd_slave.c kadm5_err.h +CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ + -I. ${LDAPCFLAGS} +DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD} LDADD= -lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \ -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} - LDFLAGS=${LDAPLDFLAGS} -DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD} - -NOMAN= yes - .include -.PATH: ${KRB5DIR}/lib/kadm5 +.PATH: ${KRB5DIR}/lib/kadm5 diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile index 9eb06246fe4..d0514a01342 100644 --- a/kerberos5/libexec/kadmind/Makefile +++ b/kerberos5/libexec/kadmind/Makefile @@ -1,26 +1,16 @@ # $FreeBSD$ PROG= kadmind - -SRCS= kadmind.c \ - server.c \ - kadm_conn.c - -CFLAGS+=-I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/asn1 \ +MAN= kadmind.8 +SRCS= kadm_conn.c kadmind.c server.c +CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ ${LDAPCFLAGS} - +DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD} LDADD= -lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \ -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} - LDFLAGS=${LDAPLDFLAGS} -DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD} - -MAN= kadmind.8 - .include -.PATH: ${KRB5DIR}/kadmin +.PATH: ${KRB5DIR}/kadmin diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile index 683274299e2..73a1efcbf85 100644 --- a/kerberos5/libexec/kdc/Makefile +++ b/kerberos5/libexec/kdc/Makefile @@ -1,32 +1,25 @@ # $FreeBSD$ PROG= kdc +MAN= kdc.8 -SRCS= \ - 524.c \ - config.c \ - connect.c \ - kerberos4.c \ - kerberos5.c \ - log.c \ - main.c \ +SRCS= 524.c \ + config.c \ + connect.c \ + kerberos4.c \ + kerberos5.c \ + log.c \ + main.c \ misc.c -CFLAGS+=-I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/asn1 \ +CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \ ${LDAPCFLAGS} - +DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD} LDADD= -lhdb -lkrb5 -lroken ${LIBVERS} \ -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} - LDFLAGS=${LDAPLDFLAGS} -DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD} - -MAN= kdc.8 - .include -.PATH: ${KRB5DIR}/kdc +.PATH: ${KRB5DIR}/kdc diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile index 381197c5dbb..c0e6a1ea1aa 100644 --- a/kerberos5/libexec/kpasswdd/Makefile +++ b/kerberos5/libexec/kpasswdd/Makefile @@ -1,20 +1,14 @@ # $FreeBSD$ PROG= kpasswdd - -CFLAGS+=-I${KRB5DIR}/lib/roken \ - ${LDAPCFLAGS} - +MAN= kpasswdd.8 +CFLAGS+=-I${KRB5DIR}/lib/roken ${LDAPCFLAGS} +DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD} LDADD= -lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \ -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} - LDFLAGS=${LDAPLDFLAGS} -DPADD= ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD} - -MAN= kpasswdd.8 - .include -.PATH: ${KRB5DIR}/kpasswd +.PATH: ${KRB5DIR}/kpasswd diff --git a/kerberos5/tools/asn1_compile/Makefile b/kerberos5/tools/asn1_compile/Makefile index 9a4395410b3..c4682528194 100644 --- a/kerberos5/tools/asn1_compile/Makefile +++ b/kerberos5/tools/asn1_compile/Makefile @@ -3,8 +3,7 @@ PROG= asn1_compile NOMAN= -SRCS= \ - gen.c \ +SRCS= gen.c \ gen_copy.c \ gen_decode.c \ gen_encode.c \ @@ -25,7 +24,9 @@ SRCS= \ get_window_size.c \ strupr.c -CFLAGS+= -I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/asn1 -I. +CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/asn1 -I. + +CLEANFILES= print_version.h roken.h print_version.h: ../make-print-version/make-print-version ../make-print-version/make-print-version ${.TARGET} @@ -39,8 +40,6 @@ roken.h: ../make-roken/make-roken ../make-roken/make-roken: cd ${.CURDIR}/../make-roken && ${MAKE} -CLEANFILES= print_version.h roken.h - .include # There are two print_version.c's, the one we need is in ${KRB5DIR}/lib/vers, diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile index 6cfc6731b33..b646c986eb9 100644 --- a/kerberos5/usr.bin/kadmin/Makefile +++ b/kerberos5/usr.bin/kadmin/Makefile @@ -1,43 +1,35 @@ # $FreeBSD$ PROG= kadmin +MAN= kadmin.8 -SRCS= \ - ank.c \ - cpw.c \ - del.c \ - del_enctype.c \ - dump.c \ - ext.c \ - get.c \ - init.c \ - kadmin.c \ - load.c \ - mod.c \ - rename.c \ - util.c \ - random_password.c - -CFLAGS+=-I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/asn1 \ - -I${KRB5DIR}/lib/sl \ - ${LDAPCFLAGS} - -LDADD= -lkadm5clnt -lkadm5srv -lhdb -lkrb5 \ - ${LIBSL} -lroken ${LIBVERS} -lasn1 \ - -lcrypto -lcrypt -lcom_err \ +SRCS= ank.c \ + cpw.c \ + del.c \ + del_enctype.c \ + dump.c \ + ext.c \ + get.c \ + init.c \ + kadmin.c \ + load.c \ + mod.c \ + random_password.c \ + rename.c \ + util.c + +CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \ + -I${KRB5DIR}/lib/sl ${LDAPCFLAGS} +DPADD= ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} \ + ${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBASN1} \ + ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \ + ${LIBREADLINE} ${LIBNCURSES} ${LDAPDPADD} +LDADD= -lkadm5clnt -lkadm5srv -lhdb -lkrb5 \ + ${LIBSL} -lroken ${LIBVERS} -lasn1 \ + -lcrypto -lcrypt -lcom_err \ -lreadline -lncurses ${LDAPLDADD} - LDFLAGS=${LDAPLDFLAGS} -DPADD= ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} \ - ${LIBSL} ${LIBROKEN} ${LIBVERS} ${LIBASN1} \ - ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \ - ${LIBREADLINE} ${LIBNCURSES} ${LDAPDPADD} - -MAN= kadmin.8 - .include -.PATH: ${KRB5DIR}/kadmin +.PATH: ${KRB5DIR}/kadmin diff --git a/kerberos5/usr.bin/kdestroy/Makefile b/kerberos5/usr.bin/kdestroy/Makefile index 06006e45d31..60bc792780d 100644 --- a/kerberos5/usr.bin/kdestroy/Makefile +++ b/kerberos5/usr.bin/kdestroy/Makefile @@ -1,15 +1,12 @@ # $FreeBSD$ PROG= kdestroy - CFLAGS+=-I${KRB5DIR}/lib/roken - -LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -lcom_err - DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} +LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err .include -.PATH: ${KRB5DIR}/kuser +.PATH: ${KRB5DIR}/kuser diff --git a/kerberos5/usr.bin/kinit/Makefile b/kerberos5/usr.bin/kinit/Makefile index 913c83f964b..172ad985a84 100644 --- a/kerberos5/usr.bin/kinit/Makefile +++ b/kerberos5/usr.bin/kinit/Makefile @@ -1,15 +1,12 @@ # $FreeBSD$ PROG= kinit - CFLAGS+=-I${KRB5DIR}/lib/roken - -LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -lcom_err - DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} +LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err .include -.PATH: ${KRB5DIR}/kuser +.PATH: ${KRB5DIR}/kuser diff --git a/kerberos5/usr.bin/klist/Makefile b/kerberos5/usr.bin/klist/Makefile index b113aa79786..c97d65fc2ef 100644 --- a/kerberos5/usr.bin/klist/Makefile +++ b/kerberos5/usr.bin/klist/Makefile @@ -1,15 +1,12 @@ # $FreeBSD$ PROG= klist - CFLAGS+=-I${KRB5DIR}/lib/roken - -LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -lcom_err - DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} +LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err .include -.PATH: ${KRB5DIR}/kuser +.PATH: ${KRB5DIR}/kuser diff --git a/kerberos5/usr.bin/kpasswd/Makefile b/kerberos5/usr.bin/kpasswd/Makefile index dbb75574bfa..686c299ccdc 100644 --- a/kerberos5/usr.bin/kpasswd/Makefile +++ b/kerberos5/usr.bin/kpasswd/Makefile @@ -1,15 +1,12 @@ # $FreeBSD$ PROG= kpasswd - CFLAGS+=-I${KRB5DIR}/lib/roken - -LDADD= -lkrb5 -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -lcom_err - DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} +LDADD= -lkrb5 -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err .include -.PATH: ${KRB5DIR}/kpasswd +.PATH: ${KRB5DIR}/kpasswd diff --git a/kerberos5/usr.bin/krb5-config/Makefile b/kerberos5/usr.bin/krb5-config/Makefile index e1bc4ff4c6a..99ae94bc959 100644 --- a/kerberos5/usr.bin/krb5-config/Makefile +++ b/kerberos5/usr.bin/krb5-config/Makefile @@ -1,25 +1,24 @@ # $FreeBSD$ SCRIPTS=krb5-config - MAN= krb5-config.1 -CLEANFILES= krb5-config +CLEANFILES= krb5-config krb5-config: krb5-config.in - sed -e "s,@PACKAGE\@,FreeBSD heimdal,g" \ - -e "s,@VERSION\@,0.6,g" \ - -e "s,@prefix\@,/usr,g" \ - -e "s,@exec_prefix\@,/usr,g" \ - -e "s,@libdir\@,${LIBDIR},g" \ - -e "s,@includedir\@,${INCLUDEDIR},g" \ - -e "s,@LIB_crypt\@,-lcrypt,g" \ - -e "s,@LIB_dbopen\@,,g" \ - -e "s,@LIB_des_appl\@,-lcrypto,g" \ - -e "s,@LIBS\@,-lcom_err,g" \ - -e "s,@INCLUDE_des@,,g" \ - ${.ALLSRC} > ${.TARGET} + sed -e "s,@PACKAGE\@,FreeBSD heimdal,g" \ + -e "s,@VERSION\@,0.6,g" \ + -e "s,@prefix\@,/usr,g" \ + -e "s,@exec_prefix\@,/usr,g" \ + -e "s,@libdir\@,${LIBDIR},g" \ + -e "s,@includedir\@,${INCLUDEDIR},g" \ + -e "s,@LIB_crypt\@,-lcrypt,g" \ + -e "s,@LIB_dbopen\@,,g" \ + -e "s,@LIB_des_appl\@,-lcrypto,g" \ + -e "s,@LIBS\@,-lcom_err,g" \ + -e "s,@INCLUDE_des@,,g" \ + ${.ALLSRC} > ${.TARGET} .include -.PATH: ${KRB5DIR}/tools +.PATH: ${KRB5DIR}/tools diff --git a/kerberos5/usr.bin/ksu/Makefile b/kerberos5/usr.bin/ksu/Makefile index 43391d91823..93f9e21c096 100644 --- a/kerberos5/usr.bin/ksu/Makefile +++ b/kerberos5/usr.bin/ksu/Makefile @@ -1,24 +1,18 @@ # $FreeBSD$ PROG= ksu - +.if defined(ENABLE_SUID_K5SU) +BINMODE=4555 +INSTALLFLAGS=-fschg +.endif +NOMAN= SRCS= su.c - CFLAGS+=-I${KRB5DIR}/lib/roken - -LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -lcom_err - DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} - -NOMAN= true - -.if defined(ENABLE_SUID_K5SU) -BINMODE=4555 -.endif -INSTALLFLAGS=-fschg +LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err .include -.PATH: ${KRB5DIR}/appl/su +.PATH: ${KRB5DIR}/appl/su diff --git a/kerberos5/usr.bin/verify_krb5_conf/Makefile b/kerberos5/usr.bin/verify_krb5_conf/Makefile index c3c418332a6..7acce0eb7ca 100644 --- a/kerberos5/usr.bin/verify_krb5_conf/Makefile +++ b/kerberos5/usr.bin/verify_krb5_conf/Makefile @@ -1,19 +1,13 @@ # $FreeBSD$ PROG= verify_krb5_conf - -CFLAGS+=-I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/asn1 - -LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -lcom_err - +MAN= verify_krb5_conf.8 +CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} - -MAN= verify_krb5_conf.8 +LDADD= -lkafs5 -lkrb5 -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err .include -.PATH: ${KRB5DIR}/lib/krb5 +.PATH: ${KRB5DIR}/lib/krb5 diff --git a/kerberos5/usr.sbin/kstash/Makefile b/kerberos5/usr.sbin/kstash/Makefile index b9f7833410f..d9c6d8d9461 100644 --- a/kerberos5/usr.sbin/kstash/Makefile +++ b/kerberos5/usr.sbin/kstash/Makefile @@ -1,22 +1,15 @@ # $FreeBSD$ PROG= kstash - -CFLAGS+=-I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/krb5 \ - -I${KRB5DIR}/lib/asn1 \ +MAN= kstash.8 +CFLAGS+=-I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/roken \ ${LDAPCFLAGS} - +DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD} LDADD= -lhdb -lkrb5 -lroken ${LIBVERS} \ -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} - LDFLAGS=${LDAPLDFLAGS} -DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD} - -MAN= kstash.8 - .include -.PATH: ${KRB5DIR}/kdc +.PATH: ${KRB5DIR}/kdc diff --git a/kerberos5/usr.sbin/ktutil/Makefile b/kerberos5/usr.sbin/ktutil/Makefile index f7f675fab8c..e134cce942e 100644 --- a/kerberos5/usr.sbin/ktutil/Makefile +++ b/kerberos5/usr.sbin/ktutil/Makefile @@ -1,31 +1,26 @@ # $FreeBSD$ -PROG= ktutil - -SRCS= \ - add.c \ - change.c \ - copy.c \ - get.c \ - ktutil.c \ - list.c \ - purge.c \ - remove.c \ - rename.c - -CFLAGS+= -I${KRB5DIR}/lib/roken \ - -I${KRB5DIR}/lib/sl \ - -LDADD= -lkadm5clnt -lkrb5 ${LIBSL} -lroken ${LIBVERS} \ - -lasn1 -lcrypto -lcrypt -lcom_err \ - -lreadline -lncurses - -DPADD= ${LIBKADM5CLNT} ${LIBKRB5} ${LIBSL} ${LIBROKEN} ${LIBVERS} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \ - ${LIBREADLINE} ${LIBNCURSES} - -MAN= ktutil.8 +PROG= ktutil +MAN= ktutil.8 + +SRCS= add.c \ + change.c \ + copy.c \ + get.c \ + ktutil.c \ + list.c \ + purge.c \ + remove.c \ + rename.c + +CFLAGS+=-I${KRB5DIR}/lib/roken -I${KRB5DIR}/lib/sl +DPADD= ${LIBKADM5CLNT} ${LIBKRB5} ${LIBSL} ${LIBROKEN} ${LIBVERS} \ + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \ + ${LIBREADLINE} ${LIBNCURSES} +LDADD= -lkadm5clnt -lkrb5 ${LIBSL} -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err \ + -lreadline -lncurses .include -.PATH: ${KRB5DIR}/admin +.PATH: ${KRB5DIR}/admin -- 2.45.2