Ensure that each Kerberised applet has CFLAGS containing -DKERBEROS.

9 files changed, 13 insertions, 11 deletions

diff --git a/eBones/include/Makefile b/eBones/include/Makefile
index d6e263e..95bf8bc 100644
--- a/eBones/include/Makefile
+++ b/eBones/include/Makefile
@@ -5,6 +5,7 @@ FILES=	kparse.h krb.h krb_db.h
 
 NOOBJ=	noobj
 NOMAN=	noman
+CFLAGS+=	KERBEROS
 
 all include clean cleandir depend lint tags:
 
diff --git a/eBones/lib/libkadm/Makefile b/eBones/lib/libkadm/Makefile
index e536feb..de3a225 100644
--- a/eBones/lib/libkadm/Makefile
+++ b/eBones/lib/libkadm/Makefile
@@ -1,10 +1,10 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.9 1995/11/12 08:13:10 markm Exp $
+#	$Id$
 
 LIB=	kadm
 
 SRCS=	kadm_err.c kadm_stream.c kadm_supp.c kadm_cli_wrap.c
-CFLAGS+=	-I. -I${.CURDIR} -I${KRBOBJDIR} -DPOSIX
+CFLAGS+=	-I. -I${.CURDIR} -I${KRBOBJDIR} -DPOSIX -DKERBEROS
 
 beforeinstall: kadm_err.c
 	-cd ${.CURDIR}; cmp -s kadm.h \
diff --git a/eBones/libexec/kpropd/Makefile b/eBones/libexec/kpropd/Makefile
index 4368dc0..4b95d18 100644
--- a/eBones/libexec/kpropd/Makefile
+++ b/eBones/libexec/kpropd/Makefile
@@ -1,8 +1,8 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.5 1995/09/14 04:05:12 gibbs Exp $
+#	$Id$
 
 PROG=	kpropd
-CFLAGS+=-I${.CURDIR}/../../usr.sbin/kprop
+CFLAGS+=-I${.CURDIR}/../../usr.sbin/kprop -DKERBEROS
 DPADD+=	${LIBKRB} ${LIBDES}
 LDADD=	-L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes
 NOMAN=	noman
diff --git a/eBones/libexec/rkinitd/Makefile b/eBones/libexec/rkinitd/Makefile
index 3872644..5a92534 100644
--- a/eBones/libexec/rkinitd/Makefile
+++ b/eBones/libexec/rkinitd/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	rkinitd
 SRCS= 	${RKINITOBJDIR}/rkinit_err.h rkinitd.c util.c rpc.c krb.c
-CFLAGS+=-I${KRBOBJDIR} -I${RKINITOBJDIR}
+CFLAGS+=-I${KRBOBJDIR} -I${RKINITOBJDIR} -DKERBEROS
 DPADD=	${LIBKRB} ${LIBDES}
 LDADD=	-L${RKINITOBJDIR} -lrkinit -L${KRBOBJDIR} -lkrb \
 	-L${DESOBJDIR} -ldes
diff --git a/eBones/usr.bin/kadmin/Makefile b/eBones/usr.bin/kadmin/Makefile
index 8f0864c..74457e0 100644
--- a/eBones/usr.bin/kadmin/Makefile
+++ b/eBones/usr.bin/kadmin/Makefile
@@ -3,7 +3,7 @@
 PROG=	kadmin
 SRCS=	${KRBOBJDIR}/krb_err.h kadmin.c kadmin_cmds.c
 CLEANFILES+=	kadmin_cmds.c krb_err.c
-CFLAGS+=	-DPOSIX -I${.CURDIR}/../../lib/libkadm -I${KRBOBJDIR}
+CFLAGS+=	-DPOSIX -I${.CURDIR}/../../lib/libkadm -I${KRBOBJDIR} -DKERBEROS
 DPADD= ${LIBKRB} ${LIBDES}
 LDADD+=	-L${KADMOBJDIR} -lkadm -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes
 LDADD+=	-lss -lcom_err
diff --git a/eBones/usr.bin/rkinit/Makefile b/eBones/usr.bin/rkinit/Makefile
index b910742..3ab0a3e 100644
--- a/eBones/usr.bin/rkinit/Makefile
+++ b/eBones/usr.bin/rkinit/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	rkinit
 SRCS=	${RKINITOBJDIR}/rkinit_err.h rkinit.c
-CFLAGS+=	-I${KRBOBJDIR} -I${RKINITOBJDIR}
+CFLAGS+=	-I${KRBOBJDIR} -I${RKINITOBJDIR} -DKERBEROS
 LDADD+=	-L${RKINITOBJDIR} -lrkinit -L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes
 LDADD+=	-lss -lcom_err
 
diff --git a/eBones/usr.sbin/kadmind/Makefile b/eBones/usr.sbin/kadmind/Makefile
index af3bbe7..6a74666 100644
--- a/eBones/usr.sbin/kadmind/Makefile
+++ b/eBones/usr.sbin/kadmind/Makefile
@@ -2,7 +2,7 @@
 
 PROG=	kadmind
 SRCS=	admin_server.c kadm_funcs.c kadm_ser_wrap.c kadm_server.c
-CFLAGS+=-DPOSIX -I${.CURDIR}/../../lib/libkadm -I${KADMOBJDIR} -I${KRBOBJDIR}
+CFLAGS+=-DPOSIX -I${.CURDIR}/../../lib/libkadm -I${KADMOBJDIR} -I${KRBOBJDIR} -DKERBEROS
 DPADD=	${LIBKDB} ${LIBKRB} ${LIBDES}
 LDADD+=	-L${KADMOBJDIR} -lkadm -L${KDBOBJDIR} -lkdb -L${KRBOBJDIR} -lkrb \
 	-L${DESOBJDIR} -ldes -L${ACLOBJDIR} -lacl -lcom_err
diff --git a/eBones/usr.sbin/kprop/Makefile b/eBones/usr.sbin/kprop/Makefile
index c036b16..809ec50 100644
--- a/eBones/usr.sbin/kprop/Makefile
+++ b/eBones/usr.sbin/kprop/Makefile
@@ -1,9 +1,10 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.5 1995/09/14 04:11:01 gibbs Exp $
+#	$Id$
 
 PROG=	kprop
 DPADD=	${LIBKRB} ${LIBDES}
 LDADD=	-L${KRBOBJDIR} -lkrb -L${DESOBJDIR} -ldes
+CFLAGS+=	-DKERBEROS
 NOMAN=	noman
 
 .include <bsd.prog.mk>
diff --git a/eBones/usr.sbin/ksrvutil/Makefile b/eBones/usr.sbin/ksrvutil/Makefile
index f421aa9..62c551e 100644
--- a/eBones/usr.sbin/ksrvutil/Makefile
+++ b/eBones/usr.sbin/ksrvutil/Makefile
@@ -1,8 +1,8 @@
-#	$Id: Makefile,v 1.5 1995/09/14 04:11:06 gibbs Exp $
+#	$Id$
 
 PROG=	ksrvutil
 SRCS=	ksrvutil.c
-CFLAGS+=	-I${.CURDIR}/../../lib/libkadm
+CFLAGS+=	-I${.CURDIR}/../../lib/libkadm -DKERBEROS
 DPADD=	${LIBKRB} ${LIBDES}
 LDADD+=	-L${KADMOBJDIR} -lkadm -L${KRBOBJDIR} -lkrb \
 	-L${DESOBJDIR} -ldes -lcom_err