From cf03f5cdc65293b4cb5eba3ed23fed26dad903c9 Mon Sep 17 00:00:00 2001 From: Apple Date: Fri, 3 Oct 2003 20:18:01 +0000 Subject: [PATCH] xnu-344.21.74.tar.gz --- bsd/conf/version.minor | 2 +- bsd/netinet/if_ether.c | 13 ++++++++++-- config/System.kext/Contents/Info.plist | 8 ++++---- .../PlugIns/AppleNMI.kext/Contents/Info.plist | 6 +++--- .../Contents/Info.plist | 6 +++--- .../BSDKernel.kext/Contents/Info.plist | 6 +++--- .../IOADBFamily.kext/Contents/Info.plist | 6 +++--- .../PlugIns/IOKit.kext/Contents/Info.plist | 6 +++--- .../IONVRAMFamily.kext/Contents/Info.plist | 6 +++--- .../Contents/Info.plist | 6 +++--- .../PlugIns/Libkern.kext/Contents/Info.plist | 6 +++--- .../PlugIns/Mach.kext/Contents/Info.plist | 6 +++--- iokit/KernelConfigTables.cpp | 20 +++++++++---------- iokit/conf/version.minor | 2 +- libkern/conf/version.minor | 2 +- libsa/conf/version.minor | 2 +- osfmk/conf/kernelversion.minor | 2 +- osfmk/conf/version.minor | 2 +- pexpert/conf/version.minor | 2 +- 19 files changed, 59 insertions(+), 50 deletions(-) diff --git a/bsd/conf/version.minor b/bsd/conf/version.minor index 7f8f011eb..45a4fb75d 100644 --- a/bsd/conf/version.minor +++ b/bsd/conf/version.minor @@ -1 +1 @@ -7 +8 diff --git a/bsd/netinet/if_ether.c b/bsd/netinet/if_ether.c index 55f109aae..c5a79397d 100644 --- a/bsd/netinet/if_ether.c +++ b/bsd/netinet/if_ether.c @@ -886,9 +886,18 @@ arplookup(addr, create, proxy) if (rt == 0) return (0); rtunref(rt); - - if (rt->rt_flags & RTF_GATEWAY) + + if (rt->rt_flags & RTF_GATEWAY) { why = "host is not on local network"; + + /* If there are no references to this route, purge it */ + if (rt->rt_refcnt <= 0 && (rt->rt_flags & RTF_WASCLONED) != 0) { + rtrequest(RTM_DELETE, + (struct sockaddr *)rt_key(rt), + rt->rt_gateway, rt_mask(rt), + rt->rt_flags, 0); + } + } else if ((rt->rt_flags & RTF_LLINFO) == 0) why = "could not allocate llinfo"; else if (rt->rt_gateway->sa_family != AF_LINK) diff --git a/config/System.kext/Contents/Info.plist b/config/System.kext/Contents/Info.plist index 08e58bfb8..30291cdf5 100644 --- a/config/System.kext/Contents/Info.plist +++ b/config/System.kext/Contents/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion English CFBundleGetInfoString - System Resource Pseudoextension, Apple Computer Inc, 6.7.5 + System Resource Pseudoextension, Apple Computer Inc, 6.8.5 CFBundleIdentifier com.apple.kernel CFBundleInfoDictionaryVersion @@ -15,13 +15,13 @@ CFBundlePackageType KEXT CFBundleShortVersionString - 6.7.5 + 6.8.5 CFBundleSignature ???? CFBundleVersion - 6.7.5 + 6.8.5 OSBundleCompatibleVersion - 6.7.5 + 6.8.5 OSBundleRequired Root OSKernelResource diff --git a/config/System.kext/Contents/PlugIns/AppleNMI.kext/Contents/Info.plist b/config/System.kext/Contents/PlugIns/AppleNMI.kext/Contents/Info.plist index 2d73cf673..71b641b1c 100644 --- a/config/System.kext/Contents/PlugIns/AppleNMI.kext/Contents/Info.plist +++ b/config/System.kext/Contents/PlugIns/AppleNMI.kext/Contents/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion English CFBundleGetInfoString - AppleNMI Pseudoextension, Apple Computer Inc, 6.7.5 + AppleNMI Pseudoextension, Apple Computer Inc, 6.8.5 CFBundleIdentifier com.apple.driver.AppleNMI CFBundleInfoDictionaryVersion @@ -15,11 +15,11 @@ CFBundlePackageType KEXT CFBundleShortVersionString - 6.7.5 + 6.8.5 CFBundleSignature ???? CFBundleVersion - 6.7.5 + 6.8.5 OSBundleRequired Root OSKernelResource diff --git a/config/System.kext/Contents/PlugIns/ApplePlatformFamily.kext/Contents/Info.plist b/config/System.kext/Contents/PlugIns/ApplePlatformFamily.kext/Contents/Info.plist index d24c1fbe4..d32114380 100644 --- a/config/System.kext/Contents/PlugIns/ApplePlatformFamily.kext/Contents/Info.plist +++ b/config/System.kext/Contents/PlugIns/ApplePlatformFamily.kext/Contents/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion English CFBundleGetInfoString - Apple Platform Family Pseudoextension, Apple Computer Inc, 6.7.5 + Apple Platform Family Pseudoextension, Apple Computer Inc, 6.8.5 CFBundleIdentifier com.apple.iokit.ApplePlatformFamily CFBundleInfoDictionaryVersion @@ -15,11 +15,11 @@ CFBundlePackageType KEXT CFBundleShortVersionString - 6.7.5 + 6.8.5 CFBundleSignature ???? CFBundleVersion - 6.7.5 + 6.8.5 OSBundleCompatibleVersion 1.0 OSBundleRequired diff --git a/config/System.kext/Contents/PlugIns/BSDKernel.kext/Contents/Info.plist b/config/System.kext/Contents/PlugIns/BSDKernel.kext/Contents/Info.plist index 7962bb0dd..e806c88fb 100644 --- a/config/System.kext/Contents/PlugIns/BSDKernel.kext/Contents/Info.plist +++ b/config/System.kext/Contents/PlugIns/BSDKernel.kext/Contents/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion English CFBundleGetInfoString - BSD Kernel Pseudoextension, Apple Computer Inc, 6.7.5 + BSD Kernel Pseudoextension, Apple Computer Inc, 6.8.5 CFBundleIdentifier com.apple.kernel.bsd CFBundleInfoDictionaryVersion @@ -15,11 +15,11 @@ CFBundlePackageType KEXT CFBundleShortVersionString - 6.7.5 + 6.8.5 CFBundleSignature ???? CFBundleVersion - 6.7.5 + 6.8.5 OSBundleCompatibleVersion 1.1 OSBundleRequired diff --git a/config/System.kext/Contents/PlugIns/IOADBFamily.kext/Contents/Info.plist b/config/System.kext/Contents/PlugIns/IOADBFamily.kext/Contents/Info.plist index 0971c3ebd..0178d8d1e 100644 --- a/config/System.kext/Contents/PlugIns/IOADBFamily.kext/Contents/Info.plist +++ b/config/System.kext/Contents/PlugIns/IOADBFamily.kext/Contents/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion English CFBundleGetInfoString - ADB Family Pseudoextension, Apple Computer Inc, 6.7.5 + ADB Family Pseudoextension, Apple Computer Inc, 6.8.5 CFBundleIdentifier com.apple.iokit.IOADBFamily CFBundleInfoDictionaryVersion @@ -15,11 +15,11 @@ CFBundlePackageType KEXT CFBundleShortVersionString - 6.7.5 + 6.8.5 CFBundleSignature ???? CFBundleVersion - 6.7.5 + 6.8.5 OSBundleCompatibleVersion 1.0.0b1 OSBundleRequired diff --git a/config/System.kext/Contents/PlugIns/IOKit.kext/Contents/Info.plist b/config/System.kext/Contents/PlugIns/IOKit.kext/Contents/Info.plist index d9a5b7a6b..1ffc7a7b6 100644 --- a/config/System.kext/Contents/PlugIns/IOKit.kext/Contents/Info.plist +++ b/config/System.kext/Contents/PlugIns/IOKit.kext/Contents/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion English CFBundleGetInfoString - I/O Kit Pseudoextension, Apple Computer Inc, 6.7.5 + I/O Kit Pseudoextension, Apple Computer Inc, 6.8.5 CFBundleIdentifier com.apple.kernel.iokit CFBundleInfoDictionaryVersion @@ -15,11 +15,11 @@ CFBundlePackageType KEXT CFBundleShortVersionString - 6.7.5 + 6.8.5 CFBundleSignature ???? CFBundleVersion - 6.7.5 + 6.8.5 OSBundleCompatibleVersion 1.0.0b1 OSBundleRequired diff --git a/config/System.kext/Contents/PlugIns/IONVRAMFamily.kext/Contents/Info.plist b/config/System.kext/Contents/PlugIns/IONVRAMFamily.kext/Contents/Info.plist index bcbfb9cff..30325acf1 100644 --- a/config/System.kext/Contents/PlugIns/IONVRAMFamily.kext/Contents/Info.plist +++ b/config/System.kext/Contents/PlugIns/IONVRAMFamily.kext/Contents/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion English CFBundleGetInfoString - AppleNMI Pseudoextension, Apple Computer Inc, 6.7.5 + AppleNMI Pseudoextension, Apple Computer Inc, 6.8.5 CFBundleIdentifier com.apple.iokit.IONVRAMFamily CFBundleInfoDictionaryVersion @@ -15,11 +15,11 @@ CFBundlePackageType KEXT CFBundleShortVersionString - 6.7.5 + 6.8.5 CFBundleSignature ???? CFBundleVersion - 6.7.5 + 6.8.5 OSBundleCompatibleVersion 1.1 OSBundleRequired diff --git a/config/System.kext/Contents/PlugIns/IOSystemManagement.kext/Contents/Info.plist b/config/System.kext/Contents/PlugIns/IOSystemManagement.kext/Contents/Info.plist index d91cd7683..18d5ee761 100644 --- a/config/System.kext/Contents/PlugIns/IOSystemManagement.kext/Contents/Info.plist +++ b/config/System.kext/Contents/PlugIns/IOSystemManagement.kext/Contents/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion English CFBundleGetInfoString - System Management Pseudoextension, Apple Computer Inc, 6.7.5 + System Management Pseudoextension, Apple Computer Inc, 6.8.5 CFBundleIdentifier com.apple.iokit.IOSystemManagementFamily CFBundleInfoDictionaryVersion @@ -15,11 +15,11 @@ CFBundlePackageType KEXT CFBundleShortVersionString - 6.7.5 + 6.8.5 CFBundleSignature ???? CFBundleVersion - 6.7.5 + 6.8.5 OSBundleCompatibleVersion 1.0.0b1 OSBundleRequired diff --git a/config/System.kext/Contents/PlugIns/Libkern.kext/Contents/Info.plist b/config/System.kext/Contents/PlugIns/Libkern.kext/Contents/Info.plist index 507f1c9db..0f8ed7672 100644 --- a/config/System.kext/Contents/PlugIns/Libkern.kext/Contents/Info.plist +++ b/config/System.kext/Contents/PlugIns/Libkern.kext/Contents/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion English CFBundleGetInfoString - Libkern Pseudoextension, Apple Computer Inc, 6.7.5 + Libkern Pseudoextension, Apple Computer Inc, 6.8.5 CFBundleIdentifier com.apple.kernel.libkern CFBundleInfoDictionaryVersion @@ -15,11 +15,11 @@ CFBundlePackageType KEXT CFBundleShortVersionString - 6.7.5 + 6.8.5 CFBundleSignature ???? CFBundleVersion - 6.7.5 + 6.8.5 OSBundleCompatibleVersion 1.0.0b1 OSBundleRequired diff --git a/config/System.kext/Contents/PlugIns/Mach.kext/Contents/Info.plist b/config/System.kext/Contents/PlugIns/Mach.kext/Contents/Info.plist index f1eb10424..233af64bc 100644 --- a/config/System.kext/Contents/PlugIns/Mach.kext/Contents/Info.plist +++ b/config/System.kext/Contents/PlugIns/Mach.kext/Contents/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion English CFBundleGetInfoString - Mach Kernel Pseudoextension, Apple Computer Inc, 6.7.5 + Mach Kernel Pseudoextension, Apple Computer Inc, 6.8.5 CFBundleIdentifier com.apple.kernel.mach CFBundleInfoDictionaryVersion @@ -15,11 +15,11 @@ CFBundlePackageType KEXT CFBundleShortVersionString - 6.7.5 + 6.8.5 CFBundleSignature ???? CFBundleVersion - 6.7.5 + 6.8.5 OSBundleCompatibleVersion 1.0.0b1 OSBundleRequired diff --git a/iokit/KernelConfigTables.cpp b/iokit/KernelConfigTables.cpp index 88a6f899d..daf20ac17 100644 --- a/iokit/KernelConfigTables.cpp +++ b/iokit/KernelConfigTables.cpp @@ -31,16 +31,16 @@ */ const char * gIOKernelKmods = "{ - 'com.apple.kernel' = '6.7.5'; - 'com.apple.kernel.bsd' = '6.7.5'; - 'com.apple.kernel.iokit' = '6.7.5'; - 'com.apple.kernel.libkern' = '6.7.5'; - 'com.apple.kernel.mach' = '6.7.5'; - 'com.apple.iokit.IOADBFamily' = '6.7.5'; - 'com.apple.iokit.IONVRAMFamily' = '6.7.5'; - 'com.apple.iokit.IOSystemManagementFamily' = '6.7.5'; - 'com.apple.iokit.ApplePlatformFamily' = '6.7.5'; - 'com.apple.driver.AppleNMI' = '6.7.5'; + 'com.apple.kernel' = '6.8.5'; + 'com.apple.kernel.bsd' = '6.8.5'; + 'com.apple.kernel.iokit' = '6.8.5'; + 'com.apple.kernel.libkern' = '6.8.5'; + 'com.apple.kernel.mach' = '6.8.5'; + 'com.apple.iokit.IOADBFamily' = '6.8.5'; + 'com.apple.iokit.IONVRAMFamily' = '6.8.5'; + 'com.apple.iokit.IOSystemManagementFamily' = '6.8.5'; + 'com.apple.iokit.ApplePlatformFamily' = '6.8.5'; + 'com.apple.driver.AppleNMI' = '6.8.5'; }"; diff --git a/iokit/conf/version.minor b/iokit/conf/version.minor index 7f8f011eb..45a4fb75d 100644 --- a/iokit/conf/version.minor +++ b/iokit/conf/version.minor @@ -1 +1 @@ -7 +8 diff --git a/libkern/conf/version.minor b/libkern/conf/version.minor index 7f8f011eb..45a4fb75d 100644 --- a/libkern/conf/version.minor +++ b/libkern/conf/version.minor @@ -1 +1 @@ -7 +8 diff --git a/libsa/conf/version.minor b/libsa/conf/version.minor index 7f8f011eb..45a4fb75d 100644 --- a/libsa/conf/version.minor +++ b/libsa/conf/version.minor @@ -1 +1 @@ -7 +8 diff --git a/osfmk/conf/kernelversion.minor b/osfmk/conf/kernelversion.minor index 7f8f011eb..45a4fb75d 100644 --- a/osfmk/conf/kernelversion.minor +++ b/osfmk/conf/kernelversion.minor @@ -1 +1 @@ -7 +8 diff --git a/osfmk/conf/version.minor b/osfmk/conf/version.minor index 7f8f011eb..45a4fb75d 100644 --- a/osfmk/conf/version.minor +++ b/osfmk/conf/version.minor @@ -1 +1 @@ -7 +8 diff --git a/pexpert/conf/version.minor b/pexpert/conf/version.minor index 7f8f011eb..45a4fb75d 100644 --- a/pexpert/conf/version.minor +++ b/pexpert/conf/version.minor @@ -1 +1 @@ -7 +8 -- 2.45.2