From 170f347106454c60c4298a0542c314e4bff3af2b Mon Sep 17 00:00:00 2001 From: markm Date: Sun, 19 Sep 1999 22:00:58 +0000 Subject: Fixes for new Kerberos4. Userland to follow. --- kerberosIV/lib/libacl/Makefile | 9 ++++---- kerberosIV/lib/libkadm/Makefile | 7 ++++--- kerberosIV/lib/libkafs/Makefile | 4 +++- kerberosIV/lib/libkdb/Makefile | 2 +- kerberosIV/lib/libkrb/Makefile | 45 +++++++++++++++++++++------------------- kerberosIV/lib/libroken/Makefile | 21 +++++++++++++++---- kerberosIV/lib/libsl/Makefile | 7 ++++--- 7 files changed, 58 insertions(+), 37 deletions(-) (limited to 'kerberosIV/lib') diff --git a/kerberosIV/lib/libacl/Makefile b/kerberosIV/lib/libacl/Makefile index 74a987e..3710b2f 100644 --- a/kerberosIV/lib/libacl/Makefile +++ b/kerberosIV/lib/libacl/Makefile @@ -2,11 +2,12 @@ LIB= acl CFLAGS+= -I${KRB4DIR}/include \ - -I${INCLUDEOBJDIR} \ - -I${KRB4DIR}/lib/roken \ + -I${KRB4DIR}/lib/acl \ -I${KRB4DIR}/lib/krb \ - -I${KRB4DIR}/lib/acl -SRCS= acl_files.c + -I${KRB4DIR}/lib/roken \ + -I${INCLUDEOBJDIR} \ + -I${.OBJDIR} +SRCS= acl_files.c protos.h MAN3= ${KRB4DIR}/man/acl_check.3 MLINKS= acl_check.3 acl_canonicalize_principal.3 \ acl_check.3 acl_exact_match.3 \ diff --git a/kerberosIV/lib/libkadm/Makefile b/kerberosIV/lib/libkadm/Makefile index ba33c27..819fab8 100644 --- a/kerberosIV/lib/libkadm/Makefile +++ b/kerberosIV/lib/libkadm/Makefile @@ -3,15 +3,16 @@ LIB= kadm CFLAGS+= -I${KRB4DIR}/include \ -I${INCLUDEOBJDIR} \ - -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/lib/kdb \ -I${KRB4DIR}/lib/kadm \ + -I${KRB4DIR}/lib/roken \ -I${KRBOBJDIR} \ - -I${KADMOBJDIR} + -I${KADMOBJDIR} \ + -I${.OBJDIR} SRCS= kadm_cli_wrap.c kadm_stream.c kadm_supp.c \ ${KADMOBJDIR}/kadm_err.c ${KADMOBJDIR}/kadm_err.h \ - ${KRBOBJDIR}/krb_err.h + ${KRBOBJDIR}/krb_err.h check_password.c protos.h INCLUDES= ${KRB4DIR}/lib/kadm/kadm.h ${KADMOBJDIR}/kadm_err.h diff --git a/kerberosIV/lib/libkafs/Makefile b/kerberosIV/lib/libkafs/Makefile index a49606a..368e80b 100644 --- a/kerberosIV/lib/libkafs/Makefile +++ b/kerberosIV/lib/libkafs/Makefile @@ -6,7 +6,8 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/krb \ -I${KRB4DIR}/lib/kafs -SRCS= afssys.c afskrb.c +SRCS= afssys.c afskrb.c common.c issuid.c \ + strcpy_truncate.c strcat_truncate.c MAN3= ${KRB4DIR}/man/kafs.3 MLINKS= kafs.3 k_hasafs.3 kafs.3 k_afsklog.3 kafs.3 k_afsklog_uid.3 \ kafs.3 k_pioctl.3 kafs.3 k_unlog.3 kafs.3 k_setpag.3 \ @@ -18,3 +19,4 @@ INCLUDES= ${KRB4DIR}/lib/kafs/kafs.h .include .PATH: ${KRB4DIR}/lib/kafs +.PATH: ${KRB4DIR}/lib/roken diff --git a/kerberosIV/lib/libkdb/Makefile b/kerberosIV/lib/libkdb/Makefile index 5a67333..1e3878a 100644 --- a/kerberosIV/lib/libkdb/Makefile +++ b/kerberosIV/lib/libkdb/Makefile @@ -8,7 +8,7 @@ CFLAGS+= -I${KRB4DIR}/include \ -I${KRB4DIR}/lib/kdb \ -I${KADMOBJDIR} SRCS= krb_cache.c krb_kdb_utils.c copykey.c krb_lib.c krb_dbm.c \ - print_princ.c base64.c + print_princ.c INCLUDES= ${KRB4DIR}/lib/kdb/kdc.h ${KRB4DIR}/lib/kdb/krb_db.h diff --git a/kerberosIV/lib/libkrb/Makefile b/kerberosIV/lib/libkrb/Makefile index 3544daf..1d547a9 100644 --- a/kerberosIV/lib/libkrb/Makefile +++ b/kerberosIV/lib/libkrb/Makefile @@ -3,30 +3,32 @@ LIB= krb CFLAGS+= -I${KRB4DIR}/include \ -I${INCLUDEOBJDIR} \ - -I${KRB4DIR}/lib/roken \ -I${KRB4DIR}/lib/krb \ - -I${KRBOBJDIR} + -I${KRB4DIR}/lib/roken \ + -I${KRBOBJDIR} \ + -I${.OBJDIR} DPADD+= ${LIBCRYPT} LDADD+= -lcrypt -SRCS= cr_err_reply.c create_auth_reply.c create_ciph.c \ - create_death_packet.c create_ticket.c dest_tkt.c get_in_tkt.c \ - get_svc_in_tkt.c getrealm.c k_localtime.c krb_err_txt.c \ - krb_get_in_tkt.c kuserok.c parse_name.c kntoln.c mk_auth.c \ - krb_check_auth.c mk_err.c mk_safe.c rd_err.c rd_safe.c \ - recvauth.c mk_priv.c rd_req.c decomp_ticket.c lifetime.c \ - month_sname.c stime.c read_service_key.c getst.c sendauth.c \ - netread.c netwrite.c rd_priv.c krb_equiv.c str2key.c \ - get_ad_tkt.c mk_req.c get_cred.c get_tf_realm.c \ - get_tf_fullname.c one.c save_credentials.c send_to_kdc.c \ - get_host.c get_krbrlm.c k_gethostname.c tf_util.c \ - debug_decl.c k_flock.c tkt_string.c getaddrs.c \ - k_getsockinst.c k_getport.c lsb_addr_comp.c name2name.c \ - get_default_principal.c realm_parse.c verify_user.c \ - rw.c kdc_reply.c encrypt_ktext.c swab.c gettimeofday.c \ - check_time.c krb_err.c et_list.c resolve.c unparse_name.c \ - logging.c k_concat.c \ - snprintf.c strdup.c strcasecmp.c \ - ${KRBOBJDIR}/krb_err.h +SRCS= check_time.c cr_err_reply.c create_auth_reply.c create_ciph.c \ + create_death_packet.c create_ticket.c debug_decl.c \ + decomp_ticket.c dest_tkt.c encrypt_ktext.c extra.c \ + get_ad_tkt.c getfile.c get_cred.c get_default_principal.c \ + get_host.c get_in_tkt.c get_krbrlm.c get_svc_in_tkt.c \ + get_tf_fullname.c get_tf_realm.c getaddrs.c getrealm.c getst.c \ + k_getport.c k_getsockinst.c k_localtime.c kdc_reply.c kntoln.c \ + krb_check_auth.c krb_equiv.c krb_err_txt.c \ + krb_get_in_tkt.c kuserok.c lifetime.c logging.c \ + lsb_addr_comp.c mk_auth.c mk_err.c mk_priv.c mk_req.c \ + mk_safe.c month_sname.c name2name.c krb_net_read.c \ + krb_net_write.c one.c parse_name.c rd_err.c rd_priv.c rd_req.c \ + rd_safe.c read_service_key.c realm_parse.c recvauth.c rw.c \ + save_credentials.c send_to_kdc.c sendauth.c solaris_compat.c \ + stime.c str2key.c tf_util.c time.c tkt_string.c unparse_name.c \ + verify_user.c base64.c concat.c flock.c gethostname.c \ + gettimeofday.c getuid.c net_read.c net_write.c resolve.c \ + snprintf.c strcasecmp.c strcat_truncate.c strcpy_truncate.c \ + strdup.c strncasecmp.c strnlen.c strtok_r.c swab.c \ + ${KRBOBJDIR}/krb_err.c ${KRBOBJDIR}/krb_err.h protos.h MAN3= ${KRB4DIR}/man/kerberos.3 \ ${KRB4DIR}/man/krb_realmofhost.3 \ ${KRB4DIR}/man/krb_sendauth.3 \ @@ -59,6 +61,7 @@ MLINKS= kerberos.3 krb_mk_req.3 \ tf_util.3 tf_close.3 INCLUDES= ${KRB4DIR}/lib/krb/krb.h ${KRB4DIR}/lib/krb/klog.h \ + ${KRB4DIR}/lib/krb/krb-protos.h \ ${KRB4DIR}/lib/krb/prot.h ${KRBOBJDIR}/krb_err.h .include diff --git a/kerberosIV/lib/libroken/Makefile b/kerberosIV/lib/libroken/Makefile index 4e00a20..48ac484 100644 --- a/kerberosIV/lib/libroken/Makefile +++ b/kerberosIV/lib/libroken/Makefile @@ -3,10 +3,15 @@ LIB= roken CFLAGS+= -I${KRB4DIR}/include \ -I${INCLUDEOBJDIR} \ - -I${KRB4DIR}/lib/roken -SRCS= k_getpwuid.c k_getpwnam.c signal.c tm2time.c \ - verify.c inaddr2str.c mini_inetd.c get_window_size.c \ - warnerr.c snprintf.c strlwr.c strnlen.c strupr.c + -I${KRB4DIR}/lib/roken \ + -I${.OBJDIR} +SRCS= base64.c concat.c emalloc.c eread.c erealloc.c estrdup.c \ + ewrite.c get_default_username.c get_window_size.c getarg.c \ + inaddr2str.c issuid.c k_getpwnam.c k_getpwuid.c mini_inetd.c \ + net_read.c net_write.c parse_time.c parse_units.c \ + print_version.c resolve.c roken_gethostby.c warnerr.c \ + strcat_truncate.c strcpy_truncate.c signal.c simple_exec.c \ + strupr.c tm2time.c print_version.h NOPIC= yes install: @@ -14,3 +19,11 @@ install: .include .PATH: ${KRB4DIR}/lib/roken + +print_version.h: make-print-version + ./make-print-version print_version.h + +make-print-version: make-print-version.c + ${CC} ${CFLAGS} -o ${.TARGET} ${.OODATE} + +CLEANFILES+= make-print-version print_version.h diff --git a/kerberosIV/lib/libsl/Makefile b/kerberosIV/lib/libsl/Makefile index 18d82bf..8f0fff2 100644 --- a/kerberosIV/lib/libsl/Makefile +++ b/kerberosIV/lib/libsl/Makefile @@ -2,10 +2,10 @@ LIB= sl CFLAGS+= -I${KRB4DIR}/include \ - -I${INCLUDEOBJDIR} \ + -I${KRB4DIR}/lib/sl \ -I${KRB4DIR}/lib/roken \ - -I${KRB4DIR}/lib/sl -SRCS= sl.c + -I${INCLUDEOBJDIR} +SRCS= sl.c ss.c strtok_r.c NOPIC= yes install: @@ -13,3 +13,4 @@ install: .include .PATH: ${KRB4DIR}/lib/sl +.PATH: ${KRB4DIR}/lib/roken -- cgit v1.1