From 28b7f562fc678fae0db68e2f56a58b703f9a93dd Mon Sep 17 00:00:00 2001
From: kensmith <kensmith@FreeBSD.org>
Date: Thu, 7 Jul 2005 14:16:38 +0000
Subject: This is sort of an MFS.  Peter made these changes to the RELENG_*
 branches but missed HEAD.  This patch extends his a little bit, setting it up
 via the Makefiles so that adding _FREEFALL_CONFIG to /etc/make.conf is the
 only thing needed to cluster-ize things (current setup also requires
 overriding CFLAGS).

From Peter's commit to the RELENG_* branches:
> Add the freebsd.org custer's source modifications under #ifdefs to aid
> keeping things in sync.  For ksu:
> * install suid-root by default
> * don't fall back to asking for a unix password (ie: be pure kerberos)
> * allow custom user instances for things like www and not just root

The Makefile tweaks will be MFC-ed, the rest is already done.

MFC after:      3 days
Approved by:    re (dwhite)
---
 kerberos5/usr.bin/ksu/Makefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'kerberos5')

diff --git a/kerberos5/usr.bin/ksu/Makefile b/kerberos5/usr.bin/ksu/Makefile
index cca520e..1e095ec 100644
--- a/kerberos5/usr.bin/ksu/Makefile
+++ b/kerberos5/usr.bin/ksu/Makefile
@@ -1,13 +1,16 @@
 # $FreeBSD$
 
 PROG=	ksu
-.if defined(ENABLE_SUID_K5SU)
+.if defined(ENABLE_SUID_K5SU) || defined(_FREEFALL_CONFIG)
 BINMODE=4555
 PRECIOUSPROG=
 .endif
 NO_MAN=
 SRCS=	su.c
 CFLAGS+=-I${KRB5DIR}/lib/roken
+.if defined(_FREEFALL_CONFIG)
+CFLAGS+=-D_FREEFALL_CONFIG
+.endif
 DPADD=	${LIBKAFS5} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \
 	${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
 LDADD=	-lkafs5 -lkrb5 -lroken ${LIBVERS} \
-- 
cgit v1.1