diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-07-25 18:51:53 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-07-26 02:16:08 +0200 |
| commit | 5a8635bca1b6d60a5b81c602eb4f0b7fd8902d7b (patch) | |
| tree | a9a73cdf05ce487a174c9ef7ab334007348e7248 /source4/heimdal/lib/gssapi/gssapi/gssapi.h | |
| parent | f1a59f9d6f45987acd0304ee58e4488333faad18 (diff) | |
| download | samba-5a8635bca1b6d60a5b81c602eb4f0b7fd8902d7b.tar.gz samba-5a8635bca1b6d60a5b81c602eb4f0b7fd8902d7b.tar.bz2 samba-5a8635bca1b6d60a5b81c602eb4f0b7fd8902d7b.zip | |
s4:heimdal: import lorikeet-heimdal-201107241840 (commit 0fdf11fa3cdb47df9f5393ebf36d9f5742243036)
Diffstat (limited to 'source4/heimdal/lib/gssapi/gssapi/gssapi.h')
| -rw-r--r-- | source4/heimdal/lib/gssapi/gssapi/gssapi.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/source4/heimdal/lib/gssapi/gssapi/gssapi.h b/source4/heimdal/lib/gssapi/gssapi/gssapi.h index fa53a29d24..bbb2fd54c9 100644 --- a/source4/heimdal/lib/gssapi/gssapi/gssapi.h +++ b/source4/heimdal/lib/gssapi/gssapi/gssapi.h @@ -61,6 +61,11 @@ #endif #endif +/* Compatiblity with MIT Kerberos on the Mac */ +#if defined(__APPLE__) && (defined(__ppc__) || defined(__ppc64__) || defined(__i386__) || defined(__x86_64__)) +#pragma pack(push,2) +#endif + #ifdef __cplusplus #define GSSAPI_CPP_START extern "C" { #define GSSAPI_CPP_END } @@ -1041,7 +1046,8 @@ GSSAPI_LIB_FUNCTION int GSSAPI_LIB_CALL gss_userok(const gss_name_t name, const char *user); -extern GSSAPI_LIB_VARIABLE gss_buffer_t GSS_C_ATTR_LOCAL_LOGIN_USER; +extern GSSAPI_LIB_VARIABLE gss_buffer_desc __gss_c_attr_local_login_user; +#define GSS_C_ATTR_LOCAL_LOGIN_USER (&__gss_c_attr_local_login_user) /* * Naming extensions @@ -1105,6 +1111,10 @@ gss_name_to_oid(const char *name); GSSAPI_CPP_END +#if defined(__APPLE__) && (defined(__ppc__) || defined(__ppc64__) || defined(__i386__) || defined(__x86_64__)) +#pragma pack(pop) +#endif + #undef GSSAPI_DEPRECATED_FUNCTION #endif /* GSSAPI_GSSAPI_H_ */ |