mistake in merging

diff --git a/server/dhcp.c b/server/dhcp.c
index 198bfc7c92ee9d66759914a54bf803ae0d49a9bc..65c558600c2e89fce07e93249a386e2020d8a4e2 100644 (file)
--- a/server/dhcp.c
+++ b/server/dhcp.c
@@ -935,8 +935,6 @@ void dhcpinform (packet, ms_nulltp)
        struct in_addr from;
        isc_boolean_t zeroed_ciaddr;
 
-       memset(zerobuf, 0, sizeof(zerobuf));
-
        /* The client should set ciaddr to its IP address, but apparently
           it's common for clients not to do this, so we'll use their IP
           source address if they didn't set ciaddr. */