Move libkafs into libkrb5, making libkafs an empty dummy library

5 files changed, 58 insertions, 20 deletions

diff --git a/kerberosV/lib/kafs/Makefile b/kerberosV/lib/kafs/Makefile
index e73b697fb42..d0fbd386439 100644
--- a/kerberosV/lib/kafs/Makefile
+++ b/kerberosV/lib/kafs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2003/05/11 03:47:55 hin Exp $
+# $OpenBSD: Makefile,v 1.5 2003/05/14 01:44:56 hin Exp $
 
 LIB	= kafs
 
@@ -11,20 +11,8 @@ CFLAGS += -I${KRB5SRC}/lib/kafs -DROKEN_RENAME
 
 .PATH:	${KRB5SRC}/lib/kafs ${KRB5SRC}/man
 
-SRCS=	afssys_openbsd.c \
-	afskrb.c \
-	afskrb5.c \
-	common.c \
-	kafs_locl.h \
-	afssysdefs.h
-
-MAN=	kafs.3
-MLINKS=	kafs.3 k_hasafs.3 \
-	kafs.3 k_pioctl.3 \
-	kafs.3 k_unlog.3 \
-	kafs.3 k_setpag.3 \
-	kafs.3 k_afs_cell_of_file.3 \
-	kafs.3 krb_afslog.3 \
-	kafs.3 krb_afslog_uid.3
+SRCS=	dummy.c
+
+MAN=
 
 .include <bsd.lib.mk>
diff --git a/kerberosV/lib/kafs/dummy.c b/kerberosV/lib/kafs/dummy.c
new file mode 100644
index 00000000000..103f7ef58ce
--- /dev/null
+++ b/kerberosV/lib/kafs/dummy.c
@@ -0,0 +1,32 @@
+/* $Id: dummy.c,v 1.1 2003/05/14 01:44:56 hin Exp $ */
+
+/*-
+ * Copyright (c) 2003 Hans Insulander <hin@openbsd.org>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * This file has been audited and found to contain no bugs.
+ */
+
diff --git a/kerberosV/lib/kafs/shlib_version b/kerberosV/lib/kafs/shlib_version
index f461c533903..56246d02b24 100644
--- a/kerberosV/lib/kafs/shlib_version
+++ b/kerberosV/lib/kafs/shlib_version
@@ -1,2 +1,2 @@
-major=11
+major=12
 minor=0
diff --git a/kerberosV/lib/krb5/Makefile b/kerberosV/lib/krb5/Makefile
index 7d1adb4c5dd..6a475e83075 100644
--- a/kerberosV/lib/krb5/Makefile
+++ b/kerberosV/lib/krb5/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2003/05/11 20:54:39 mho Exp $
+# $OpenBSD: Makefile,v 1.24 2003/05/14 01:44:56 hin Exp $
 
 KRBDEPTH=../..
 .include <${.CURDIR}/../../Makefile.inc>
@@ -250,7 +250,25 @@ SRCS+=	base64.c		\
 	warnerr.c
 
 # libkafs
-SRCS+=	afskrb5.c
+.PATH:	${.CURDIR}/../kafs ${KRB5SRC}/lib/kafs
+CFLAGS+=-I${KRB5SRC}/lib/kafs -DROKEN_RENAME
+SRCS+=	afskrb5.c \
+	afssys_openbsd.c \
+	common.c
+
+.if (${KERBEROS:L} == "yes")
+SRCS+=	afskrb.c
+.endif
+
+MAN+=	kafs.3
+MLINKS+=kafs.3 k_hasafs.3 \
+	kafs.3 k_pioctl.3 \
+	kafs.3 k_unlog.3 \
+	kafs.3 k_setpag.3 \
+	kafs.3 k_afs_cell_of_file.3 \
+	kafs.3 krb_afslog.3 \
+	kafs.3 krb_afslog_uid.3
+
 
 # There is a net_write.c and net_read.c both in lib/roken and lib/krb5.
 # This stinks.
diff --git a/kerberosV/lib/krb5/shlib_version b/kerberosV/lib/krb5/shlib_version
index 900b4048a96..715ca914844 100644
--- a/kerberosV/lib/krb5/shlib_version
+++ b/kerberosV/lib/krb5/shlib_version
@@ -1,2 +1,2 @@
 major=5
-minor=1
+minor=2