head	1.22;
access;
symbols
	RELENG_8_4:1.22.0.2
	RELENG_9_1_0_RELEASE:1.19.4.1.4.2
	RELENG_9_1:1.19.4.1.0.4
	RELENG_9_1_BP:1.19.4.1
	RELENG_8_3_0_RELEASE:1.19.2.1.8.1
	RELENG_8_3:1.19.2.1.0.8
	RELENG_8_3_BP:1.19.2.1
	RELENG_9_0_0_RELEASE:1.19.4.1.2.1
	RELENG_9_0:1.19.4.1.0.2
	RELENG_9_0_BP:1.19.4.1
	RELENG_9:1.19.0.4
	RELENG_9_BP:1.19
	RELENG_7_4_0_RELEASE:1.18.32.1
	RELENG_8_2_0_RELEASE:1.19.2.1.6.1
	RELENG_7_4:1.18.0.32
	RELENG_7_4_BP:1.18
	RELENG_8_2:1.19.2.1.0.6
	RELENG_8_2_BP:1.19.2.1
	RELENG_8_1_0_RELEASE:1.19.2.1.4.1
	RELENG_8_1:1.19.2.1.0.4
	RELENG_8_1_BP:1.19.2.1
	RELENG_7_3_0_RELEASE:1.18.30.1
	RELENG_7_3:1.18.0.30
	RELENG_7_3_BP:1.18
	RELENG_8_0_0_RELEASE:1.19.2.1.2.1
	RELENG_8_0:1.19.2.1.0.2
	RELENG_8_0_BP:1.19.2.1
	RELENG_8:1.19.0.2
	RELENG_8_BP:1.19
	RELENG_7_2_0_RELEASE:1.18.28.1
	RELENG_7_2:1.18.0.28
	RELENG_7_2_BP:1.18
	RELENG_7_1_0_RELEASE:1.18.26.1
	RELENG_6_4_0_RELEASE:1.18.24.1
	RELENG_7_1:1.18.0.26
	RELENG_7_1_BP:1.18
	RELENG_6_4:1.18.0.24
	RELENG_6_4_BP:1.18
	RELENG_7_0_0_RELEASE:1.18
	RELENG_6_3_0_RELEASE:1.18
	RELENG_7_0:1.18.0.22
	RELENG_7_0_BP:1.18
	RELENG_6_3:1.18.0.20
	RELENG_6_3_BP:1.18
	RELENG_7:1.18.0.18
	RELENG_7_BP:1.18
	RELENG_6_2_0_RELEASE:1.18
	RELENG_6_2:1.18.0.16
	RELENG_6_2_BP:1.18
	RELENG_5_5_0_RELEASE:1.18
	RELENG_5_5:1.18.0.14
	RELENG_5_5_BP:1.18
	RELENG_6_1_0_RELEASE:1.18
	RELENG_6_1:1.18.0.12
	RELENG_6_1_BP:1.18
	RELENG_6_0_0_RELEASE:1.18
	RELENG_6_0:1.18.0.10
	RELENG_6_0_BP:1.18
	RELENG_6:1.18.0.8
	RELENG_6_BP:1.18
	RELENG_5_4_0_RELEASE:1.18
	RELENG_5_4:1.18.0.6
	RELENG_5_4_BP:1.18
	RELENG_5_3_0_RELEASE:1.18
	RELENG_5_3:1.18.0.4
	RELENG_5_3_BP:1.18
	RELENG_5:1.18.0.2
	RELENG_5_BP:1.18
	RELENG_5_2_1_RELEASE:1.14
	RELENG_5_2_0_RELEASE:1.14
	RELENG_5_2:1.14.0.2
	RELENG_5_2_BP:1.14
	RELENG_5_1_0_RELEASE:1.11
	RELENG_5_1:1.11.0.2
	RELENG_5_1_BP:1.11
	old_RELENG_5_0_0_RELEASE:1.9
	old_RELENG_5_0:1.9.0.2
	old_RELENG_5_0_BP:1.9
	old_RELENG_4_7_0_RELEASE:1.4.2.3
	old_RELENG_4_7:1.4.2.3.0.2
	old_RELENG_4_7_BP:1.4.2.3
	old_RELENG_4_6_2_RELEASE:1.4.2.1
	old_RELENG_4_6_1_RELEASE:1.4.2.1
	old_RELENG_4_6_0_RELEASE:1.4.2.1
	old_RELENG_4_6:1.4.2.1.0.8
	old_RELENG_4_6_BP:1.4.2.1
	old_RELENG_4_5_0_RELEASE:1.4.2.1
	old_RELENG_4_5:1.4.2.1.0.6
	old_RELENG_4_5_BP:1.4.2.1
	old_RELENG_4_4_0_RELEASE:1.4.2.1
	old_RELENG_4_4:1.4.2.1.0.4
	old_RELENG_4_4_BP:1.4.2.1
	old_RELENG_4_3_0_RELEASE:1.4.2.1
	old_RELENG_4_3:1.4.2.1.0.2
	old_RELENG_4_3_BP:1.4.2.1
	old_RELENG_4_2_0_RELEASE:1.4
	old_RELENG_4_1_1_RELEASE:1.4
	old_PRE_SMPNG:1.5
	old_RELENG_4_1_0_RELEASE:1.4
	old_RELENG_4_0_0_RELEASE:1.4
	old_RELENG_4:1.4.0.2
	old_RELENG_4_BP:1.4
	old_v_0_2_m:1.1.1.1
	old_MARKM:1.1.1;
locks; strict;
comment	@# @;


1.22
date	2012.11.17.01.49.17;	author svnexp;	state Exp;
branches
	1.22.2.1;
next	1.21;

1.21
date	2012.05.30.22.21.25;	author obrien;	state Exp;
branches;
next	1.20;

1.20
date	2012.03.22.08.48.42;	author stas;	state Exp;
branches;
next	1.19;

1.19
date	2008.05.07.13.53.06;	author dfr;	state Exp;
branches
	1.19.2.1
	1.19.4.1;
next	1.18;

1.18
date	2004.02.05.18.51.50;	author ru;	state Exp;
branches
	1.18.8.1
	1.18.18.1
	1.18.24.1
	1.18.26.1
	1.18.28.1
	1.18.30.1
	1.18.32.1;
next	1.17;

1.17
date	2004.02.04.10.23.08;	author ru;	state Exp;
branches;
next	1.16;

1.16
date	2004.01.31.08.15.55;	author ru;	state Exp;
branches;
next	1.15;

1.15
date	2004.01.30.11.06.48;	author mr;	state Exp;
branches;
next	1.14;

1.14
date	2003.07.18.13.21.56;	author markm;	state Exp;
branches;
next	1.13;

1.13
date	2003.07.02.23.46.37;	author ru;	state Exp;
branches;
next	1.12;

1.12
date	2003.06.18.09.11.33;	author mr;	state Exp;
branches;
next	1.11;

1.11
date	2003.03.09.21.56.52;	author markm;	state Exp;
branches;
next	1.10;

1.10
date	2003.03.08.08.57.55;	author marcel;	state Exp;
branches;
next	1.9;

1.9
date	2002.09.20.17.31.03;	author nectar;	state Exp;
branches;
next	1.8;

1.8
date	2002.08.04.22.23.47;	author fjoe;	state Exp;
branches;
next	1.7;

1.7
date	2002.04.26.17.55.23;	author ru;	state Exp;
branches;
next	1.6;

1.6
date	2001.02.13.16.56.57;	author assar;	state Exp;
branches;
next	1.5;

1.5
date	2000.03.23.14.56.37;	author markm;	state Exp;
branches;
next	1.4;

1.4
date	2000.03.01.13.50.35;	author markm;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2000.02.28.19.15.12;	author markm;	state Exp;
branches;
next	1.2;

1.2
date	2000.02.24.21.15.02;	author markm;	state Exp;
branches;
next	1.1;

1.1
date	2000.01.15.21.38.04;	author markm;	state Exp;
branches
	1.1.1.1;
next	;

1.22.2.1
date	2012.11.17.01.49.17;	author svnexp;	state dead;
branches;
next	1.22.2.2;

1.22.2.2
date	2013.03.28.13.02.55;	author svnexp;	state Exp;
branches;
next	;

1.19.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.19.2.1.2.1
	1.19.2.1.4.1
	1.19.2.1.6.1
	1.19.2.1.8.1;
next	1.19.2.2;

1.19.2.2
date	2012.11.17.10.36.00;	author svnexp;	state Exp;
branches;
next	;

1.19.2.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.19.2.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.19.2.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.19.2.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.19.2.1.8.2;

1.19.2.1.8.2
date	2012.11.17.08.24.41;	author svnexp;	state Exp;
branches;
next	;

1.19.4.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.19.4.1.2.1
	1.19.4.1.4.1;
next	1.19.4.2;

1.19.4.2
date	2012.11.17.11.36.15;	author svnexp;	state Exp;
branches;
next	;

1.19.4.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.19.4.1.2.2;

1.19.4.1.2.2
date	2012.11.17.08.36.15;	author svnexp;	state Exp;
branches;
next	;

1.19.4.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.19.4.1.4.2;

1.19.4.1.4.2
date	2012.11.17.08.47.05;	author svnexp;	state Exp;
branches;
next	;

1.18.8.1
date	2012.11.17.07.39.29;	author svnexp;	state Exp;
branches;
next	;

1.18.18.1
date	2012.11.17.08.01.43;	author svnexp;	state Exp;
branches;
next	;

1.18.24.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.18.26.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.18.28.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.18.30.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.18.32.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.18.32.2;

1.18.32.2
date	2012.11.17.08.16.40;	author svnexp;	state Exp;
branches;
next	;

1.4.2.1
date	2001.03.04.13.50.07;	author markm;	state Exp;
branches;
next	1.4.2.2;

1.4.2.2
date	2002.07.25.09.33.15;	author ru;	state Exp;
branches;
next	1.4.2.3;

1.4.2.3
date	2002.09.23.14.00.48;	author nectar;	state Exp;
branches;
next	;

1.1.1.1
date	2000.01.15.21.38.04;	author markm;	state Exp;
branches;
next	;


desc
@@


1.22
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/kerberos5/libexec/kadmind/Makefile 236337 2012-05-30 22:21:25Z obrien $

PROG=	kadmind
MAN=	kadmind.8
SRCS=	rpc.c \
	server.c \
	kadmind.c \
	kadm_conn.c

CFLAGS+=-I${KRB5DIR}/lib/krb5 -I${KRB5DIR}/lib/asn1 -I${KRB5DIR}/lib/roken \
	${LDAPCFLAGS}
DPADD=	${LIBKADM5SRV} ${LIBGSSAPI} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} \
	${LIBASN1} ${LIBVERS} ${LIBCRYPTO} ${LIBCRYPT} ${LDAPDPADD}
LDADD=	-lkadm5srv -lgssapi -lhdb -lkrb5 -lroken \
	-lasn1 ${LIBVERS} -lcrypto -lcrypt ${LDAPLDADD}
LDFLAGS=${LDAPLDFLAGS}

.include <bsd.prog.mk>

.PATH: ${KRB5DIR}/kadmin
@


1.22.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:02:55 +0000
@
text
@d1 20
@


1.22.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 16
# $FreeBSD: releng/8.4/kerberos5/libexec/kadmind/Makefile 178828 2008-05-07 13:53:12Z dfr $

PROG=	kadmind
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} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
LDADD=	-lkadm5srv -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
LDFLAGS=${LDAPLDFLAGS}

.include <bsd.prog.mk>

.PATH: ${KRB5DIR}/kadmin
@


1.21
log
@SVN rev 236337 on 2012-05-30 22:21:25Z by obrien

* Remove headers from SRCS that are not generated
  (and are in /usr/src/crypto/heimdal/).

* Avoid race conditions with 'make -j<N>'.
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.20
log
@SVN rev 233294 on 2012-03-22 08:48:42Z by stas

- Update FreeBSD Heimdal distribution to version 1.5.1.  This also brings
  several new kerberos related libraries and applications to FreeBSD:
  o kgetcred(1) allows one to manually get a ticket for a particular service.
  o kf(1) securily forwards ticket to another host through an authenticated
    and encrypted stream.
  o kcc(1) is an umbrella program around klist(1), kswitch(1), kgetcred(1)
    and other user kerberos operations. klist and kswitch are just symlinks
    to kcc(1) now.
  o kswitch(1) allows you to easily switch between kerberos credentials if
    you're running KCM.
  o hxtool(1) is a certificate management tool to use with PKINIT.
  o string2key(1) maps a password into key.
  o kdigest(8) is a userland tool to access the KDC's digest interface.
  o kimpersonate(8) creates a "fake" ticket for a service.

  We also now install manpages for some lirbaries that were not installed
  before, libheimntlm and libhx509.

- The new HEIMDAL version no longer supports Kerberos 4.  All users are
  recommended to switch to Kerberos 5.

- Weak ciphers are now disabled by default.  To enable DES support (used
  by telnet(8)), use "allow_weak_crypto" option in krb5.conf.

- libtelnet, pam_ksu and pam_krb5 are now compiled with error on warnings
  disabled due to the function they use (krb5_get_err_text(3)) being
  deprecated.  I plan to work on this next.

- Heimdal's KDC now require sqlite to operate.  We use the bundled version
  and install it as libheimsqlite.  If some other FreeBSD components will
  require it in the future we can rename it to libbsdsqlite and use for these
  components as well.

- This is not a latest Heimdal version, the new one was released while I was
  working on the update.  I will update it to 1.5.2 soon, as it fixes some
  important bugs and security issues.
@
text
@a7 1
	kadmin_locl.h \
@


1.19
log
@Fix conflicts after heimdal-1.1 import and add build infrastructure. Import
all non-style changes made by heimdal to our own libgssapi.
@
text
@d5 6
a10 1
SRCS=	kadm_conn.c kadmind.c server.c
d13 4
a16 4
DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}
LDADD=	-lkadm5srv -lhdb -lkrb5 -lhx509 -lroken ${LIBVERS} \
	-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
@


1.19.4.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.19.4.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/kerberos5/libexec/kadmind/Makefile 178828 2008-05-07 13:53:12Z dfr $
@


1.19.4.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.19.4.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/kerberos5/libexec/kadmind/Makefile 178828 2008-05-07 13:53:12Z dfr $
@


1.19.4.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.19.4.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/kerberos5/libexec/kadmind/Makefile 178828 2008-05-07 13:53:12Z dfr $
@


1.19.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.19.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/kerberos5/libexec/kadmind/Makefile 178828 2008-05-07 13:53:12Z dfr $
@


1.19.2.1.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.19.2.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/kerberos5/libexec/kadmind/Makefile 178828 2008-05-07 13:53:12Z dfr $
@


1.19.2.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.19.2.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.19.2.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.18
log
@style.Makefile(5).

OK'ed by:	nectar
@
text
@d8 1
a8 1
DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
d10 1
a10 1
LDADD=	-lkadm5srv -lhdb -lkrb5 -lroken ${LIBVERS} \
@


1.18.18.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/kerberos5/libexec/kadmind/Makefile 125491 2004-02-05 18:51:52Z ru $
@


1.18.8.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/kerberos5/libexec/kadmind/Makefile 125491 2004-02-05 18:51:52Z ru $
@


1.18.32.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.18.32.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/kerberos5/libexec/kadmind/Makefile 125491 2004-02-05 18:51:52Z ru $
@


1.18.30.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.18.28.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.18.26.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.18.24.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.17
log
@Put libraries in the link order.

Reported by:	lorder(1) (modified to work with libraries)
@
text
@d4 3
a6 8

SRCS=	kadmind.c			\
	server.c			\
	kadm_conn.c

CFLAGS+=-I${KRB5DIR}/lib/roken		\
	-I${KRB5DIR}/lib/krb5		\
	-I${KRB5DIR}/lib/asn1		\
d8 2
a9 1

a11 1

a13 5
DPADD=	${LIBKADM5SRV} ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPDPADD}

MAN=	kadmind.8

d16 1
a16 1
.PATH:	${KRB5DIR}/kadmin
@


1.16
log
@Overhaul of kerberos5/ makefiles.  Most significant changes are:

- Dropped support for standalone builds, this was only partially
  supported anyway, and required so much magic in makefiles that
  made life dangerous (e.g., by using the custom yacc rules).

- Got rid of .OBJDIR in makefiles -- makes building of individual
  files possible again.

- Made the .x.c transformations -j safe.

- Reprogrammed LDADD to fix static build of some utilities that
  was broken.

- Fixed LDFLAGS and DPADD in the WITH_OPENLDAP case -- positively
  affects the contents of .depend files.

- Removed redundant .h's from SRCS, only kept those that are
  generated.

- libkrb5/ INCS were bogusly installed again with libgssapi/.

- Made build-tools real tools with their own makefiles in
  separate directories.  This allows us to properly track
  their dependencies, etc.

- Faster build, 21% less of makefile code!

Approved by:	nectar
Reviewed by:	markm
Silence on:	arch
@
text
@d14 1
a14 1
LDADD=	-lkrb5 -lroken ${LIBVERS} -lkadm5srv -lhdb \
d19 1
a19 1
DPADD=	${LIBKRB5} ${LIBROKEN} ${LIBVERS} ${LIBKADM5SRV} ${LIBHDB} \
@


1.15
log
@add hprop to the build and add LDAP mods to hprop.
add kadmind.8

Submitted by:	Alex Deiter <tiamat@@komi.mts.ru>
@
text
@d7 1
a7 4
	kadm_conn.c			\
	${.OBJDIR}/kadm5/private.h	\
	${.OBJDIR}/kadm5/admin.h	\
	${.OBJDIR}/kadm5/kadm5_err.h
d9 1
a9 2
CFLAGS+=-I${KRB5DIR}/include		\
	-I${KRB5DIR}/lib/roken		\
a11 7
	-I${KRB5DIR}/lib/hdb		\
	-I${KRB5DIR}/lib/sl		\
	-I${KRB5DIR}/lib/kadm5		\
	-I${KRB5DIR}/kadmin		\
	-I${ASN1OBJDIR}			\
	-I${HDBOBJDIR}			\
	-I${.OBJDIR}			\
d17 2
d20 1
a20 1
	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
a26 15

${.OBJDIR}/kadm5/private.h:	${.OBJDIR}/kadm5
	cat ${KRB5DIR}/lib/kadm5/private.h > ${.TARGET}

${.OBJDIR}/kadm5/admin.h:	${.OBJDIR}/kadm5
	cat ${KRB5DIR}/lib/kadm5/admin.h > ${.TARGET}

${.OBJDIR}/kadm5/kadm5_err.h: ${.OBJDIR}/kadm5 ${.OBJDIR}/kadm5_err.h
	cd ${.OBJDIR}/kadm5 && ln -sf ../kadm5_err.h

${.OBJDIR}/kadm5:
	mkdir ${.TARGET}

CLEANFILES+=	kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
CLEANDIRS+=	kadm5
@


1.14
log
@Big fixup of the makefiles. Sort out the dependancies so that "make"
without "make depend" works, "make -j N" works, and lists of source
files are made vertical to reduce future diffs.
@
text
@d31 1
a31 1
NOMAN=	yes
@


1.13
log
@Fixed "make checkdpadd".

OK'ed by:	markm
@
text
@d3 29
a31 20
PROG=		kadmind
SRCS=		kadmind.c server.c kadm_conn.c \
		kadm5/private.h kadm5/admin.h kadm5/kadm5_err.h
CFLAGS+=	-I${KRB5DIR}/include \
		-I${KRB5DIR}/lib/roken \
		-I${KRB5DIR}/lib/krb5 \
		-I${KRB5DIR}/lib/asn1 \
		-I${KRB5DIR}/lib/hdb \
		-I${KRB5DIR}/lib/sl \
		-I${KRB5DIR}/lib/kadm5 \
		-I${KRB5DIR}/kadmin \
		-I${ASN1OBJDIR} \
		-I${HDBOBJDIR} \
		-I${.OBJDIR} \
		${LDAPCFLAGS}
LDADD=		-lkrb5 -lroken ${LIBVERS} -lkadm5srv -lhdb \
		-lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
DPADD=		${LIBKRB5} ${LIBROKEN} ${LIBVERS} ${LIBKADM5SRV} ${LIBHDB} \
		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS}
NOMAN=		yes
d37 1
a37 1
kadm5/private.h:	kadm5
d40 1
a40 1
kadm5/admin.h:	kadm5
d43 1
a43 1
kadm5/kadm5_err.h: kadm5 kadm5_err.h
d46 1
a46 1
kadm5:
@


1.12
log
@Add (optional, default off) support to kerberos5 for supporting openldap.
Tests with openldap20 where successful whereas openldap21 didn't like
the way hdb-ldap accessed openldap (doesn't like non-bind access).
To activate the support put a USE_OPENLDAP=yes in your make.conf.
The OPENLDAPBASE is also optional and points to /usr/local as default.

Approved by:	markm
MFC after:	2 weeks
@
text
@d18 3
a20 8
LDADD=		-L${KRB5OBJDIR} -lkrb5 \
		-L${ROKENOBJDIR} -lroken \
		-L${VERSOBJDIR} -lvers \
		-L${KADM5SOBJDIR} -lkadm5srv \
		-L${HDBOBJDIR} -lhdb \
		-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD}
DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \
		${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \
@


1.11
log
@Post KerberosIV de-orbit: Clean up Kerberos5. We dont need KerberosIV
compatiblity mode anymore. Rename the k5foo utils to kfoo (after
repo-copy).
@
text
@d16 2
a17 1
		-I${.OBJDIR}
d23 1
a23 1
		-L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err
d26 1
a26 1
		${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
@


1.10
log
@Don't copy headers from the source tree to the object tree without
making sure the copies in the object tree are writable. When files
in the source tree are not writable (as would be the case for a p4
tree) then a buildworld -DNOCLEAN will try to copy over the existing
non-writable headers. This fails. Instead we cat the headers with
redirection. This is just one of the possibilities.
@
text
@d3 1
a3 1
PROG=		k5admind
a16 5
.if defined(MAKE_KERBEROS4)
SRCS+=		version4.c
_krb4libs=	-lkrb -lkafs
_krb4deps=	${LIBKRB} ${LIBKAFS}
.endif
a19 1
		${_krb4libs} \
d23 1
a23 1
DPADD=		${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} ${_krb4deps} \
@


1.9
log
@Fix k5admind by dropping libkadm5clnt from LDADD.
@
text
@d39 1
a39 1
	cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}
d42 1
a42 1
	cp ${KRB5DIR}/lib/kadm5/admin.h ${.TARGET}
@


1.8
log
@Kerberos 5 no longer needs -lmd

Approved by:	nectar
@
text
@d26 1
a26 1
		-L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \
@


1.7
log
@Milestone #1 in cross-arch make releases.

Do not install games and profiled libraries to the ${CHROOTDIR}
with the initial installworld.

Eliminate the need in the second installworld.  For that, make sure
_everything_ is built in the "world" environment, using the right
tool chain.

Added SUBDIR_OVERRIDE helper stuff to Makefile.inc1.  Split the
buildworld process into stages, and skip some stages when
SUBDIR_OVERRIDE is set (used to build crypto, krb4, and krb5
dists).

Added NO_MAKEDB_RUN knob to Makefile.inc1 to avoid running
makewhatis(1) at the end of installworld (used when making crypto,
krb4, and krb5 dists).

In release/scripts/doFS.sh, ensure that the correct boot blocks are
used.

Moved the creation of the "crypto" dist from release.5 to
release.2.

In release.3 and doMFSKERN, build kernels in the "world"
environment.  KERNELS now means "additional" kernels, GENERIC is
always built.

Ensure we build crunched binaries in the "world" environment.
Obfuscate release/Makefile some more (WMAKEENV) to achieve this.

Inline createBOOTMFS target.

Use already built GENERIC kernel modules to augment mfsfd's
/stand/modules.  GC doMODULES as such.

Assorted fixes:

Get rid of the "afterdistribute" target by moving the single use
of it from sys/Makefile to etc/Makefile's "distribute".

Makefile.inc1: apparently "etc" no longer needs to be last for
"distribute" to succeed.

gnu/usr.bin/perl/library/Makefile.inc: do not override the
"install" and "distribute" targets, do it the "canonical" way.

release/scripts/{man,cat}pages-make.sh: make sure Perl manpages and
catpages appear in the right dists.  Note that because Perl does
not respect the MANBUILDCAT (and NOMAN), this results in a loss of
/usr/share/perl/man/cat* empty directories.  This will be fixed
soon.

Turn MAKE_KERBEROS4 into a plain boolean variable (if it is set it
means "make KerberosIV"), as documented in the make.conf(5)
manpage.  Most of the userland makefiles did not test it for "YES"
anyway.

XXX Should specialized kerberized libpam versions be included into
the krb4 and krb5 dists?  (libpam.a would be incorrect anyway if
both krb4 and krb5 dists were choosen.)

Make sure "games" dist is made before "catpages", otherwise games
catpages settle in the wrong dist.

Fast build machine provided by: Igor Kucherenko <kivvy@@sunbay.com>
@
text
@d28 1
a28 1
		-L${ASN1OBJDIR} -lasn1 -lcrypto -lmd -lcrypt -lcom_err
d31 1
a31 1
		${LIBASN1} ${LIBCRYPTO} ${LIBMD} ${LIBCRYPT} ${LIBCOM_ERR}
@


1.6
log
@update build infrastructure for heimdal 0.3e
@
text
@d1 1
a1 1
# $FreeBSD: src/kerberos5/libexec/k5admind/Makefile,v 1.5 2000/03/23 14:56:37 markm Exp $
d17 1
a17 2
.if defined(MAKE_KERBEROS4) && \
	(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
@


1.5
log
@Properly separate the K5-only buld from K4.

Submitted by:	sheldonh
@
text
@d1 1
a1 1
# $FreeBSD: src/kerberos5/libexec/k5admind/Makefile,v 1.4 2000/03/01 13:50:35 markm Exp $
d4 1
a4 1
SRCS=		kadmind.c server.c \
d12 1
d24 3
a26 1
		-L${ROKENOBJDIR} -lroken ${_krb4libs} \
@


1.4
log
@KerberosIV is no longer compulsory. This should fix "make release".
@
text
@d1 1
a1 1
# $FreeBSD: src/kerberos5/libexec/k5admind/Makefile,v 1.3 2000/02/28 19:15:12 markm Exp $
d16 2
a17 1
.if defined(MAKE_KERBEROS4)
@


1.4.2.1
log
@MFC: Heimdal 0.3e build stuff.
@
text
@d1 1
a1 1
# $FreeBSD$
d4 1
a4 1
SRCS=		kadmind.c server.c kadm_conn.c \
a11 1
		-I${KRB5DIR}/lib/kadm5 \
d16 1
a16 2
.if defined(MAKE_KERBEROS4) && \
	(${MAKE_KERBEROS4} == "YES" || ${MAKE_KERBEROS4} == "yes")
d22 1
a22 3
		-L${ROKENOBJDIR} -lroken \
		-L${VERSOBJDIR} -lvers \
		${_krb4libs} \
@


1.4.2.2
log
@MFC: cross-release support.

Assorted fixes:

- Changed the way the `catpages' dist is built (all MD catpages
  were missing before).

- Perl manpages now end up in the `manpage' dist.

- Clean up the `dict' dist generation script.

- Diff reduction to -CURRENT.
@
text
@d17 2
a18 1
.if defined(MAKE_KERBEROS4)
@


1.4.2.3
log
@MFC src/kerberos5/libexec/ipropd-master/Makefile 1.8, 1.9;
    src/kerberos5/libexec/ipropd-slave/Makefile 1.8, 1.9;
    src/kerberos5/libexec/k5admind/Makefile 1.9:
Drop libkadm5clnt from set of libraries included when building
these daemons so that they actually work.

Approved by:	re (jhb)
@
text
@d22 1
a22 4
LDADD=		\
		-L${KADM5SOBJDIR} -lkadm5srv \
		-L${KRB5OBJDIR} -lkrb5 \
		-L${HDBOBJDIR} -lhdb \
d26 2
@


1.3
log
@Remove largescale evidence of crack-smoking.

Where a k4 applet has a k5 namesake, rename the k5 version
from k<app> to k5<app>. (Repo copy done).

Do some repairs to dependancies to support make world properly.
@
text
@d1 1
a1 1
# $FreeBSD: src/kerberos5/libexec/k5admind/Makefile,v 1.2 2000/02/24 21:15:02 markm Exp $
d4 1
a4 1
SRCS=		kadmind.c server.c version4.c \
d16 2
a17 1
.if defined(KRB5_KRB4_COMPAT)
d21 1
a21 1
LDADD=		-L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \
@


1.2
log
@Use libcrypto instead of libdes. Upgrade for Heimdal-0.2p
@
text
@d1 1
a1 1
# $FreeBSD: src/kerberos5/libexec/kadmind/Makefile,v 1.1.1.1 2000/01/15 21:38:04 markm Exp $
d3 1
a3 1
PROG=		kadmind
@


1.1
log
@Initial revision
@
text
@d1 1
a1 1
# $FreeBSD$
d24 1
a24 1
		-L${ASN1OBJDIR} -lasn1 -ldes -lcrypt -lcom_err
d27 1
a27 1
		${LIBASN1} ${LIBDES} ${LIBCRYPT} ${LIBCOM_ERR}
@


1.1.1.1
log
@Userland build of Kerberos5 (AKA Heimdal). More to come.

This is not ready for primetime yet! Please hold off on the bug reports.
@
text
@@
