From 441dd19beddb71be6edb0b50e19a89e700a89468 Mon Sep 17 00:00:00 2001 From: Apple Date: Fri, 24 Jun 2011 13:58:45 +0000 Subject: [PATCH] configd-293.8.tar.gz --- Plugins/ATconfig/Info.plist | 2 +- Plugins/IPMonitor/Info.plist | 2 +- Plugins/IPMonitor/ip_plugin.c | 13 +++++-------- Plugins/InterfaceNamer/Info.plist | 2 +- Plugins/KernelEventMonitor/Info.plist | 2 +- Plugins/Kicker/Info.plist | 2 +- Plugins/LinkConfiguration/Info.plist | 2 +- Plugins/Logger/Info-Embedded.plist | 2 +- Plugins/Logger/Info.plist | 2 +- Plugins/NetworkIdentification/Info.plist | 2 +- Plugins/PreferencesMonitor/Info.plist | 2 +- SCMonitor/Info.plist | 2 +- SystemConfiguration.fproj/Info-Embedded.plist | 2 +- SystemConfiguration.fproj/Info.plist | 2 +- 14 files changed, 18 insertions(+), 21 deletions(-) diff --git a/Plugins/ATconfig/Info.plist b/Plugins/ATconfig/Info.plist index fdd499f..e4ecc0a 100644 --- a/Plugins/ATconfig/Info.plist +++ b/Plugins/ATconfig/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.10.5 + 1.10.8 CFBundleSignature ???? CFBundleVersion diff --git a/Plugins/IPMonitor/Info.plist b/Plugins/IPMonitor/Info.plist index 6d9e423..2fcfb06 100644 --- a/Plugins/IPMonitor/Info.plist +++ b/Plugins/IPMonitor/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.10.5 + 1.10.8 CFBundleSignature ???? CFBundleVersion diff --git a/Plugins/IPMonitor/ip_plugin.c b/Plugins/IPMonitor/ip_plugin.c index e5c7b14..5aaf1ea 100644 --- a/Plugins/IPMonitor/ip_plugin.c +++ b/Plugins/IPMonitor/ip_plugin.c @@ -2954,7 +2954,6 @@ update_ipv6(CFDictionaryRef service_info, } } if (ipv6_dict != NULL) { - CFArrayRef addrs; CFMutableDictionaryRef dict = NULL; CFStringRef if_name = NULL; char ifn[IFNAMSIZ] = { '\0' }; @@ -2966,18 +2965,16 @@ update_ipv6(CFDictionaryRef service_info, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); val_router = CFDictionaryGetValue(ipv6_dict, kSCPropNetIPv6Router); - addrs = CFDictionaryGetValue(ipv6_dict, - kSCPropNetIPv6Addresses); if (val_router != NULL) { + CFArrayRef addrs; + /* no router if router is one of our IP addresses */ + addrs = CFDictionaryGetValue(ipv6_dict, + kSCPropNetIPv6Addresses); is_direct = router_is_our_ipv6_address(val_router, addrs); CFDictionarySetValue(dict, kSCPropNetIPv6Router, val_router); } - else { - val_router = CFArrayGetValueAtIndex(addrs, 0); - is_direct = TRUE; - } if_name = CFDictionaryGetValue(ipv6_dict, kSCPropInterfaceName); if (if_name) { CFDictionarySetValue(dict, @@ -2993,7 +2990,7 @@ update_ipv6(CFDictionaryRef service_info, keyChangeListSetValue(keys, S_state_global_ipv6, dict); CFRelease(dict); - { /* route add default ... */ + if (val_router != NULL) { /* route add default ... */ struct in6_addr router; (void)cfstring_to_ip6(val_router, &router); diff --git a/Plugins/InterfaceNamer/Info.plist b/Plugins/InterfaceNamer/Info.plist index 1afe1b8..cbc99f0 100644 --- a/Plugins/InterfaceNamer/Info.plist +++ b/Plugins/InterfaceNamer/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.10.5 + 1.10.8 CFBundleSignature ???? CFBundleVersion diff --git a/Plugins/KernelEventMonitor/Info.plist b/Plugins/KernelEventMonitor/Info.plist index 3036b92..0e6f278 100644 --- a/Plugins/KernelEventMonitor/Info.plist +++ b/Plugins/KernelEventMonitor/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.10.5 + 1.10.8 CFBundleSignature ???? CFBundleVersion diff --git a/Plugins/Kicker/Info.plist b/Plugins/Kicker/Info.plist index 392d4bd..ca15b27 100644 --- a/Plugins/Kicker/Info.plist +++ b/Plugins/Kicker/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.10.5 + 1.10.8 CFBundleSignature ???? CFBundleVersion diff --git a/Plugins/LinkConfiguration/Info.plist b/Plugins/LinkConfiguration/Info.plist index a67c106..addfd0e 100644 --- a/Plugins/LinkConfiguration/Info.plist +++ b/Plugins/LinkConfiguration/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.10.5 + 1.10.8 CFBundleSignature ???? CFBundleVersion diff --git a/Plugins/Logger/Info-Embedded.plist b/Plugins/Logger/Info-Embedded.plist index 9fb1d89..d460282 100644 --- a/Plugins/Logger/Info-Embedded.plist +++ b/Plugins/Logger/Info-Embedded.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.10.5 + 1.10.8 CFBundleSignature ???? CFBundleVersion diff --git a/Plugins/Logger/Info.plist b/Plugins/Logger/Info.plist index 4e2afec..6d96c49 100644 --- a/Plugins/Logger/Info.plist +++ b/Plugins/Logger/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.10.5 + 1.10.8 CFBundleSignature ???? CFBundleVersion diff --git a/Plugins/NetworkIdentification/Info.plist b/Plugins/NetworkIdentification/Info.plist index 58aa88a..d5421f8 100644 --- a/Plugins/NetworkIdentification/Info.plist +++ b/Plugins/NetworkIdentification/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.10.5 + 1.10.8 CFBundleSignature ???? CFBundleVersion diff --git a/Plugins/PreferencesMonitor/Info.plist b/Plugins/PreferencesMonitor/Info.plist index 779094b..af8557a 100644 --- a/Plugins/PreferencesMonitor/Info.plist +++ b/Plugins/PreferencesMonitor/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.10.5 + 1.10.8 CFBundleSignature ???? CFBundleVersion diff --git a/SCMonitor/Info.plist b/SCMonitor/Info.plist index 64ff764..094b9d1 100644 --- a/SCMonitor/Info.plist +++ b/SCMonitor/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.10.5 + 1.10.8 CFBundleSignature ???? CFBundleVersion diff --git a/SystemConfiguration.fproj/Info-Embedded.plist b/SystemConfiguration.fproj/Info-Embedded.plist index f426706..c44f15a 100644 --- a/SystemConfiguration.fproj/Info-Embedded.plist +++ b/SystemConfiguration.fproj/Info-Embedded.plist @@ -17,7 +17,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.10.5 + 1.10.8 CFBundleSignature ???? CFBundleVersion diff --git a/SystemConfiguration.fproj/Info.plist b/SystemConfiguration.fproj/Info.plist index f426706..c44f15a 100644 --- a/SystemConfiguration.fproj/Info.plist +++ b/SystemConfiguration.fproj/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.10.5 + 1.10.8 CFBundleSignature ???? CFBundleVersion -- 2.45.2