From 74ae8d1fdc12c6580cdb4c52da1b1049eaa59d1d Mon Sep 17 00:00:00 2001
From: Tom Yu <tlyu@mit.edu>
Date: Sat, 14 Feb 1998 02:38:38 +0000
Subject: [PATCH] 	* kadm_rpc_svc.c: Punt naughty RCS keywords.  Update
 header 	locations.

	* ovsec_kadmd.c: Update header locations.  Punt naughty RCS
	keywords.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10453 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/kadmin/server/ChangeLog      |  8 ++++
 src/kadmin/server/kadm_rpc_svc.c | 70 +-------------------------------
 src/kadmin/server/ovsec_kadmd.c  |  9 +---
 3 files changed, 11 insertions(+), 76 deletions(-)

diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog
index a27bd4de4..af5463c14 100644
--- a/src/kadmin/server/ChangeLog
+++ b/src/kadmin/server/ChangeLog
@@ -1,3 +1,11 @@
+Fri Feb 13 21:37:28 1998  Tom Yu  <tlyu@mit.edu>
+
+	* kadm_rpc_svc.c: Punt naughty RCS keywords.  Update header
+	locations.
+
+	* ovsec_kadmd.c: Update header locations.  Punt naughty RCS
+	keywords.
+
 Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
diff --git a/src/kadmin/server/kadm_rpc_svc.c b/src/kadmin/server/kadm_rpc_svc.c
index a012bce98..817ea3006 100644
--- a/src/kadmin/server/kadm_rpc_svc.c
+++ b/src/kadmin/server/kadm_rpc_svc.c
@@ -2,74 +2,6 @@
  * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved.
  *
  * $Id$
- * $Source$
- * 
- * $Log$
- * Revision 1.14  1997/07/01 06:37:28  tlyu
- * 	* kadm_rpc_svc.c, server_stubs.c: Add support for setv4key.
- *
- * Revision 1.13  1997/04/23 19:53:11  bjaspan
- * add kadm5_setkey_principal
- *
- * Revision 1.12  1996/07/22 20:28:53  marc
- * this commit includes all the changes on the OV_9510_INTEGRATION and
- * OV_MERGE branches.  This includes, but is not limited to, the new openvision
- * admin system, and major changes to gssapi to add functionality, and bring
- * the implementation in line with rfc1964.  before committing, the
- * code was built and tested for netbsd and solaris.
- *
- * Revision 1.11.4.1  1996/07/18 03:03:35  marc
- * merged in changes from OV_9510_BP to OV_9510_FINAL1
- *
- * Revision 1.11.2.2  1996/07/09 20:07:57  marc
- * 	* kadm_rpc_svc.c: renamed <ovsec_admin/foo.h> to <kadm5/foo.h>
- *
- * Revision 1.11.2.1  1996/06/20 21:56:44  marc
- * File added to the repository on a branch
- *
- * Revision 1.11  1996/06/17  19:49:28  bjaspan
- * use krb5_klog_syslog
- *
- * Revision 1.10  1996/05/29 21:07:53  bjaspan
- * be a bit more loud when warning, and don't exit when args can't be freed
- *
- * Revision 1.9  1996/05/20 21:34:56  bjaspan
- * log an error when sendreply fails
- *
- * Revision 1.8  1996/05/12 07:06:23  marc
- *  - fixup includes to match beta6
- *
- * Revision 1.7  1995/08/01  19:25:59  bjaspan
- * [secure/1318] allow retrieval of some/all principal/policy names
- *
- * Revision 1.6  1994/09/20  16:25:33  bjaspan
- * [secure-admin/2436: API versioning fixes to various admin files]
- * [secure-releng/2502: audit secure-admin/2436: random API versioning fixes]
- *
- * Sandbox:
- *
- *  More API versioning stuff -- need to add api_version field to RPC
- *  return structures in addition to calling structures.
- *
- * Revision 1.6  1994/09/12  20:19:16  jik
- * More API versioning stuff -- need to add api_version field to RPC
- * return structures in addition to calling structures.
- *
- * Revision 1.5  1994/08/16  18:55:46  jik
- * Versioning changes.
- *
- * Revision 1.4  1994/04/25  17:05:05  bjaspan
- * [secure-admin/1832] accept old gssapi number, log error when number
- * is wrong
- *
- * Revision 1.3  1993/11/15  02:30:54  shanzer
- * added funky procedure header comments.
- *
- * Revision 1.2  1993/11/10  23:11:21  bjaspan
- * added getprivs
- *
- * Revision 1.1  1993/11/05  07:09:00  bjaspan
- * Initial revision
  *
  */
 
@@ -78,7 +10,7 @@ static char *rcsid = "$Header$";
 #endif
 
 #include <stdio.h>
-#include <rpc/rpc.h>
+#include <gssrpc/rpc.h>
 #include <syslog.h>
 #include <memory.h>
 #include <kadm5/kadm_rpc.h>
diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c
index 6ce60976c..a107e4340 100644
--- a/src/kadmin/server/ovsec_kadmd.c
+++ b/src/kadmin/server/ovsec_kadmd.c
@@ -1,13 +1,8 @@
 /*
  * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved
  *
- * $Header$
  */
 
-#if !defined(lint) && !defined(__CODECENTER__)
-static char *rcsid = "$Header$";
-#endif
-
 #include    <stdio.h>
 #include    <signal.h>
 #include    <syslog.h>
@@ -21,9 +16,9 @@ static char *rcsid = "$Header$";
 #include    <netinet/in.h>
 #include    <arpa/inet.h>  /* inet_ntoa */
 #include    <netdb.h>
-#include    <rpc/rpc.h>
+#include    <gssrpc/rpc.h>
 #include    <gssapi/gssapi_krb5.h>
-#include    <rpc/auth_gssapi.h>
+#include    <gssrpc/auth_gssapi.h>
 #include    <kadm5/admin.h>
 #include    <kadm5/kadm_rpc.h>
 #include    <string.h>
-- 
2.26.2