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

widened.

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

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 4ef90b1691d132174a15479f3a6bfa8e90f1e72b..b56368a1262768dd3ff3390a609602bd5896880e 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,10 @@
+Tue Oct  4 16:29:19 1994  Theodore Y. Ts'o  (tytso@dcl)
+
+       * in_tkt_sky.c (skey_keyproc):
+       * in_tkt_pwd.c (pwd_keyproc): Add widen.h and narrow.h includes
+               around pwd_keyproc, so that the keyproc input arguments
+               are appropriately widened.
+
 Fri Sep 30 21:58:15 1994  Theodore Y. Ts'o  (tytso@dcl)
 
        * preauth.c (preauth_systems): Add placeholder for magic number

diff --git a/src/lib/krb5/krb/in_tkt_pwd.c b/src/lib/krb5/krb/in_tkt_pwd.c
index 7788df0b962d258d5b8c66dedf214a7f47776846..a0ab8172cf889248cc67b5866dd2e0edbf78a057 100644 (file)
--- a/src/lib/krb5/krb/in_tkt_pwd.c
+++ b/src/lib/krb5/krb/in_tkt_pwd.c
@@ -40,6 +40,7 @@ extern char *krb5_default_pwd_prompt1;
  * key-producing procedure for use by krb5_get_in_tkt_with_password.
  */
 
+#include <krb5/widen.h>
 static krb5_error_code
 pwd_keyproc(DECLARG(const krb5_keytype, type),
            DECLARG(krb5_keyblock **, key),
@@ -49,6 +50,7 @@ OLDDECLARG(const krb5_keytype, type)
 OLDDECLARG(krb5_keyblock **, key)
 OLDDECLARG(krb5_const_pointer, keyseed)
 OLDDECLARG(krb5_pa_data **,padata)
+#include <krb5/narrow.h>
 {
     krb5_data salt;
     krb5_error_code retval;

diff --git a/src/lib/krb5/krb/in_tkt_sky.c b/src/lib/krb5/krb/in_tkt_sky.c
index 712400f746936a11e308e75c959e11ded945b7ff..daae3774edb8151283f07b9c4b8b17543039756d 100644 (file)
--- a/src/lib/krb5/krb/in_tkt_sky.c
+++ b/src/lib/krb5/krb/in_tkt_sky.c
@@ -40,6 +40,7 @@ struct skey_keyproc_arg {
  * "keyseed" is actually a krb5_keyblock *, or NULL if we should fetch
  * from system area.
  */
+#include <krb5/widen.h>
 static krb5_error_code
 skey_keyproc(DECLARG(const krb5_keytype, type),
             DECLARG(krb5_keyblock **, key),
@@ -49,6 +50,7 @@ OLDDECLARG(const krb5_keytype, type)
 OLDDECLARG(krb5_keyblock **, key)
 OLDDECLARG(krb5_const_pointer, keyseed)
 OLDDECLARG(krb5_pa_data **,padata)
+#include <krb5/narrow.h>
 {
     krb5_keyblock *realkey;
     const struct skey_keyproc_arg *arg;

diff --git a/src/tests/hammer/ChangeLog b/src/tests/hammer/ChangeLog
index 92c763295c2bebeeafad90aab720fa8648ac1416..d7b7164277849b714e4d896164278a39e2f3fed3 100644 (file)
--- a/src/tests/hammer/ChangeLog
+++ b/src/tests/hammer/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct  4 17:24:36 1994  Theodore Y. Ts'o  (tytso@dcl)
+
+       * kdc_hammer.c (get_server_key): Add widen.h and narrow.h around
+               declaration to make argument types be widened.
+
 Fri Sep 30 22:08:45 1994  Theodore Y. Ts'o  (tytso@dcl)
 
        * kdc_hammer.c: Add placeholder for magic number

diff --git a/src/tests/hammer/kdc5_hammer.c b/src/tests/hammer/kdc5_hammer.c
index 6d6f93cdc5bccc21b54c7539d18d4bf6de006755..e5754013c53f733d091bfbbcf821c885cfcd246a 100644 (file)
--- a/src/tests/hammer/kdc5_hammer.c
+++ b/src/tests/hammer/kdc5_hammer.c
@@ -240,6 +240,7 @@ main(argc, argv)
   }
 
        
+#include <krb5/widen.h>
 krb5_error_code get_server_key(DECLARG(krb5_pointer,keyprocarg),
                               DECLARG(krb5_principal,princ),
                               DECLARG(krb5_kvno,vno),
@@ -248,6 +249,7 @@ OLDDECLARG(krb5_pointer,keyprocarg)
 OLDDECLARG(krb5_principal,princ)
 OLDDECLARG(krb5_kvno,vno)
 OLDDECLARG(krb5_keyblock **,key)
+#include <krb5/narrow.h>
 {
   krb5_data pwd, salt;
   char *princ_str, *at;