summaryrefslogtreecommitdiffstats
path: root/kerberos5
diff options
context:
space:
mode:
Diffstat (limited to 'kerberos5')
-rw-r--r--kerberos5/Makefile.inc12
-rw-r--r--kerberos5/include/roken.h201
-rw-r--r--kerberos5/include/version.h4
-rw-r--r--kerberos5/lib/libasn1/Makefile9
-rw-r--r--kerberos5/lib/libkrb5/Makefile2
-rw-r--r--kerberos5/lib/libroken/Makefile3
-rw-r--r--kerberos5/lib/libsl/Makefile5
-rw-r--r--kerberos5/libexec/hprop/Makefile4
-rw-r--r--kerberos5/libexec/hpropd/Makefile4
-rw-r--r--kerberos5/libexec/ipropd-master/Makefile4
-rw-r--r--kerberos5/libexec/ipropd-slave/Makefile4
-rw-r--r--kerberos5/libexec/k5admind/Makefile4
-rw-r--r--kerberos5/libexec/k5passwdd/Makefile4
-rw-r--r--kerberos5/libexec/kadmind/Makefile4
-rw-r--r--kerberos5/libexec/kdc/Makefile4
-rw-r--r--kerberos5/libexec/kpasswdd/Makefile4
-rw-r--r--kerberos5/usr.bin/k5admin/Makefile6
-rw-r--r--kerberos5/usr.bin/k5auth/Makefile9
-rw-r--r--kerberos5/usr.bin/k5destroy/Makefile4
-rw-r--r--kerberos5/usr.bin/k5init/Makefile4
-rw-r--r--kerberos5/usr.bin/k5list/Makefile4
-rw-r--r--kerberos5/usr.bin/k5passwd/Makefile4
-rw-r--r--kerberos5/usr.bin/kadmin/Makefile6
-rw-r--r--kerberos5/usr.bin/kauth/Makefile9
-rw-r--r--kerberos5/usr.bin/kdestroy/Makefile4
-rw-r--r--kerberos5/usr.bin/kinit/Makefile4
-rw-r--r--kerberos5/usr.bin/klist/Makefile4
-rw-r--r--kerberos5/usr.bin/kpasswd/Makefile4
-rw-r--r--kerberos5/usr.sbin/k5admin/Makefile5
-rw-r--r--kerberos5/usr.sbin/k5stash/Makefile4
-rw-r--r--kerberos5/usr.sbin/kadmin/Makefile5
-rw-r--r--kerberos5/usr.sbin/kstash/Makefile4
-rw-r--r--kerberos5/usr.sbin/ktutil/Makefile4
33 files changed, 85 insertions, 271 deletions
diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc
index 37d5de4..6da967b 100644
--- a/kerberos5/Makefile.inc
+++ b/kerberos5/Makefile.inc
@@ -17,9 +17,7 @@ CFLAGS+=-Wall -I${INCLUDEDIR} -I${INCLUDEOBJDIR} -DHAVE_CONFIG_H
CFLAGS+=-DKRB5_KRB4_COMPAT
.endif
-.if defined(USE_INET6)
CFLAGS+=-DINET6
-.endif
.if exists(${.OBJDIR}/../../include)
INCLUDEOBJDIR= ${.OBJDIR}/../../include
@@ -139,6 +137,16 @@ beforeinstall: ${INCLUDES}
.endfor
.endif
+roken.h: make-roken
+ ./make-roken > tmp.h ;\
+ if [ -f roken.h ] && cmp -s tmp.h roken.h ; then rm -f tmp.h ; \
+ else rm -f roken.h; mv tmp.h roken.h; fi
+
+make-roken.c: ${KRB5DIR}/lib/roken/roken.awk ${KRB5DIR}/lib/roken/roken.h.in
+ awk -f ${.ALLSRC} > ${.TARGET}
+
+CLEANFILES+= make-roken.c make-roken roken.h
+
.else
INCLUDEDIR= ${.CURDIR}/../../include
diff --git a/kerberos5/include/roken.h b/kerberos5/include/roken.h
deleted file mode 100644
index cb4bf62..0000000
--- a/kerberos5/include/roken.h
+++ /dev/null
@@ -1,201 +0,0 @@
-/* This is an OS dependent, generated file */
-
-
-#ifndef __ROKEN_H__
-#define __ROKEN_H__
-
-/* -*- C -*- */
-/*
- * Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska Högskolan
- * (Royal Institute of Technology, Stockholm, Sweden).
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * 3. Neither the name of the Institute nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/* $Id: roken.h.in,v 1.133 1999/12/30 02:22:54 assar Exp $ */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <sys/uio.h>
-#include <grp.h>
-#include <sys/stat.h>
-#include <netinet/in.h>
-#include <netinet6/in6.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <syslog.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <err.h>
-#include <termios.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
-#include <time.h>
-
-#include <paths.h>
-
-
-#define ROKEN_LIB_FUNCTION
-
-#include <roken-common.h>
-
-
-
-
-
-
-
-
-
-
-int asnprintf (char **ret, size_t max_sz, const char *format, ...)
- __attribute__ ((format (printf, 3, 4)));
-
-int vasnprintf (char **ret, size_t max_sz, const char *format, va_list ap)
- __attribute__((format (printf, 3, 0)));
-
-
-char * strndup(const char *old, size_t sz);
-
-char * strlwr(char *);
-
-size_t strnlen(const char*, size_t);
-
-
-
-
-
-char * strupr(char *);
-
-
-
-
-
-
-
-
-
-
-
-#include <pwd.h>
-struct passwd *k_getpwnam (const char *user);
-struct passwd *k_getpwuid (uid_t uid);
-
-const char *get_default_username (void);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-time_t tm2time (struct tm tm, int local);
-
-int unix_verify_user(char *user, char *password);
-
-void mini_inetd (int port);
-
-int roken_concat (char *s, size_t len, ...);
-
-size_t roken_mconcat (char **s, size_t max_len, ...);
-
-int roken_vconcat (char *s, size_t len, va_list args);
-
-size_t roken_vmconcat (char **s, size_t max_len, va_list args);
-
-ssize_t net_write (int fd, const void *buf, size_t nbytes);
-
-ssize_t net_read (int fd, void *buf, size_t nbytes);
-
-int issuid(void);
-
-
-int get_window_size(int fd, struct winsize *);
-
-
-
-extern const char *__progname;
-
-extern char **environ;
-
-
-
-
-struct hostent *
-copyhostent (const struct hostent *h);
-
-
-
-
-
-
-
-
-int
-getnameinfo_verified(const struct sockaddr *sa, socklen_t salen,
- char *host, size_t hostlen,
- char *serv, size_t servlen,
- int flags);
-
-
-
-/*
- * kludges and such
- */
-
-int roken_gethostby_setup(const char*, const char*);
-struct hostent* roken_gethostbyname(const char*);
-struct hostent* roken_gethostbyaddr(const void*, size_t, int);
-
-#define roken_getservbyname(x,y) getservbyname(x,y)
-
-#define roken_openlog(a,b,c) openlog(a,b,c)
-
-void set_progname(char *argv0);
-
-#endif /* __ROKEN_H__ */
diff --git a/kerberos5/include/version.h b/kerberos5/include/version.h
index b204605..7e29eeb 100644
--- a/kerberos5/include/version.h
+++ b/kerberos5/include/version.h
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
char *krb4_long_version = "@(#)$Version: krb4-1.0 by root on greenpeace.grondar.za (i386-unknown-freebsd4.0) Sat Jan 8 19:34:57 SAST 2000 $";
char *krb4_version = "krb4-1.0";
-char *heimdal_long_version = "@(#)$Version: heimdal-0.1l by root on greenpeace.grondar.za (i386-unknown-freebsd4.0) Sat Jan 8 20:56:02 SAST 2000 $";
-char *heimdal_version = "heimdal-0.1l";
+char *heimdal_long_version = "@(#)$Version: heimdal-0.2o by root on greenpeace.grondar.za (i386-unknown-freebsd4.0) Sat Jan 8 20:56:02 SAST 2000 $";
+char *heimdal_version = "heimdal-0.2o";
diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile
index a07388c..5a2a5a1 100644
--- a/kerberos5/lib/libasn1/Makefile
+++ b/kerberos5/lib/libasn1/Makefile
@@ -7,7 +7,8 @@ CFLAGS+=-I${KRB5DIR}/include \
-I${INCLUDEOBJDIR} \
-I${.OBJDIR}
SRCS= der_get.c der_put.c der_free.c der_length.c der_copy.c \
- timegm.c asn1_err.c asn1_err.h asn1.h ${GEN:S/.x/.c/g}
+ timegm.c asn1_err.c asn1_err.h asn1.h roken.h \
+ ${GEN:S/.x/.c/g}
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 \
@@ -31,7 +32,7 @@ GEN= asn1_APOptions.x asn1_AP_REP.x asn1_AP_REQ.x asn1_AS_REP.x \
.PATH: ${KRB5DIR}/lib/asn1
.PATH: ${KRB5DIR}/lib/roken
-beforedepend all:
+beforedepend all: roken.h
.for I in ${GEN}
${I:S/.x/.c/}: ${I}
@@ -51,7 +52,7 @@ asn1_compile: parse.o lex.o main.c hash.c symbol.c gen.c \
get_window_size.c strupr.c
${CC} ${CFLAGS} ${.OODATE} -o ${.TARGET}
-parse.o: parse.c
+parse.o: parse.c roken.h
parse.h parse.c: parse.y
${YACC} -d ${.OODATE}
@@ -60,7 +61,7 @@ parse.h parse.c: parse.y
lex.o: lex.l
-print_version.o: print_version.h print_version.c
+print_version.o: print_version.h print_version.c roken.h
${CC} ${CFLAGS} -c -o ${.TARGET} ${KRB5DIR}/lib/roken/print_version.c
print_version.h: make-print-version
diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile
index 3021732..a12819c 100644
--- a/kerberos5/lib/libkrb5/Makefile
+++ b/kerberos5/lib/libkrb5/Makefile
@@ -29,7 +29,7 @@ SRCS= add_et_list.c addr_families.c address.c aname_to_localname.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 heim_err.c heim_err.h \
- md4.c md5.c sha.c rc4_enc.c rc4_skey.c
+ rc4_enc.c rc4_skey.c
INCLUDES=krb5.h
.include <bsd.lib.mk>
diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile
index 5c11dbe..8430907 100644
--- a/kerberos5/lib/libroken/Makefile
+++ b/kerberos5/lib/libroken/Makefile
@@ -13,7 +13,8 @@ SRCS= base64.c concat.c emalloc.c eread.c erealloc.c estrdup.c \
roken_gethostby.c signal.c simple_exec.c snprintf.c \
socket.c tm2time.c verify.c warnerr.c copyhostent.c \
strlwr.c strndup.c strnlen.c strupr.c get_default_username.c \
- print_version.h
+ strcollect.c getaddrinfo_hostspec.c \
+ print_version.h roken.h
NOPIC= yes
install:
diff --git a/kerberos5/lib/libsl/Makefile b/kerberos5/lib/libsl/Makefile
index 3f5add3..0bcd739 100644
--- a/kerberos5/lib/libsl/Makefile
+++ b/kerberos5/lib/libsl/Makefile
@@ -3,8 +3,9 @@
LIB= sl
CFLAGS+=-I${KRB5DIR}/lib/sl \
-I${KRB5DIR}/lib/roken \
- -I${KRB5DIR}/include
-SRCS= sl.c
+ -I${KRB5DIR}/include \
+ -I${.OBJDIR}
+SRCS= sl.c roken.h
NOPIC= yes
diff --git a/kerberos5/libexec/hprop/Makefile b/kerberos5/libexec/hprop/Makefile
index bf69770..fb2cf22 100644
--- a/kerberos5/libexec/hprop/Makefile
+++ b/kerberos5/libexec/hprop/Makefile
@@ -18,9 +18,9 @@ _krb4deps= ${LIBKRB} ${LIBKAFS} ${LIBKDB}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
MAN8= hprop.8
.include <bsd.prog.mk>
diff --git a/kerberos5/libexec/hpropd/Makefile b/kerberos5/libexec/hpropd/Makefile
index bc9ad93..cb74c86 100644
--- a/kerberos5/libexec/hpropd/Makefile
+++ b/kerberos5/libexec/hpropd/Makefile
@@ -18,9 +18,9 @@ _krb4deps= ${LIBKRB} ${LIBKAFS} ${LIBKDB}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
MAN8= hpropd.8
.include <bsd.prog.mk>
diff --git a/kerberos5/libexec/ipropd-master/Makefile b/kerberos5/libexec/ipropd-master/Makefile
index c6857cd..81c999e 100644
--- a/kerberos5/libexec/ipropd-master/Makefile
+++ b/kerberos5/libexec/ipropd-master/Makefile
@@ -19,9 +19,9 @@ _krb4deps= ${LIBKRB} ${LIBKAFS}
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
NOMAN= yes
.include <bsd.prog.mk>
diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile
index bfd84cc..251533c 100644
--- a/kerberos5/libexec/ipropd-slave/Makefile
+++ b/kerberos5/libexec/ipropd-slave/Makefile
@@ -19,9 +19,9 @@ _krb4deps= ${LIBKRB} ${LIBKAFS}
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
NOMAN= yes
.include <bsd.prog.mk>
diff --git a/kerberos5/libexec/k5admind/Makefile b/kerberos5/libexec/k5admind/Makefile
index 4415938..5ec1881 100644
--- a/kerberos5/libexec/k5admind/Makefile
+++ b/kerberos5/libexec/k5admind/Makefile
@@ -21,10 +21,10 @@ LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
-L${HDBOBJDIR} -lhdb \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
NOMAN= yes
.include <bsd.prog.mk>
diff --git a/kerberos5/libexec/k5passwdd/Makefile b/kerberos5/libexec/k5passwdd/Makefile
index d23ed4a..7fc304a 100644
--- a/kerberos5/libexec/k5passwdd/Makefile
+++ b/kerberos5/libexec/k5passwdd/Makefile
@@ -17,9 +17,9 @@ _krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${KADM5SOBJDIR} -lkadm5srv -L${HDBOBJDIR} -lhdb \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
MAN8= kpasswdd.8
.include <bsd.prog.mk>
diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile
index 4415938..5ec1881 100644
--- a/kerberos5/libexec/kadmind/Makefile
+++ b/kerberos5/libexec/kadmind/Makefile
@@ -21,10 +21,10 @@ LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
-L${HDBOBJDIR} -lhdb \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
NOMAN= yes
.include <bsd.prog.mk>
diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile
index 994ff38..4fae3ae 100644
--- a/kerberos5/libexec/kdc/Makefile
+++ b/kerberos5/libexec/kdc/Makefile
@@ -19,9 +19,9 @@ _krb4deps= ${LIBKRB} ${LIBKAFS} ${LIBKDB}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
MAN8= kdc.8
.include <bsd.prog.mk>
diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile
index d23ed4a..7fc304a 100644
--- a/kerberos5/libexec/kpasswdd/Makefile
+++ b/kerberos5/libexec/kpasswdd/Makefile
@@ -17,9 +17,9 @@ _krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${KADM5SOBJDIR} -lkadm5srv -L${HDBOBJDIR} -lhdb \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
MAN8= kpasswdd.8
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/k5admin/Makefile b/kerberos5/usr.bin/k5admin/Makefile
index d7640f1..8e247eb 100644
--- a/kerberos5/usr.bin/k5admin/Makefile
+++ b/kerberos5/usr.bin/k5admin/Makefile
@@ -23,12 +23,12 @@ LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
-L${HDBOBJDIR} -lhdb \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err \
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lmd -lcom_err \
-L${SLOBJDIR} -lsl -lreadline
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBSL} \
- ${LIBREADLINE}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBMD} ${LIBCOM_ERR} \
+ ${LIBSL} ${LIBREADLINE}
NOMAN= yes
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/k5auth/Makefile b/kerberos5/usr.bin/k5auth/Makefile
index 33c13b3..dbec434 100644
--- a/kerberos5/usr.bin/k5auth/Makefile
+++ b/kerberos5/usr.bin/k5auth/Makefile
@@ -1,19 +1,20 @@
# $FreeBSD$
PROG= kauth
-SRCS= kauth.c rkinit.c encdata.c marshall.c
+SRCS= kauth.c rkinit.c encdata.c marshall.c roken.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/krb5 \
- -I${KRB5DIR}/appl/kauth
+ -I${KRB5DIR}/appl/kauth \
+ -I${.OBJDIR}
.if defined(KRB5_KRB4_COMPAT)
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
NOMAN= yes
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/k5destroy/Makefile b/kerberos5/usr.bin/k5destroy/Makefile
index 68db1c0..797005d 100644
--- a/kerberos5/usr.bin/k5destroy/Makefile
+++ b/kerberos5/usr.bin/k5destroy/Makefile
@@ -15,9 +15,9 @@ _krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/k5init/Makefile b/kerberos5/usr.bin/k5init/Makefile
index 3dcfc33..8618f35 100644
--- a/kerberos5/usr.bin/k5init/Makefile
+++ b/kerberos5/usr.bin/k5init/Makefile
@@ -15,9 +15,9 @@ _krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/k5list/Makefile b/kerberos5/usr.bin/k5list/Makefile
index 5dfd39f..e40949d 100644
--- a/kerberos5/usr.bin/k5list/Makefile
+++ b/kerberos5/usr.bin/k5list/Makefile
@@ -15,9 +15,9 @@ _krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/k5passwd/Makefile b/kerberos5/usr.bin/k5passwd/Makefile
index 55d5062..298645b 100644
--- a/kerberos5/usr.bin/k5passwd/Makefile
+++ b/kerberos5/usr.bin/k5passwd/Makefile
@@ -14,9 +14,9 @@ _krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile
index d7640f1..8e247eb 100644
--- a/kerberos5/usr.bin/kadmin/Makefile
+++ b/kerberos5/usr.bin/kadmin/Makefile
@@ -23,12 +23,12 @@ LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
-L${HDBOBJDIR} -lhdb \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err \
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lmd -lcom_err \
-L${SLOBJDIR} -lsl -lreadline
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBSL} \
- ${LIBREADLINE}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBMD} ${LIBCOM_ERR} \
+ ${LIBSL} ${LIBREADLINE}
NOMAN= yes
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/kauth/Makefile b/kerberos5/usr.bin/kauth/Makefile
index 33c13b3..dbec434 100644
--- a/kerberos5/usr.bin/kauth/Makefile
+++ b/kerberos5/usr.bin/kauth/Makefile
@@ -1,19 +1,20 @@
# $FreeBSD$
PROG= kauth
-SRCS= kauth.c rkinit.c encdata.c marshall.c
+SRCS= kauth.c rkinit.c encdata.c marshall.c roken.h
CFLAGS+= -I${KRB5DIR}/include \
-I${KRB5DIR}/lib/roken \
-I${KRB5DIR}/lib/krb5 \
- -I${KRB5DIR}/appl/kauth
+ -I${KRB5DIR}/appl/kauth \
+ -I${.OBJDIR}
.if defined(KRB5_KRB4_COMPAT)
_krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
NOMAN= yes
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/kdestroy/Makefile b/kerberos5/usr.bin/kdestroy/Makefile
index 68db1c0..797005d 100644
--- a/kerberos5/usr.bin/kdestroy/Makefile
+++ b/kerberos5/usr.bin/kdestroy/Makefile
@@ -15,9 +15,9 @@ _krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/kinit/Makefile b/kerberos5/usr.bin/kinit/Makefile
index 3dcfc33..8618f35 100644
--- a/kerberos5/usr.bin/kinit/Makefile
+++ b/kerberos5/usr.bin/kinit/Makefile
@@ -15,9 +15,9 @@ _krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/klist/Makefile b/kerberos5/usr.bin/klist/Makefile
index 5dfd39f..e40949d 100644
--- a/kerberos5/usr.bin/klist/Makefile
+++ b/kerberos5/usr.bin/klist/Makefile
@@ -15,9 +15,9 @@ _krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.bin/kpasswd/Makefile b/kerberos5/usr.bin/kpasswd/Makefile
index 55d5062..298645b 100644
--- a/kerberos5/usr.bin/kpasswd/Makefile
+++ b/kerberos5/usr.bin/kpasswd/Makefile
@@ -14,9 +14,9 @@ _krb4libs= -lkrb -lkafs
_krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.sbin/k5admin/Makefile b/kerberos5/usr.sbin/k5admin/Makefile
index 7f181df..efb6211 100644
--- a/kerberos5/usr.sbin/k5admin/Makefile
+++ b/kerberos5/usr.sbin/k5admin/Makefile
@@ -23,10 +23,11 @@ LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
-L${HDBOBJDIR} -lhdb -L${SLOBJDIR} -lsl \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err -lreadline
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err -lreadline
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBREADLINE}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} \
+ ${LIBREADLINE}
NOMAN= yes
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.sbin/k5stash/Makefile b/kerberos5/usr.sbin/k5stash/Makefile
index 89b1b52..6b690d1 100644
--- a/kerberos5/usr.sbin/k5stash/Makefile
+++ b/kerberos5/usr.sbin/k5stash/Makefile
@@ -17,9 +17,9 @@ _krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
MAN8= kstash.8
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.sbin/kadmin/Makefile b/kerberos5/usr.sbin/kadmin/Makefile
index 7f181df..efb6211 100644
--- a/kerberos5/usr.sbin/kadmin/Makefile
+++ b/kerberos5/usr.sbin/kadmin/Makefile
@@ -23,10 +23,11 @@ LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
-L${HDBOBJDIR} -lhdb -L${SLOBJDIR} -lsl \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err -lreadline
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err -lreadline
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBREADLINE}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} \
+ ${LIBREADLINE}
NOMAN= yes
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.sbin/kstash/Makefile b/kerberos5/usr.sbin/kstash/Makefile
index 89b1b52..6b690d1 100644
--- a/kerberos5/usr.sbin/kstash/Makefile
+++ b/kerberos5/usr.sbin/kstash/Makefile
@@ -17,9 +17,9 @@ _krb4deps= ${LIBKRB} ${LIBKAFS}
.endif
LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
- -L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
+ -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
- ${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
+ ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
MAN8= kstash.8
.include <bsd.prog.mk>
diff --git a/kerberos5/usr.sbin/ktutil/Makefile b/kerberos5/usr.sbin/ktutil/Makefile
index 5f61e2b..903afc8 100644
--- a/kerberos5/usr.sbin/ktutil/Makefile
+++ b/kerberos5/usr.sbin/ktutil/Makefile
@@ -21,10 +21,10 @@ LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
-L${ROKENOBJDIR} -lroken ${_krb4libs} \
-L${SLOBJDIR} -lsl -L${ASN1OBJDIR} -lasn1 \
-L${KADM5COBJDIR} -lkadm5clnt \
- -ldes -lcrypt -lcom_err -lreadline
+ -lcrypto -lmd -lcrypt -lcom_err -lreadline
DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
${LIBSL} ${LIBASN1} ${LIBKADM5CLNT} \
- ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBREADLINE}
+ ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBREADLINE}
MAN8= ktutil.8
.include <bsd.prog.mk>
OpenPOWER on IntegriCloud