summaryrefslogtreecommitdiffstats
path: root/src/include
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>2008-07-10 22:34:21 +0000
committerTom Yu <tlyu@mit.edu>2008-07-10 22:34:21 +0000
commit2e0fbb7eb19d32772eb32125d4819ea16373e763 (patch)
treec2d897d6c48d66867c4797cd0541cee6274706ff /src/include
parentc144ea40b4fa1dfa1fb405022bd92010c8cd018e (diff)
downloadkrb5-2e0fbb7eb19d32772eb32125d4819ea16373e763.tar.gz
krb5-2e0fbb7eb19d32772eb32125d4819ea16373e763.tar.xz
krb5-2e0fbb7eb19d32772eb32125d4819ea16373e763.zip
Use #pragma pop on the Mac to ensure that the krb5_gic_opt_ext
structure has the same layout as the public version. ticket: 6010 status: open git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20511 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
-rw-r--r--src/include/k5-int.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 3763399d97..0118015a17 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -982,6 +982,10 @@ typedef struct _krb5_gic_opt_private {
krb5_gic_opt_pa_data *preauth_data;
} krb5_gic_opt_private;
+#if TARGET_OS_MAC
+# pragma pack(push,2)
+#endif
+
typedef struct _krb5_gic_opt_ext {
krb5_flags flags;
krb5_deltat tkt_life;
@@ -1002,6 +1006,10 @@ typedef struct _krb5_gic_opt_ext {
krb5_gic_opt_private *opt_private;
} krb5_gic_opt_ext;
+#if TARGET_OS_MAC
+# pragma pack(pop)
+#endif
+
krb5_error_code
krb5int_gic_opt_to_opte(krb5_context context,
krb5_get_init_creds_opt *opt,