Add widen.h and narrow.h around declaration so that argument types are

widened.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4449 dc483132-0cff-0310-8789-dd5450dbe970

8 files changed, 28 insertions, 0 deletions

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 3b422b0e3..b2993648a 100644
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct  4 17:14:38 1994  Theodore Y. Ts'o  (tytso@dcl)
+
+	* krcp.c (tgt_keyproc): Add widen.h and narrow.h around
+		declaration so that argument types are widened.
+
 Mon Oct  3 13:21:51 1994  Theodore Y. Ts'o  (tytso@dcl)
 
 	* logutil.c (logwtmp): Remove declaration for strncpy().
diff --git a/src/appl/bsd/krcp.c b/src/appl/bsd/krcp.c
index fa732c811..31094f3f7 100644
--- a/src/appl/bsd/krcp.c
+++ b/src/appl/bsd/krcp.c
@@ -1112,6 +1112,7 @@ char **save_argv(argc, argv)
 #define SIZEOF_INADDR sizeof(struct in_addr)
 #endif
 
+#include <krb5/widen.h>    
 krb5_error_code tgt_keyproc(DECLARG(krb5_pointer, keyprocarg),
 			    DECLARG(krb5_principal, principal),
 			    DECLARG(krb5_kvno, vno),
@@ -1120,6 +1121,7 @@ krb5_error_code tgt_keyproc(DECLARG(krb5_pointer, keyprocarg),
      OLDDECLARG(krb5_principal, principal)
      OLDDECLARG(krb5_kvno, vno)
      OLDDECLARG(krb5_keyblock **, key)
+#include <krb5/narrow.h>
 {
     krb5_creds *creds = (krb5_creds *)keyprocarg;
     
diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog
index 01ba1dde8..95bfa930d 100644
--- a/src/kadmin/server/ChangeLog
+++ b/src/kadmin/server/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct  4 17:08:25 1994  Theodore Y. Ts'o  (tytso@dcl)
+
+	* adm_process.c (cpw_keyproc): Add widen.h and narrow.h around
+		declaration so that argument types to keyproc are widened.
+
 Mon Oct  3 19:13:03 1994  Theodore Y. Ts'o  (tytso@dcl)
 
 	* Makefile.in: Use $(srcdir) to find manual page for make install.
diff --git a/src/kadmin/server/adm_process.c b/src/kadmin/server/adm_process.c
index eca9fb040..7f0c8e4a6 100644
--- a/src/kadmin/server/adm_process.c
+++ b/src/kadmin/server/adm_process.c
@@ -45,6 +45,7 @@ struct cpw_keyproc_arg {
     krb5_keyblock *key;
 };
 
+#include <krb5/widen.h>
 static krb5_error_code
 cpw_keyproc(DECLARG(krb5_pointer, keyprocarg),
 		DECLARG(krb5_principal, server),
@@ -54,6 +55,7 @@ OLDDECLARG(krb5_pointer, keyprocarg)
 OLDDECLARG(krb5_principal, server)
 OLDDECLARG(krb5_kvno, key_vno)
 OLDDECLARG(krb5_keyblock **, key)
+#include <krb5/narrow.h>
 {
     krb5_error_code retval;
     krb5_db_entry cpw_entry;
diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index 589f5bccf..10e8e1ac4 100644
--- a/src/kdc/ChangeLog
+++ b/src/kdc/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct  4 16:42:16 1994  Theodore Y. Ts'o  (tytso@dcl)
+
+	* kdc_util.c (kdc_rdreq_keyproc): Add widen.h and narrow.h around
+		keyproc call so that the argument types are widened.
+
 Mon Oct  3 13:13:48 1994  Theodore Y. Ts'o  (tytso@dcl)
 
 	* Makefile.in: Use $(srcdir) to find manual page for make install.
diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c
index 92b99a3c1..cd1fbb91e 100644
--- a/src/kdc/kdc_util.c
+++ b/src/kdc/kdc_util.c
@@ -114,6 +114,7 @@ struct kparg {
  * "principal" argument.
  */
 
+#include <krb5/widen.h>
 static krb5_error_code
 kdc_rdreq_keyproc(DECLARG(krb5_pointer, keyprocarg),
 		  DECLARG(krb5_principal, principal),
@@ -123,6 +124,7 @@ OLDDECLARG(krb5_pointer, keyprocarg)
 OLDDECLARG(krb5_principal, principal)
 OLDDECLARG(krb5_kvno, vno)
 OLDDECLARG(krb5_keyblock **, key)
+#include <krb5/narrow.h>
 {
     register struct kparg *whoisit = (struct kparg *)keyprocarg;
     char	*sname;
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 6eb6ccc98..06b2b9926 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct  4 16:40:45 1994  Theodore Y. Ts'o  (tytso@dcl)
+
+	* accept_security_context.c (rd_req_keyproc): Add widen.h and
+		narrow.h to widen argument types of keyproc.
+
 Tue Sep 27 23:30:14 1994  Theodore Y. Ts'o  (tytso@dcl)
 
 	* accept_security_context.c (krb5_gss_accept_sec_context):
diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
index 5e0f3db34..e76bc1b5a 100644
--- a/src/lib/gssapi/krb5/accept_sec_context.c
+++ b/src/lib/gssapi/krb5/accept_sec_context.c
@@ -24,11 +24,13 @@
 #include <krb5/rsa-md5.h>
 #include <memory.h>
 
+#include <krb5/widen.h>
 static krb5_error_code rd_req_keyproc(keyprocarg, server, kvno, keyblock)
      krb5_pointer keyprocarg;
      krb5_principal server;
      krb5_kvno kvno;
      krb5_keyblock **keyblock;
+#include <krb5/narrow.h>
 {
    krb5_error_code code;
    krb5_keytab_entry ktentry;