From 8a0419ded66b99b8e6fd117e622360df84b066d5 Mon Sep 17 00:00:00 2001 From: Joerg Sonnenberger Date: Tue, 28 Sep 2004 18:17:37 +0000 Subject: [PATCH] We now have pidfile in libutil, update kerberos5 accordingly. Submitted-by: Pete Carah --- kerberos5/include/config.h | 4 ++-- kerberos5/libexec/ipropd-master/Makefile | 8 +++++--- kerberos5/libexec/ipropd-slave/Makefile | 8 +++++--- kerberos5/libexec/k5admind/Makefile | 8 +++++--- kerberos5/libexec/k5passwdd/Makefile | 8 +++++--- kerberos5/libexec/kdc/Makefile | 8 +++++--- 6 files changed, 27 insertions(+), 17 deletions(-) diff --git a/kerberos5/include/config.h b/kerberos5/include/config.h index 173231b6a4..a5e79ab9cd 100644 --- a/kerberos5/include/config.h +++ b/kerberos5/include/config.h @@ -2,7 +2,7 @@ /* include/config.h.in. Generated automatically from configure.in by autoheader. */ /* $FreeBSD: src/kerberos5/include/config.h,v 1.2.2.7 2002/12/01 17:45:32 nectar Exp $ */ -/* $DragonFly: src/kerberos5/include/config.h,v 1.2 2003/06/17 04:26:17 dillon Exp $ */ +/* $DragonFly: src/kerberos5/include/config.h,v 1.3 2004/09/28 18:17:37 joerg Exp $ */ #include @@ -548,7 +548,7 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg } #define HAVE_PATHS_H 1 /* Define to 1 if you have the `pidfile' function. */ -/* #undef HAVE_PIDFILE */ +#define HAVE_PIDFILE 1 /* Define to 1 if you have the header file. */ #define HAVE_PTHREAD_H 1 diff --git a/kerberos5/libexec/ipropd-master/Makefile b/kerberos5/libexec/ipropd-master/Makefile index 0cd21a6709..664a290e72 100644 --- a/kerberos5/libexec/ipropd-master/Makefile +++ b/kerberos5/libexec/ipropd-master/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/kerberos5/libexec/ipropd-master/Makefile,v 1.3.2.3 2002/09/23 14:00:44 nectar Exp $ -# $DragonFly: src/kerberos5/libexec/ipropd-master/Makefile,v 1.3 2003/08/05 07:45:40 asmodai Exp $ +# $DragonFly: src/kerberos5/libexec/ipropd-master/Makefile,v 1.4 2004/09/28 18:17:37 joerg Exp $ PROG= ipropd-master SRCS= ipropd_master.c iprop.h kadm5_locl.h kadm5_err.h hdb_err.h @@ -19,9 +19,11 @@ LDADD= \ -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ ${_krb4libs} \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err + -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err \ + -lutil DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} + ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} \ + ${LIBUTIL} NOMAN= yes .include diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile index 2ac7f3d587..916e7daa00 100644 --- a/kerberos5/libexec/ipropd-slave/Makefile +++ b/kerberos5/libexec/ipropd-slave/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/kerberos5/libexec/ipropd-slave/Makefile,v 1.3.2.3 2002/09/23 14:00:48 nectar Exp $ -# $DragonFly: src/kerberos5/libexec/ipropd-slave/Makefile,v 1.3 2003/08/05 07:45:40 asmodai Exp $ +# $DragonFly: src/kerberos5/libexec/ipropd-slave/Makefile,v 1.4 2004/09/28 18:17:37 joerg Exp $ PROG= ipropd-slave SRCS= ipropd_slave.c iprop.h kadm5_locl.h kadm5_err.h hdb_err.h @@ -19,9 +19,11 @@ LDADD= \ -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ ${_krb4libs} \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err + -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err \ + -lutil DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} + ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} \ + ${LIBUTIL} NOMAN= yes .include diff --git a/kerberos5/libexec/k5admind/Makefile b/kerberos5/libexec/k5admind/Makefile index b6a1f7fc39..db2a9d174b 100644 --- a/kerberos5/libexec/k5admind/Makefile +++ b/kerberos5/libexec/k5admind/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/kerberos5/libexec/k5admind/Makefile,v 1.4.2.3 2002/09/23 14:00:48 nectar Exp $ -# $DragonFly: src/kerberos5/libexec/k5admind/Attic/Makefile,v 1.3 2003/08/05 07:45:40 asmodai Exp $ +# $DragonFly: src/kerberos5/libexec/k5admind/Attic/Makefile,v 1.4 2004/09/28 18:17:37 joerg Exp $ PROG= k5admind SRCS= kadmind.c server.c kadm_conn.c \ @@ -22,10 +22,12 @@ LDADD= \ -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ ${_krb4libs} \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err + -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err \ + -lutil DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \ ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} + ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} \ + ${LIBUTIL} NOMAN= yes .include diff --git a/kerberos5/libexec/k5passwdd/Makefile b/kerberos5/libexec/k5passwdd/Makefile index 0d0497d62b..067724162e 100644 --- a/kerberos5/libexec/k5passwdd/Makefile +++ b/kerberos5/libexec/k5passwdd/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/kerberos5/libexec/k5passwdd/Makefile,v 1.4.2.4 2002/09/01 04:22:02 nectar Exp $ -# $DragonFly: src/kerberos5/libexec/k5passwdd/Attic/Makefile,v 1.3 2003/08/05 07:45:40 asmodai Exp $ +# $DragonFly: src/kerberos5/libexec/k5passwdd/Attic/Makefile,v 1.4 2004/09/28 18:17:37 joerg Exp $ PROG= k5passwdd SRCS= kpasswdd.c krb5_err.h heim_err.h hdb_err.h \ @@ -18,9 +18,11 @@ LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ ${_krb4libs} \ -L${KADM5SOBJDIR} -lkadm5srv -L${HDBOBJDIR} -lhdb \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err + -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err \ + -lutil DPADD= ${LIBKRB5} ${LIBROKEN} ${_krb4deps} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} + ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \ + ${LIBUTIL} MAN= kpasswdd.8 .include diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile index db90b2602b..73d2918a48 100644 --- a/kerberos5/libexec/kdc/Makefile +++ b/kerberos5/libexec/kdc/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/kerberos5/libexec/kdc/Makefile,v 1.3.2.4 2002/07/25 09:33:15 ru Exp $ -# $DragonFly: src/kerberos5/libexec/kdc/Makefile,v 1.3 2003/08/05 07:45:40 asmodai Exp $ +# $DragonFly: src/kerberos5/libexec/kdc/Makefile,v 1.4 2004/09/28 18:17:37 joerg Exp $ PROG= kdc SRCS= \ @@ -25,9 +25,11 @@ LDADD= -L${KRB5OBJDIR} -lkrb5 \ -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ -L${VERSOBJDIR} -lvers \ ${_krb4libs} \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err + -L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err \ + -lutil DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${_krb4deps} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} + ${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR} \ + ${LIBUTIL} MAN= kdc.8 .include -- 2.41.0