From fa758f2d377f1aee08db7c86862d95c416fda43d Mon Sep 17 00:00:00 2001
From: Ezra Peisach <epeisach@mit.edu>
Date: Wed, 17 Dec 2008 03:42:12 +0000
Subject: [PATCH] Move prototypes needed in multiple files to misc.h instead of
 declaring extern in each .c file.  This will ensure that definitions are
 consistent.  Moved prototypes include: load_badauth, setup_gss_names,
 krb5_iprop_prog_1, kiprop_get_adm_host_srv_name.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21493 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/kadmin/server/ipropd_svc.c   |  2 --
 src/kadmin/server/kadm_rpc_svc.c |  2 --
 src/kadmin/server/misc.h         | 17 +++++++++++++++++
 src/kadmin/server/ovsec_kadmd.c  |  6 ------
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/kadmin/server/ipropd_svc.c b/src/kadmin/server/ipropd_svc.c
index 50f7b8c52..e00701b0c 100644
--- a/src/kadmin/server/ipropd_svc.c
+++ b/src/kadmin/server/ipropd_svc.c
@@ -31,8 +31,6 @@
 
 extern gss_name_t rqst2name(struct svc_req *rqstp);
 
-extern int setup_gss_names(struct svc_req *, gss_buffer_desc *,
-			   gss_buffer_desc *);
 extern void *global_server_handle;
 extern int nofork;
 extern short l_port;
diff --git a/src/kadmin/server/kadm_rpc_svc.c b/src/kadmin/server/kadm_rpc_svc.c
index c56eedd0b..cba42a48c 100644
--- a/src/kadmin/server/kadm_rpc_svc.c
+++ b/src/kadmin/server/kadm_rpc_svc.c
@@ -25,8 +25,6 @@ extern void *global_server_handle;
 
 static int check_rpcsec_auth(struct svc_req *);
 
-void log_badauth(OM_uint32 major, OM_uint32 minor,
-		 struct sockaddr_in *addr, char *data);
 /*
  * Function: kadm_1
  * 
diff --git a/src/kadmin/server/misc.h b/src/kadmin/server/misc.h
index 74d703c4a..f93cdaace 100644
--- a/src/kadmin/server/misc.h
+++ b/src/kadmin/server/misc.h
@@ -3,6 +3,14 @@
  *
  */
 
+void
+log_badauth(OM_uint32 major, OM_uint32 minor,
+	    struct sockaddr_in *addr, char *data);
+
+int
+setup_gss_names(struct svc_req *, gss_buffer_desc *,
+		gss_buffer_desc *);
+
 kadm5_ret_t
 chpass_principal_wrapper_3(void *server_handle,
 			   krb5_principal principal,
@@ -51,3 +59,12 @@ void trunc_name(size_t *len, char **dots);
 int
 gss_to_krb5_name_1(struct svc_req *rqstp, krb5_context ctx, gss_name_t gss_name,
 		   krb5_principal *princ, gss_buffer_t gss_str);
+
+void 
+krb5_iprop_prog_1(struct svc_req *rqstp, SVCXPRT *transp);
+
+kadm5_ret_t 
+kiprop_get_adm_host_srv_name(krb5_context,
+			     const char *,
+			     char **);
+
diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c
index f4e1ce7f1..8b001727f 100644
--- a/src/kadmin/server/ovsec_kadmd.c
+++ b/src/kadmin/server/ovsec_kadmd.c
@@ -123,12 +123,6 @@ int ipropfd;
 void kadm5_set_use_password_server (void);
 #endif
 
-extern void krb5_iprop_prog_1();
-extern kadm5_ret_t kiprop_get_adm_host_srv_name(
-	krb5_context,
-	const char *,
-	char **);
-
 /*
  * Function: usage
  * 
-- 
2.26.2