diff options
author | markm <markm@FreeBSD.org> | 2003-05-11 18:49:29 +0000 |
---|---|---|
committer | markm <markm@FreeBSD.org> | 2003-05-11 18:49:29 +0000 |
commit | fac5c1185550eb79eaf647644070d47c7a5ced8f (patch) | |
tree | eec073e50b26ea3d2c3b38c59c9264cfbee9a434 | |
parent | 64cd7ea15d460e859594ab7fe034f346fa2d8720 (diff) | |
download | FreeBSD-src-fac5c1185550eb79eaf647644070d47c7a5ced8f.zip FreeBSD-src-fac5c1185550eb79eaf647644070d47c7a5ced8f.tar.gz |
Remove some KRB4 scraps, and allow NOSHARED make worlds to
complete.
OK'ed by: re(scottl)
-rw-r--r-- | kerberos5/include/config.h | 9 | ||||
-rw-r--r-- | kerberos5/usr.bin/kadmin/Makefile | 8 | ||||
-rw-r--r-- | kerberos5/usr.sbin/ktutil/Makefile | 9 |
3 files changed, 9 insertions, 17 deletions
diff --git a/kerberos5/include/config.h b/kerberos5/include/config.h index f530f53..5d97366 100644 --- a/kerberos5/include/config.h +++ b/kerberos5/include/config.h @@ -1118,9 +1118,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg } /* Define if you are running IRIX 4. */ /* #undef IRIX4 */ -/* Define if you have the krb4 package. */ -/* #undef KRB4 */ - /* Enable Kerberos 5 support in applications. */ #define KRB5 1 @@ -1328,13 +1325,7 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg } /* Define to `int' if <sys/types.h> doesn't define. */ /* #undef uid_t */ -#if defined(HAVE_FOUR_VALUED_KRB_PUT_INT) || !defined(KRB4) #define KRB_PUT_INT(F, T, L, S) krb_put_int((F), (T), (L), (S)) -#else -#define KRB_PUT_INT(F, T, L, S) krb_put_int((F), (T), (S)) -#endif - - #if defined(ENCRYPTION) && !defined(AUTHENTICATION) #define AUTHENTICATION 1 diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile index fc72b3d..a220cb6 100644 --- a/kerberos5/usr.bin/kadmin/Makefile +++ b/kerberos5/usr.bin/kadmin/Makefile @@ -33,17 +33,17 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -LDADD= -L${KRB5OBJDIR} -lkrb5 \ +LDADD= -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \ + -L${KRB5OBJDIR} -lkrb5 \ -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ - -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \ -L${HDBOBJDIR} -lhdb \ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err \ - -L${SLOBJDIR} -lsl -lreadline + -L${SLOBJDIR} -lsl -lreadline -lcurses DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \ - ${LIBSL} ${LIBREADLINE} + ${LIBSL} ${LIBREADLINE} ${LIBCURSES} MAN= kadmin.8 .include <bsd.prog.mk> diff --git a/kerberos5/usr.sbin/ktutil/Makefile b/kerberos5/usr.sbin/ktutil/Makefile index 6d8b27a..fd53f8b 100644 --- a/kerberos5/usr.sbin/ktutil/Makefile +++ b/kerberos5/usr.sbin/ktutil/Makefile @@ -25,15 +25,16 @@ CFLAGS+= -I${KRB5DIR}/include \ -I${KRB5DIR}/admin \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -LDADD= -L${KRB5OBJDIR} -lkrb5 \ +LDADD= -L${KADM5COBJDIR} -lkadm5clnt \ + -L${KRB5OBJDIR} -lkrb5 \ -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ -L${SLOBJDIR} -lsl -L${ASN1OBJDIR} -lasn1 \ - -L${KADM5COBJDIR} -lkadm5clnt \ - -lcrypto -lcrypt -lcom_err -lreadline + -lcrypto -lcrypt -lcom_err -lreadline -lcurses DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ ${LIBSL} ${LIBASN1} ${LIBKADM5CLNT} \ - ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBREADLINE} + ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBREADLINE} \ + ${LIBCURSES} MAN= ktutil.8 .include <bsd.prog.mk> |