configd-84.1.tar.gz

diff --git a/SystemConfiguration.fproj/CustomInfo.plist b/SystemConfiguration.fproj/CustomInfo.plist
index e71549b6567d161310ac874f44065608b914230c..a1d45775a00b37f1910ec3ada112e617bcad0ab0 100644 (file)
--- a/SystemConfiguration.fproj/CustomInfo.plist
+++ b/SystemConfiguration.fproj/CustomInfo.plist
@@ -1,5 +1,5 @@
 {
        CFBundleName = "SystemConfiguration";
        CFBundleIdentifier = "com.apple.SystemConfiguration";
-       CFBundleShortVersionString = "1.4.0";
+       CFBundleShortVersionString = "1.4.1";
 }

diff --git a/SystemConfiguration.fproj/SCNetworkReachability.c b/SystemConfiguration.fproj/SCNetworkReachability.c
index e5a1e51cfafddd9479fe47bbd03160257aa07800..36be12a07485908a18fdf3ba933d2c72c49ceed2 100644 (file)
--- a/SystemConfiguration.fproj/SCNetworkReachability.c
+++ b/SystemConfiguration.fproj/SCNetworkReachability.c
@@ -901,7 +901,7 @@ checkAddress(SCDynamicStoreRef              *storeP,
        /* get the interface flags */
 
        bzero(&ifr, sizeof(ifr));
-       bcopy(sdl->sdl_data, ifr.ifr_name, sdl->sdl_len);
+       bcopy(sdl->sdl_data, ifr.ifr_name, sdl->sdl_nlen);
 
        isock = socket(AF_INET, SOCK_DGRAM, 0);
        if (isock < 0) {
@@ -973,7 +973,7 @@ checkAddress(SCDynamicStoreRef              *storeP,
        bzero(&if_name, sizeof(if_name));
        bcopy(sdl->sdl_data,
              if_name,
-             (sdl->sdl_len <= IFNAMSIZ) ? sdl->sdl_len : IFNAMSIZ);
+             (sdl->sdl_nlen <= IFNAMSIZ) ? sdl->sdl_nlen : IFNAMSIZ);
 
        if (if_index) {
                *if_index = sdl->sdl_index;

diff --git a/SystemConfiguration.fproj/genSCPreferences.c b/SystemConfiguration.fproj/genSCPreferences.c
index c6573abb4128f549c7675d0773c4282b7343e8bd..f6484a2d1a444ba5ffb7857c76cf33ab9392bdb6 100644 (file)
--- a/SystemConfiguration.fproj/genSCPreferences.c
+++ b/SystemConfiguration.fproj/genSCPreferences.c
@@ -268,6 +268,8 @@ typedef enum {
 #define PROMPT                 "Prompt"
 #define PROTOCOL               "Protocol"
 #define PROXIES                        "Proxies"
+#define PROXYAUTOCONFIGENABLE  "ProxyAutoConfigEnable"
+#define PROXYAUTOCONFIGURLSTRING       "ProxyAutoConfigURLString"
 #define PULSEDIAL              "PulseDial"
 #define RECEIVEACCM            "ReceiveACCM"
 #define RECENT                 "Recent"
@@ -676,6 +678,8 @@ struct {
     { REGULAR, NETPROP PROXIES, SOCKSENABLE, NULL, CFNUMBER_BOOL },
     { REGULAR, NETPROP PROXIES, SOCKSPORT, NULL, CFNUMBER },
     { REGULAR, NETPROP PROXIES, SOCKSPROXY, NULL, CFSTRING },
+    { DEFINE , NETPROP PROXIES, PROXYAUTOCONFIGENABLE, NULL, CFNUMBER_BOOL },
+    { DEFINE , NETPROP PROXIES, PROXYAUTOCONFIGURLSTRING, NULL, CFSTRING },
     { COMMENT, "", NULL, NULL, NULL },
 
     { COMMENT, "/*\n " KEY_PREFIX COMP USERS " Entity Keys\n */", NULL, NULL, NULL },