oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

krb5: don't include plist support unless CoreFoundation is present

Browse Source 
depending what's available when you compile for iOS it's possible to
be __APPLE__ and not have CF; actually test for it instead of blythely
assuming it can be used
This commit is contained in:
Daria Phoebe Brashear
2017-10-24 12:53:46 -04:00
committed by Jeffrey Altman
parent 6428136e18
commit 0f5486eafc
4 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/krb5/config_file.c
View File

@@ -35,7 +35,7 @@
#include "krb5_locl.h"
#ifdef __APPLE__
#if defined(HAVE_FRAMEWORK_COREFOUNDATION)
#include <CoreFoundation/CoreFoundation.h>
#endif
@@ -238,7 +238,7 @@ parse_binding(struct fileptr *f, unsigned *lineno, char *p,
return ret;
}
#if defined(__APPLE__)
#if defined(HAVE_FRAMEWORK_COREFOUNDATION)
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
#define HAVE_CFPROPERTYLISTCREATEWITHSTREAM 1
@@ -605,7 +605,7 @@ krb5_config_parse_file_multi (krb5_context context,
if (is_plist_file(fname)) {
context->config_include_depth--;
#ifdef __APPLE__
#if defined(HAVE_FRAMEWORK_COREFOUNDATION)
ret = parse_plist_config(context, fname, res);
if (ret) {
krb5_set_error_message(context, ret,