From 1c3d1939602341cf7a6ba5a76a99f07b32731d46 Mon Sep 17 00:00:00 2001
From: Ronald Oussoren <ronaldoussoren@mac.com>
Date: Tue, 20 Apr 2010 08:54:48 +0000
Subject: [PATCH] This patch fixes the handling of a weak-linked variable and
should fix issue #8095.
---
Mac/Modules/_scproxy.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/Mac/Modules/_scproxy.c b/Mac/Modules/_scproxy.c
index 003f6a483f0..9f4c1a4e8f1 100644
--- a/Mac/Modules/_scproxy.c
+++ b/Mac/Modules/_scproxy.c
@@ -64,13 +64,18 @@ get_proxy_settings(PyObject* mod __attribute__((__unused__)))
result = PyDict_New();
if (result == NULL) goto error;
- aNum = CFDictionaryGetValue(proxyDict,
+ if (&kSCPropNetProxiesExcludeSimpleHostnames != NULL) {
+ aNum = CFDictionaryGetValue(proxyDict,
kSCPropNetProxiesExcludeSimpleHostnames);
- if (aNum == NULL) {
- v = PyBool_FromLong(0);
- } else {
- v = PyBool_FromLong(cfnum_to_int32(aNum));
+ if (aNum == NULL) {
+ v = PyBool_FromLong(1);
+ } else {
+ v = PyBool_FromLong(cfnum_to_int32(aNum));
+ }
+ } else {
+ v = PyBool_FromLong(1);
}
+
if (v == NULL) goto error;
r = PyDict_SetItemString(result, "exclude_simple", v);
--
2.30.9