diff options
| author | Mark Eichin <eichin@mit.edu> | 1995-06-28 04:03:00 +0000 |
|---|---|---|
| committer | Mark Eichin <eichin@mit.edu> | 1995-06-28 04:03:00 +0000 |
| commit | 70ccad20a71dd9fc1fcbbee849b16828a6e3c02e (patch) | |
| tree | a7795396ece827911b6b753df9050925bd4d2dad | |
| parent | a3f9453fc60f0a6081fa7aadd035550efc7cd68b (diff) | |
| download | krb5-70ccad20a71dd9fc1fcbbee849b16828a6e3c02e.tar.gz krb5-70ccad20a71dd9fc1fcbbee849b16828a6e3c02e.tar.xz krb5-70ccad20a71dd9fc1fcbbee849b16828a6e3c02e.zip | |
* 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
| -rw-r--r-- | src/include/kerberosIV/ChangeLog | 8 | ||||
| -rw-r--r-- | src/include/kerberosIV/krb.h | 10 | ||||
| -rw-r--r-- | src/include/kerberosIV/krb4-proto.h | 2 |
3 files changed, 14 insertions, 6 deletions
diff --git a/src/include/kerberosIV/ChangeLog b/src/include/kerberosIV/ChangeLog index dcbb0baa2..d321c3efc 100644 --- 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 01cc8ff54..8b713af04 100644 --- 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 179237451..edd287b4b 100644 --- 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 *)); |