From 2e0fbb7eb19d32772eb32125d4819ea16373e763 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Thu, 10 Jul 2008 22:34:21 +0000 Subject: [PATCH] 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 --- src/include/k5-int.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/include/k5-int.h b/src/include/k5-int.h index 3763399d9..0118015a1 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, -- 2.26.2