From f1fe2984b356ae7316ac2a60f9100156403acc3e Mon Sep 17 00:00:00 2001
From: Art Yerkes <art.yerkes@gmail.com>
Date: Fri, 22 Aug 2008 05:58:56 +0000
Subject: [PATCH] Commit bugboy's patch from bug 2392, and remove DeviceDesc,
 which isn't needed anymore.

svn path=/trunk/; revision=35523
---
 reactos/base/services/dhcp/adapter.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/reactos/base/services/dhcp/adapter.c b/reactos/base/services/dhcp/adapter.c
index f708998cd2f..a669bd25a5d 100644
--- a/reactos/base/services/dhcp/adapter.c
+++ b/reactos/base/services/dhcp/adapter.c
@@ -108,7 +108,7 @@ HKEY FindAdapterKey( PDHCP_ADAPTER Adapter ) {
     PCHAR TargetKeyName = NULL;
     PCHAR *EnumKeysLinkage = GetSubkeyNames( EnumKeyName, "\\Linkage" );
     PCHAR *EnumKeysTop     = GetSubkeyNames( EnumKeyName, "" );
-    PCHAR RootDevice = NULL, DriverDesc = NULL;
+    PCHAR RootDevice = NULL;
     HKEY EnumKey, OutKey = NULL;
     DWORD Error = ERROR_SUCCESS;
 
@@ -121,12 +121,9 @@ HKEY FindAdapterKey( PDHCP_ADAPTER Adapter ) {
     for( i = 0; EnumKeysLinkage[i]; i++ ) {
         RootDevice = RegReadString
             ( EnumKey, EnumKeysLinkage[i], "RootDevice" );
-        DriverDesc = RegReadString
-            ( EnumKey, EnumKeysTop[i], "DriverDesc" );
 
-        if( DriverDesc &&
-            RootDevice &&
-            !strcmp( DriverDesc, Adapter->DhclientInfo.name ) ) {
+        if( RootDevice &&
+            !strcmp( RootDevice, Adapter->DhclientInfo.name ) ) {
             TargetKeyName =
                 (CHAR*) malloc( strlen( TargetKeyNameStart ) +
                         strlen( RootDevice ) +
@@ -138,13 +135,11 @@ HKEY FindAdapterKey( PDHCP_ADAPTER Adapter ) {
             break;
         } else {
             free( RootDevice ); RootDevice = 0;
-            free( DriverDesc ); DriverDesc = 0;
         }
     }
 
 cleanup:
     if( RootDevice ) free( RootDevice );
-    if( DriverDesc ) free( DriverDesc );
     if( EnumKeysLinkage ) free( EnumKeysLinkage );
     if( EnumKeysTop ) free( EnumKeysTop );
     if( TargetKeyName ) free( TargetKeyName );