From: Evan Broder <broder@mit.edu>
Date: Mon, 6 Jul 2009 00:21:41 +0000 (-0400)
Subject: Revert the server identifier in the DHCP server. Including the server
X-Git-Tag: 0.0.3~1
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-dhcp.git/commitdiff_plain/b3b2ea80e5c3aae0d9ab7814893c4dde05979c89?ds=inline

Revert the server identifier in the DHCP server. Including the server
ID implies that we're capable of handling unicast communication with
DHCP clients, which we're currently not.

This reverts commit 2361.

svn path=/trunk/packages/invirt-dhcp/; revision=2362
---

diff --git a/debian/changelog b/debian/changelog
index 0ad74a9..ea490a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-invirt-dhcp (0.0.3) unstable; urgency=low
-
-  * Include the server identifier field in DHCPOFFERs (LP: #395696).
-
- -- Evan Broder <broder@mit.edu>  Sun, 05 Jul 2009 17:15:09 -0700
-
 invirt-dhcp (0.0.2) unstable; urgency=low
 
   * Don't throw a sqlalchemy.exceptions.InvalidRequestError exception if
diff --git a/invirt-dhcpserver b/invirt-dhcpserver
index a1966d8..04376d0 100755
--- a/invirt-dhcpserver
+++ b/invirt-dhcpserver
@@ -7,7 +7,6 @@ from pydhcplib.type_hw_addr import hwmac
 from pydhcplib.type_ipv4 import ipv4
 from pydhcplib.type_strlist import strlist
 import socket
-import os
 import IN
 
 import syslog as s
@@ -19,8 +18,7 @@ from invirt.config import structs as config
 dhcp_options = {'subnet_mask': config.dhcp.netmask,
                 'router': config.dhcp.gateway,
                 'domain_name_server': ','.join(config.dhcp.dns),
-                'ip_address_lease_time': 60*60*24,
-                'server_identifier': socket.gethostbyname(os.uname()[1])}
+                'ip_address_lease_time': 60*60*24}
 
 class DhcpBackend:
     def __init__(self):