]> git.saurik.com Git - apple/configd.git/commitdiff
configd-293.8.tar.gz mac-os-x-1068 v293.8
authorApple <opensource@apple.com>
Fri, 24 Jun 2011 13:58:45 +0000 (13:58 +0000)
committerApple <opensource@apple.com>
Fri, 24 Jun 2011 13:58:45 +0000 (13:58 +0000)
14 files changed:
Plugins/ATconfig/Info.plist
Plugins/IPMonitor/Info.plist
Plugins/IPMonitor/ip_plugin.c
Plugins/InterfaceNamer/Info.plist
Plugins/KernelEventMonitor/Info.plist
Plugins/Kicker/Info.plist
Plugins/LinkConfiguration/Info.plist
Plugins/Logger/Info-Embedded.plist
Plugins/Logger/Info.plist
Plugins/NetworkIdentification/Info.plist
Plugins/PreferencesMonitor/Info.plist
SCMonitor/Info.plist
SystemConfiguration.fproj/Info-Embedded.plist
SystemConfiguration.fproj/Info.plist

index fdd499f2c28101fbde19b1eb07207b00e8fe2b4c..e4ecc0a14fbe829bb98c96a073872570a3f478b5 100644 (file)
@@ -15,7 +15,7 @@
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>
-       <string>1.10.5</string>
+       <string>1.10.8</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
index 6d9e423c235b9b3c4557f68b2a648b6f104cc873..2fcfb065b34a60d4d3b8271ca599429b5f82b36c 100644 (file)
@@ -15,7 +15,7 @@
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>
-       <string>1.10.5</string>
+       <string>1.10.8</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
index e5c7b141d008288795aa42e3f4831a7056bf571a..5aaf1ea95fd981759e5da13edbbeac3873f725f7 100644 (file)
@@ -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);
index 1afe1b825c4f9b4935b8172bb522ad9823fe7926..cbc99f0d2a42c6ca1720bc45b0911054ca3f5c65 100644 (file)
@@ -17,7 +17,7 @@
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>
-       <string>1.10.5</string>
+       <string>1.10.8</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
index 3036b9293ea7bbd7d610af439212fd7ea9cca24b..0e6f2780cca551cb48bb6821150a6e3082577f8f 100644 (file)
@@ -15,7 +15,7 @@
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>
-       <string>1.10.5</string>
+       <string>1.10.8</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
index 392d4bd5d594baf8ef4dc86a93833d34ef222e6d..ca15b27ad2434b5966309078906b9b9b200e2f52 100644 (file)
@@ -15,7 +15,7 @@
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>
-       <string>1.10.5</string>
+       <string>1.10.8</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
index a67c106802a12573f011741b40a3dd8db7fc0a05..addfd0e89a32c641c1aed91a3ceb69e87582115b 100644 (file)
@@ -15,7 +15,7 @@
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>
-       <string>1.10.5</string>
+       <string>1.10.8</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
index 9fb1d89e7bf0224b677556d7d5f348cf2a61d96d..d4602826be313575581f3b4694de651803a26c33 100644 (file)
@@ -15,7 +15,7 @@
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>
-       <string>1.10.5</string>
+       <string>1.10.8</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
index 4e2afec57ba7fbbc60a1f78638d0cd93052cc172..6d96c4911f1ccb8d0a8bccbc29c07850424584b9 100644 (file)
@@ -15,7 +15,7 @@
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>
-       <string>1.10.5</string>
+       <string>1.10.8</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
index 58aa88ab8539f4bb309c56967b12c1d07bead6ba..d5421f89b55cbfbb501080c581cd1c1e178a52a1 100644 (file)
@@ -15,7 +15,7 @@
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>
-       <string>1.10.5</string>
+       <string>1.10.8</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
index 779094bd2f983a1fb2d77a4a4b057c70c07d2c73..af8557a38b515052dd8d4e06eab98ee158eed9e8 100644 (file)
@@ -15,7 +15,7 @@
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>
-       <string>1.10.5</string>
+       <string>1.10.8</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
index 64ff764d472b43c8cf79fa6407e455378ff5102b..094b9d1c50066da8bfe03fa8d49884180687e097 100644 (file)
@@ -15,7 +15,7 @@
        <key>CFBundlePackageType</key>
        <string>BNDL</string>
        <key>CFBundleShortVersionString</key>
-       <string>1.10.5</string>
+       <string>1.10.8</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
index f4267060adce1b6378b23430e175327d130d57b8..c44f15a20ad8e9ae5d20f2d062b849b96badd53d 100644 (file)
@@ -17,7 +17,7 @@
        <key>CFBundlePackageType</key>
        <string>FMWK</string>
        <key>CFBundleShortVersionString</key>
-       <string>1.10.5</string>
+       <string>1.10.8</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
index f4267060adce1b6378b23430e175327d130d57b8..c44f15a20ad8e9ae5d20f2d062b849b96badd53d 100644 (file)
@@ -17,7 +17,7 @@
        <key>CFBundlePackageType</key>
        <string>FMWK</string>
        <key>CFBundleShortVersionString</key>
-       <string>1.10.5</string>
+       <string>1.10.8</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>