From: Tom Yu <tlyu@mit.edu>
Date: Wed, 18 Feb 2009 18:18:14 +0000 (+0000)
Subject: pull up r21887 from trunk
X-Git-Tag: krb5-1.7-beta1~83
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d1bd56592c5c90b7517cb42c0ee89f5f79f6651f;p=krb5.git

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.)
 ------------------------------------------------------------------------

ticket: 6363
version_fixed: 1.7
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-7@22017 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/aclocal.m4 b/src/aclocal.m4
index c494750ad..4f1c9d6e2 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -664,7 +664,7 @@ else
     # 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
diff --git a/src/lib/gssapi/krb5/k5seal.c b/src/lib/gssapi/krb5/k5seal.c
index bff1ab185..1949020ab 100644
--- a/src/lib/gssapi/krb5/k5seal.c
+++ b/src/lib/gssapi/krb5/k5seal.c
@@ -258,7 +258,7 @@ make_seal_token_v1 (krb5_context context,
             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)
             {