[janderwald] 36888: - Delete old DhcpNameServer key when no nameservers could be obtained - Close registry key when done

Author: janderwald
Date: Wed Oct 22 04:00:33 2008
New Revision: 36888

URL: http://svn.reactos.org/svn/reactos?rev=36888&view=rev
Log:
- Delete old DhcpNameServer key when no nameservers could be obtained
- Close registry key when done

Modified:
    trunk/reactos/base/services/dhcp/dhclient.c

Modified: trunk/reactos/base/services/dhcp/dhclient.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dhclient...
==============================================================================
--- trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] (original)
+++ trunk/reactos/base/services/dhcp/dhclient.c [iso-8859-1] Wed Oct 22 04:00:33 2008
@@ -451,9 +451,16 @@
 }

void set_name_servers( PDHCP_ADAPTER Adapter, struct client_lease *new_lease ) {
+    CHAR Buffer[200] = "SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\Interfaces\";
+    HKEY RegKey;
+
+    strcat(Buffer, Adapter->DhclientInfo.name);
+    if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, Buffer, 0, KEY_WRITE, &RegKey ) != ERROR_SUCCESS)
+        return;
+
+
     if( new_lease->options[DHO_DOMAIN_NAME_SERVERS].len ) {
-        CHAR Buffer[200] = "SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\Interfaces\";
-        HKEY RegKey;
+
         struct iaddr nameserver;
         char *nsbuf;
         int i, addrs =
@@ -462,13 +469,9 @@
                /* XXX I'm setting addrs to 1 until we are ready up the chain */
                addrs = 1;
         nsbuf = malloc( addrs * sizeof(IP_ADDRESS_STRING) );
-        nsbuf[0] = 0;
-        strcat(Buffer, Adapter->DhclientInfo.name);
-
-        if( nsbuf && !RegOpenKeyEx
-            ( HKEY_LOCAL_MACHINE,
-              Buffer,
-              0, KEY_WRITE, &RegKey ) ) {
+
+        if( nsbuf) {
+            nsbuf[0] = 0;
             for( i = 0; i < addrs; i++ ) {
                 nameserver.len = sizeof(ULONG);
                 memcpy( nameserver.iabuf,
@@ -480,12 +483,17 @@

DH_DbgPrint(MID_TRACE,("Setting DhcpNameserver: %s\n", nsbuf));

-            RegSetValueEx( RegKey, "DhcpNameServer", 0, REG_SZ,
-                           (LPBYTE)nsbuf, strlen(nsbuf) + 1);
+            RegSetValueExA( RegKey, "DhcpNameServer", 0, REG_SZ,
+                           (LPBYTE)nsbuf, strlen(nsbuf) + 1 );
+            free( nsbuf );
         }
-	// free(NULL) is defined to be OK too
-	free( nsbuf );
+
+    } else {
+            RegDeleteValueW( RegKey, L"DhcpNameServer" );
     }
+
+    RegCloseKey( RegKey );
+
 }

void setup_adapter( PDHCP_ADAPTER Adapter, struct client_lease *new_lease ) {