From: Ezra Peisach Date: Sun, 1 Jul 2001 11:42:53 +0000 (+0000) Subject: * misc.c, server_stubs.c: Nuke rcsid X-Git-Tag: krb5-1.3-alpha1~1261 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6f5a4947bafb2174468c593b8f6be9f4ba2c58a6;p=krb5.git * misc.c, server_stubs.c: Nuke rcsid * misc.h: Add prototypes for kadm_1 and process_chpw_request. * ovsec_kadmd.c: Include misc.h and remove prototype for process_chpw_request and kadm_1. * kadm_rpc_svc.c, schpw.c: Include misc.h for prototypes. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@13537 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog index a76578751..25659f12d 100644 --- a/src/kadmin/server/ChangeLog +++ b/src/kadmin/server/ChangeLog @@ -1,3 +1,14 @@ +2001-06-29 Ezra Peisach + + * misc.c, server_stubs.c: Nuke rcsid. + + * misc.h: Add prototypes for kadm_1 and process_chpw_request. + + * ovsec_kadmd.c: Include misc.h and remove prototype for + process_chpw_request and kadm_1. + + * kadm_rpc_svc.c, schpw.c: Include misc.h for prototypes. + 2001-06-26 Ezra Peisach * server_glue_v1.c: Include misc.h for prototypes. diff --git a/src/kadmin/server/kadm_rpc_svc.c b/src/kadmin/server/kadm_rpc_svc.c index 911bc737c..54048df81 100644 --- a/src/kadmin/server/kadm_rpc_svc.c +++ b/src/kadmin/server/kadm_rpc_svc.c @@ -1,14 +1,8 @@ /* * Copyright 1993 OpenVision Technologies, Inc., All Rights Reserved. * - * $Id$ - * */ -#if !defined(lint) && !defined(__CODECENTER__) -static char *rcsid = "$Header$"; -#endif - #include #include #include @@ -22,6 +16,7 @@ static char *rcsid = "$Header$"; #ifdef HAVE_ARPA_INET_H #include #endif +#include "misc.h" /* * Function: kadm_1 diff --git a/src/kadmin/server/misc.c b/src/kadmin/server/misc.c index 61bed42d3..9a9c7668a 100644 --- a/src/kadmin/server/misc.c +++ b/src/kadmin/server/misc.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 #include #include diff --git a/src/kadmin/server/misc.h b/src/kadmin/server/misc.h index c92f5fe32..a8af72cc8 100644 --- a/src/kadmin/server/misc.h +++ b/src/kadmin/server/misc.h @@ -1,39 +1,6 @@ /* * Copyright 1994 OpenVision Technologies, Inc., All Rights Reserved * - * $Header$ - * - * $Log$ - * Revision 1.6 1996/07/22 20:28:56 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.5.4.1 1996/07/18 03:03:40 marc - * merged in changes from OV_9510_BP to OV_9510_FINAL1 - * - * Revision 1.5.2.1 1996/06/20 21:57:20 marc - * File added to the repository on a branch - * - * Revision 1.5 1996/05/30 21:13:24 bjaspan - * kadm5_get_principal_v1 takes a kadm5_principal_ent_t_v1 - * add kadm5_get_policy_v1 - * - * Revision 1.4 1996/05/20 21:39:05 bjaspan - * rename to kadm5 - * add kadm5_get_principal_v1 - * - * Revision 1.3 1994/09/13 18:24:41 jik - * Back out randkey changes. - * - * Revision 1.2 1994/09/12 20:26:12 jik - * randkey_principal_wrapper now takes a new_kvno option. - * - * Revision 1.1 1994/08/11 17:00:44 jik - * Initial revision - * */ kadm5_ret_t chpass_principal_wrapper(void *server_handle, @@ -51,3 +18,15 @@ kadm5_ret_t kadm5_get_principal_v1(void *server_handle, kadm5_ret_t kadm5_get_policy_v1(void *server_handle, kadm5_policy_t name, kadm5_policy_ent_t *ent); + + +krb5_error_code process_chpw_request(krb5_context context, + void *server_handle, + char *realm, int s, + krb5_keytab keytab, + struct sockaddr_in *sockin, + krb5_data *req, krb5_data *rep); + +#ifdef __SVC_HEADER__ +void kadm_1(struct svc_req *, SVCXPRT *); +#endif diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c index d82a69b63..619e2b5ed 100644 --- a/src/kadmin/server/ovsec_kadmd.c +++ b/src/kadmin/server/ovsec_kadmd.c @@ -51,6 +51,8 @@ #include #include +#include "misc.h" + #ifdef PURIFY #include "purify.h" @@ -112,10 +114,6 @@ void log_badauth_display_status_1(char *m, OM_uint32 code, int type, int schpw; void do_schpw(int s, kadm5_config_params *params); -krb5_error_code process_chpw_request(krb5_context context, void *server_handle, - char *realm, int s, krb5_keytab keytab, - struct sockaddr_in *sockin, - krb5_data *req, krb5_data *rep); /* * Function: usage @@ -192,7 +190,6 @@ static krb5_context context; int main(int argc, char *argv[]) { - void kadm_1(struct svc_req *, SVCXPRT *); register SVCXPRT *transp; extern char *optarg; extern int optind, opterr; diff --git a/src/kadmin/server/schpw.c b/src/kadmin/server/schpw.c index d86522d79..909d0f0e8 100644 --- a/src/kadmin/server/schpw.c +++ b/src/kadmin/server/schpw.c @@ -5,6 +5,8 @@ #include #include +#include "misc.h" + krb5_error_code process_chpw_request(context, server_handle, realm, s, keytab, sockin, req, rep) diff --git a/src/kadmin/server/server_stubs.c b/src/kadmin/server/server_stubs.c index aee142deb..9bf426733 100644 --- a/src/kadmin/server/server_stubs.c +++ b/src/kadmin/server/server_stubs.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 #include /* for gss_nt_krb5_name */ #include