summaryrefslogtreecommitdiff
path: root/kerberosV
diff options
context:
space:
mode:
Diffstat (limited to 'kerberosV')
-rw-r--r--kerberosV/libexec/Makefile4
-rw-r--r--kerberosV/usr.bin/Makefile4
-rw-r--r--kerberosV/usr.bin/ksu/Makefile15
-rw-r--r--kerberosV/usr.sbin/Makefile4
-rw-r--r--kerberosV/usr.sbin/kadmin/Makefile (renamed from kerberosV/usr.bin/kadmin/Makefile)2
-rw-r--r--kerberosV/usr.sbin/kdigest/Makefile (renamed from kerberosV/libexec/kdigest/Makefile)2
-rw-r--r--kerberosV/usr.sbin/kimpersonate/Makefile (renamed from kerberosV/libexec/kimpersonate/Makefile)2
7 files changed, 9 insertions, 24 deletions
diff --git a/kerberosV/libexec/Makefile b/kerberosV/libexec/Makefile
index 385a8fe5e70..0d5e7aa681c 100644
--- a/kerberosV/libexec/Makefile
+++ b/kerberosV/libexec/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.6 2013/06/17 18:57:39 robert Exp $
+# $OpenBSD: Makefile,v 1.7 2013/06/19 07:06:20 ajacoutot Exp $
SUBDIR= digest-service ipropd-master ipropd-slave hprop hpropd kadmind kdc \
- kdigest kfd kimpersonate kpasswdd kcm
+ kfd kpasswdd kcm
.include <bsd.subdir.mk>
diff --git a/kerberosV/usr.bin/Makefile b/kerberosV/usr.bin/Makefile
index 5054a7c3c8c..a8f55c20ed0 100644
--- a/kerberosV/usr.bin/Makefile
+++ b/kerberosV/usr.bin/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.10 2013/06/17 18:57:45 robert Exp $
+# $OpenBSD: Makefile,v 1.11 2013/06/19 07:06:21 ajacoutot Exp $
-SUBDIR= hxtool kadmin kcc kdestroy kgetcred kf kinit krb5-config ksu \
+SUBDIR= hxtool kcc kdestroy kgetcred kf kinit krb5-config \
string2key verify_krb5_conf
.include <bsd.subdir.mk>
diff --git a/kerberosV/usr.bin/ksu/Makefile b/kerberosV/usr.bin/ksu/Makefile
deleted file mode 100644
index 07216b76d9e..00000000000
--- a/kerberosV/usr.bin/ksu/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $OpenBSD: Makefile,v 1.1 2013/06/17 19:11:46 robert Exp $
-
-PROG= ksu
-NOMAN=
-SRCS= su.c
-CFLAGS+=-I${KRB5DIR}/lib/roken
-DPADD= ${LIBKAFS5} ${LIBKRB5} ${LIBHX509} ${LIBROKEN} ${LIBVERS} \
- ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR}
-LDADD= -lkafs5 -lkrb5 -lhx509 -lroken ${LIBVERS} \
- -lasn1 -lcrypto -lcom_err -lheimbase \
- -lwind -lpthread
-
-.include <bsd.prog.mk>
-
-.PATH: ${KRB5DIR}/appl/su
diff --git a/kerberosV/usr.sbin/Makefile b/kerberosV/usr.sbin/Makefile
index 65a26b2be14..ba8761636c1 100644
--- a/kerberosV/usr.sbin/Makefile
+++ b/kerberosV/usr.sbin/Makefile
@@ -1,5 +1,5 @@
-# $OpenBSD: Makefile,v 1.3 2013/06/17 18:57:46 robert Exp $
+# $OpenBSD: Makefile,v 1.4 2013/06/19 07:06:22 ajacoutot Exp $
-SUBDIR= iprop-log kstash ktutil
+SUBDIR= iprop-log kadmin kdigest kimpersonate kstash ktutil
.include <bsd.subdir.mk>
diff --git a/kerberosV/usr.bin/kadmin/Makefile b/kerberosV/usr.sbin/kadmin/Makefile
index 785942fbc8b..d77ceb4b375 100644
--- a/kerberosV/usr.bin/kadmin/Makefile
+++ b/kerberosV/usr.sbin/kadmin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2013/06/17 19:11:46 robert Exp $
+# $OpenBSD: Makefile,v 1.22 2013/06/19 07:06:22 ajacoutot Exp $
PROG= kadmin
MAN= kadmin.8
diff --git a/kerberosV/libexec/kdigest/Makefile b/kerberosV/usr.sbin/kdigest/Makefile
index 7e364211d73..5e365fa6388 100644
--- a/kerberosV/libexec/kdigest/Makefile
+++ b/kerberosV/usr.sbin/kdigest/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2013/06/17 19:11:35 robert Exp $
+# $OpenBSD: Makefile,v 1.1 2013/06/19 07:06:22 ajacoutot Exp $
PROG= kdigest
MAN= kdigest.8
diff --git a/kerberosV/libexec/kimpersonate/Makefile b/kerberosV/usr.sbin/kimpersonate/Makefile
index 0e9d71b6c8d..7b4c2c1947a 100644
--- a/kerberosV/libexec/kimpersonate/Makefile
+++ b/kerberosV/usr.sbin/kimpersonate/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2013/06/17 19:11:35 robert Exp $
+# $OpenBSD: Makefile,v 1.1 2013/06/19 07:06:22 ajacoutot Exp $
PROG= kimpersonate
MAN= kimpersonate.8