reflect changes and new position of libdes

8 files changed, 17 insertions, 18 deletions

diff --git a/kerberosIV/Makefile b/kerberosIV/Makefile
index d3dc42fa423..dc005062c36 100644
--- a/kerberosIV/Makefile
+++ b/kerberosIV/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 1996/11/15 09:21:23 downsj Exp $
+#	$OpenBSD: Makefile,v 1.9 1997/06/29 10:32:12 provos Exp $
 #	from @(#)Makefile	5.1 (Berkeley) 6/25/90
 
 SUBDIR=
@@ -7,7 +7,7 @@ SUBDIR=
 SUBDIR+=include
 .endif
 
-SUBDIR+=acl des krb kadm kafs kdb
+SUBDIR+=acl krb kadm kafs kdb
 
 SUBDIR+=ext_srvtab kadmin kadmind kdb_destroy kdb_edit kdb_init kdb_util \
 	kdestroy kerberos kinit klist kpasswdd kprop kpropd ksrvtgt ksrvutil \
diff --git a/kerberosIV/include/kerberosIV/Makefile b/kerberosIV/include/kerberosIV/Makefile
index 5ef99f09394..682ad058f0b 100644
--- a/kerberosIV/include/kerberosIV/Makefile
+++ b/kerberosIV/include/kerberosIV/Makefile
@@ -1,7 +1,6 @@
-#	$Id: Makefile,v 1.4 1997/05/29 20:07:11 deraadt Exp $
+#	$Id: Makefile,v 1.5 1997/06/29 10:32:13 provos Exp $
 
-FILES=	acl.h com_err.h des.h kadm.h kafs.h kparse.h krb.h krb_db.h \
-	site.h
+FILES=	acl.h com_err.h kadm.h kafs.h kparse.h krb.h krb_db.h site.h
 NOOBJ=	noobj
 
 all include clean cleandir depend lint tags:
diff --git a/kerberosIV/kerberos/kerberos.c b/kerberosIV/kerberos/kerberos.c
index c3ad1b27030..9d0dbe42550 100644
--- a/kerberosIV/kerberos/kerberos.c
+++ b/kerberosIV/kerberos/kerberos.c
@@ -1,4 +1,4 @@
-/*	$Id: kerberos.c,v 1.4 1997/01/15 23:40:52 millert Exp $	*/
+/*	$Id: kerberos.c,v 1.5 1997/06/29 10:32:14 provos Exp $	*/
 
 /*-
  * Copyright 1987, 1988 by the Student Information Processing Board
@@ -42,7 +42,7 @@
 
 #include <netdb.h>
 
-#include <kerberosIV/des.h>
+#include <des.h>
 #include <kerberosIV/krb.h>
 #include <kerberosIV/krb_db.h>
 
diff --git a/kerberosIV/kpasswdd/kpasswdd.c b/kerberosIV/kpasswdd/kpasswdd.c
index c1908084671..11386501afb 100644
--- a/kerberosIV/kpasswdd/kpasswdd.c
+++ b/kerberosIV/kpasswdd/kpasswdd.c
@@ -1,4 +1,4 @@
-/*	$Id: kpasswdd.c,v 1.3 1997/02/15 19:56:16 tholo Exp $	*/
+/*	$Id: kpasswdd.c,v 1.4 1997/06/29 10:32:15 provos Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -57,7 +57,7 @@ static char sccsid[] = "@(#)kpasswdd.c	8.1 (Berkeley) 6/4/93";
 #include <netinet/in.h>
 #include <pwd.h>
 #include <syslog.h>
-#include <kerberosIV/des.h>
+#include <des.h>
 #include <kerberosIV/krb.h>
 #include <kerberosIV/krb_db.h>
 #include <stdio.h>
diff --git a/kerberosIV/ksrvtgt/ksrvtgt.c b/kerberosIV/ksrvtgt/ksrvtgt.c
index e1bb71d0478..806463ed6ff 100644
--- a/kerberosIV/ksrvtgt/ksrvtgt.c
+++ b/kerberosIV/ksrvtgt/ksrvtgt.c
@@ -1,4 +1,4 @@
-/*	$Id: ksrvtgt.c,v 1.1 1995/12/14 06:52:51 tholo Exp $	*/
+/*	$Id: ksrvtgt.c,v 1.2 1997/06/29 10:32:17 provos Exp $	*/
 
 /*-
  * Copyright 1988 by the Massachusetts Institute of Technology. 
@@ -13,11 +13,11 @@
 #include <stdio.h>
 #include <strings.h>
 #include <sys/param.h>
-#include <kerberosIV/des.h>
+#include <des.h>
 #include <kerberosIV/krb.h>
 
 const char rcsid[] =
-    "$Id: ksrvtgt.c,v 1.1 1995/12/14 06:52:51 tholo Exp $";
+    "$Id: ksrvtgt.c,v 1.2 1997/06/29 10:32:17 provos Exp $";
 
 main(argc,argv)
     int argc;
diff --git a/kerberosIV/make_keypair/make_keypair.c b/kerberosIV/make_keypair/make_keypair.c
index 2b669504535..acb01bb623a 100644
--- a/kerberosIV/make_keypair/make_keypair.c
+++ b/kerberosIV/make_keypair/make_keypair.c
@@ -1,4 +1,4 @@
-/*	$Id: make_keypair.c,v 1.3 1996/09/16 18:49:04 millert Exp $	*/
+/*	$Id: make_keypair.c,v 1.4 1997/06/29 10:32:18 provos Exp $	*/
 
 /*-
  * Copyright (c) 1988, 1993
@@ -51,7 +51,7 @@ static char sccsid[] = "@(#)make_keypair.c	8.1 (Berkeley) 6/1/93";
 #include <strings.h>
 #include <netdb.h>
 #include <unistd.h>
-#include <kerberosIV/des.h>
+#include <des.h>
 #include <kerberosIV/krb.h>
 #include "pathnames.h"
 #include "register_proto.h"
diff --git a/kerberosIV/register/register.c b/kerberosIV/register/register.c
index 7b2bbadc8bc..04d2f963c11 100644
--- a/kerberosIV/register/register.c
+++ b/kerberosIV/register/register.c
@@ -1,4 +1,4 @@
-/*	$Id: register.c,v 1.4 1996/09/16 18:49:06 millert Exp $	*/
+/*	$Id: register.c,v 1.5 1997/06/29 10:32:19 provos Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -57,7 +57,7 @@ static char sccsid[] = "@(#)register.c	8.1 (Berkeley) 6/1/93";
 #include <strings.h>
 #include <netdb.h>
 #include <unistd.h>
-#include <kerberosIV/des.h>
+#include <des.h>
 #include <kerberosIV/krb.h>
 #include "pathnames.h"
 #include "register_proto.h"
diff --git a/kerberosIV/registerd/registerd.c b/kerberosIV/registerd/registerd.c
index 7b0bdac5ff4..2badc255a28 100644
--- a/kerberosIV/registerd/registerd.c
+++ b/kerberosIV/registerd/registerd.c
@@ -1,4 +1,4 @@
-/*	$Id: registerd.c,v 1.4 1996/09/16 18:49:07 millert Exp $	*/
+/*	$Id: registerd.c,v 1.5 1997/06/29 10:32:20 provos Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -54,7 +54,7 @@ static char sccsid[] = "@(#)registerd.c	8.1 (Berkeley) 6/1/93";
 #include <arpa/inet.h>
 #include <syslog.h>
 #include <unistd.h>
-#include <kerberosIV/des.h>
+#include <des.h>
 #include <kerberosIV/krb.h>
 #include <kerberosIV/krb_db.h>
 #include <stdio.h>