svn rev #22017: branches/krb5-1-7/src/ lib/gssapi/krb5/

[tlyu@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=22017
Commit By: tlyu
Log Message:
ticket: 6363
version_fixed: 1.7
status: resolved

pull up r21887 from trunk

 ------------------------------------------------------------------------
 r21887 | raeburn | 2009-02-04 20:49:21 -0500 (Wed, 04 Feb 2009) | 8 lines
 Changed paths:
    M /trunk/src/aclocal.m4
    M /trunk/src/lib/gssapi/krb5/k5seal.c

 ticket: 6363
 subject: int/ptr bug in gssapi code
 target_version: 1.7
 tags: pullup

 Fix a pointer argument passed where an integer is needed.
 Update Sun compiler options to make that an error.  (The options we're
 currently using make it an error for assignment but not for argument passing.)
 ------------------------------------------------------------------------


Changed Files:
U   branches/krb5-1-7/src/aclocal.m4
U   branches/krb5-1-7/src/lib/gssapi/krb5/k5seal.c
Modified: branches/krb5-1-7/src/aclocal.m4
===================================================================
--- branches/krb5-1-7/src/aclocal.m4	2009-02-18 18:17:54 UTC (rev 22016)
+++ branches/krb5-1-7/src/aclocal.m4	2009-02-18 18:18:14 UTC (rev 22017)
@@ -664,7 +664,7 @@
     # works, but it also means that declaration-in-code warnings won't
     # be issued.
     # -v -fd -errwarn=E_DECLARATION_IN_CODE ...
-    WARN_CFLAGS="-errtags=yes -errwarn=E_BAD_PTR_INT_COMBINATION -errwarn=E_PTR_TO_VOID_IN_ARITHMETIC"
+    WARN_CFLAGS="-errtags=yes -errwarn=E_BAD_PTR_INT_COMBINATION -errwarn=E_BAD_PTR_INT_COMB_ARG -errwarn=E_PTR_TO_VOID_IN_ARITHMETIC"
     WARN_CXXFLAGS="-errtags=yes +w +w2 -xport64"
   fi
 fi

Modified: branches/krb5-1-7/src/lib/gssapi/krb5/k5seal.c
===================================================================
--- branches/krb5-1-7/src/lib/gssapi/krb5/k5seal.c	2009-02-18 18:17:54 UTC (rev 22016)
+++ branches/krb5-1-7/src/lib/gssapi/krb5/k5seal.c	2009-02-18 18:18:14 UTC (rev 22017)
@@ -258,7 +258,7 @@
             unsigned char bigend_seqnum[4];
             krb5_keyblock *enc_key;
             int i;
-            store_32_be(seqnum, bigend_seqnum);
+            store_32_be(*seqnum, bigend_seqnum);
             code = krb5_copy_keyblock (context, enc, &enc_key);
             if (code)
             {