* krb4-proto.h: correct signature for krb_rd_req.

	* krb.h (swap_u_long): use KRB4_32 in swap() macros.

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

diff --git a/src/include/kerberosIV/ChangeLog b/src/include/kerberosIV/ChangeLog
index dcbb0baa2b05890276ff8789e9d6b274e375bf4b..d321c3efc3ec11266b6ae81c6f67592b28a33551 100644 (file)
--- a/src/include/kerberosIV/ChangeLog
+++ b/src/include/kerberosIV/ChangeLog
@@ -1,3 +1,11 @@
+Wed Jun 28 00:01:52 1995  Mark Eichin  <eichin@cygnus.com>
+
+       * krb4-proto.h: correct signature for krb_rd_req.
+
+Tue Jun 27 23:53:22 1995  Mark Eichin  <eichin@cygnus.com>
+
+       * krb.h (swap_u_long): use KRB4_32 in swap() macros.
+
 Thu Jun 22 16:06:26 1995  Tom Yu  (tlyu@dragons-lair)
 
        * krb4-proto.h, krb.h: reverse sense of KRB5_PROVIDE_PROTOTYPES

diff --git a/src/include/kerberosIV/krb.h b/src/include/kerberosIV/krb.h
index 01cc8ff54dc320d9abedea3d63b6dc8d06838b7d..8b713af043e7b7463877e291d2a7a1e32b8fb27e 100644 (file)
--- a/src/include/kerberosIV/krb.h
+++ b/src/include/kerberosIV/krb.h
@@ -288,7 +288,7 @@ typedef struct msg_dat MSG_DAT;
  */
 
 #define     swap_u_16(x) {\
- unsigned long   _krb_swap_tmp[4];\
+ unsigned KRB4_32   _krb_swap_tmp[4];\
  swab(((char *) x) +0, ((char *)  _krb_swap_tmp) +14 ,2); \
  swab(((char *) x) +2, ((char *)  _krb_swap_tmp) +12 ,2); \
  swab(((char *) x) +4, ((char *)  _krb_swap_tmp) +10 ,2); \
@@ -301,7 +301,7 @@ typedef struct msg_dat MSG_DAT;
                             }
 
 #define     swap_u_12(x) {\
- unsigned long   _krb_swap_tmp[4];\
+ unsigned KRB4_32   _krb_swap_tmp[4];\
  swab(( char *) x,     ((char *)  _krb_swap_tmp) +10 ,2); \
  swab(((char *) x) +2, ((char *)  _krb_swap_tmp) +8 ,2); \
  swab(((char *) x) +4, ((char *)  _krb_swap_tmp) +6 ,2); \
@@ -312,7 +312,7 @@ typedef struct msg_dat MSG_DAT;
                             }
 
 #define     swap_C_Block(x) {\
- unsigned long   _krb_swap_tmp[4];\
+ unsigned KRB4_32   _krb_swap_tmp[4];\
  swab(( char *) x,    ((char *)  _krb_swap_tmp) +6 ,2); \
  swab(((char *) x) +2,((char *)  _krb_swap_tmp) +4 ,2); \
  swab(((char *) x) +4,((char *)  _krb_swap_tmp) +2 ,2); \
@@ -320,7 +320,7 @@ typedef struct msg_dat MSG_DAT;
  memcpy((char *)x,(char *)_krb_swap_tmp,8);\
                             }
 #define     swap_u_quad(x) {\
- unsigned long   _krb_swap_tmp[4];\
+ unsigned KRB4_32   _krb_swap_tmp[4];\
  swab(( char *) &x,    ((char *)  _krb_swap_tmp) +6 ,2); \
  swab(((char *) &x) +2,((char *)  _krb_swap_tmp) +4 ,2); \
  swab(((char *) &x) +4,((char *)  _krb_swap_tmp) +2 ,2); \
@@ -329,7 +329,7 @@ typedef struct msg_dat MSG_DAT;
                             }
 
 #define     swap_u_long(x) {\
- unsigned long   _krb_swap_tmp[4];\
+ unsigned KRB4_32   _krb_swap_tmp[4];\
  swab((char *)  &x,    ((char *)  _krb_swap_tmp) +2 ,2); \
  swab(((char *) &x) +2,((char *)  _krb_swap_tmp),2); \
  x = _krb_swap_tmp[0];   \

diff --git a/src/include/kerberosIV/krb4-proto.h b/src/include/kerberosIV/krb4-proto.h
index 179237451f58a100b357897df0ece6aa55695541..edd287b4ba97ad48c902f9dbc1f008ae9f7651d1 100644 (file)
--- a/src/include/kerberosIV/krb4-proto.h
+++ b/src/include/kerberosIV/krb4-proto.h
@@ -186,7 +186,7 @@ long krb_rd_priv P_TYPE_((u_char *, u_long , Key_schedule , C_Block *, struct so
 
 /* rd_req.c */
 int krb_set_key P_TYPE_((char *, int ));
-int krb_rd_req P_TYPE_((KTEXT , char *, char *, long , AUTH_DAT *, char *));
+int krb_rd_req P_TYPE_((KTEXT , char *, char *, unsigned KRB4_32 , AUTH_DAT *, char *));
 
 /* rd_safe.c */
 long krb_rd_safe P_TYPE_((u_char *, u_long , C_Block *, struct sockaddr_in *, struct sockaddr_in *, MSG_DAT *));