diff options
author | Guy Harris <guy@alum.mit.edu> | 2014-08-27 14:16:33 -0700 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2014-08-27 21:17:37 +0000 |
commit | d04ec412d608deb4112d11f495f7efc3070348f7 (patch) | |
tree | 38048363b7d6a6b957b259e8eac6338cf10ec382 /asn1 | |
parent | 1b3bc9b71e5f985a6df221d69f61cb52a71324e6 (diff) |
Use FreeRADIUS's warning pragma controls to suppress Apple complaints.
Apple would really rather that you use their Shiny Happy Frameworks
rather than those crufty old cross-platform APIs. We are a
cross-platform program, and will use platform-specific APIs only if
there's enough benefit to doing so - and, in this case, that means
"using the platform-specific APIs on OS X and the other APIs on other
platforms", so that's two code paths to maintain, so "enough benefit"
has to outweigh the issues with that.
Change-Id: I370ba469a6f5892143d72179d15c9fe22d664fdf
Reviewed-on: https://code.wireshark.org/review/3881
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/kerberos/packet-kerberos-template.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/asn1/kerberos/packet-kerberos-template.c b/asn1/kerberos/packet-kerberos-template.c index 8d1cb5f512..3254c0907e 100644 --- a/asn1/kerberos/packet-kerberos-template.c +++ b/asn1/kerberos/packet-kerberos-template.c @@ -81,6 +81,8 @@ #include <epan/dissectors/packet-gssapi.h> #include <epan/dissectors/packet-smb-common.h> +#include <wsutil/ws_diag_control.h> + void proto_register_kerberos(void); void proto_reg_handoff_kerberos(void); @@ -280,6 +282,8 @@ read_keytab_file(const char *filename _U_) static krb5_context krb5_ctx; +USES_APPLE_DEPRECATED_API + void read_keytab_file(const char *filename) { @@ -416,6 +420,8 @@ decrypt_krb5_data(proto_tree *tree _U_, packet_info *pinfo, return NULL; } +USES_APPLE_RST + #elif defined(HAVE_HEIMDAL_KERBEROS) static krb5_context krb5_ctx; |