From: Ted Lemon <source@isc.org>
Date: Mon, 12 Feb 2001 21:10:10 +0000 (+0000)
Subject: Get rid of lease -> hostname, which isn't used.
X-Git-Tag: V3-BETA-2-PATCH-18~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e42c382659727871cc020291761504ca7aeed299;p=thirdparty%2Fdhcp.git

Get rid of lease -> hostname, which isn't used.
---

diff --git a/server/omapi.c b/server/omapi.c
index 4d227c87d..30884447f 100644
--- a/server/omapi.c
+++ b/server/omapi.c
@@ -50,7 +50,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: omapi.c,v 1.41 2000/11/28 23:27:22 mellon Exp $ Copyright (c) 1999-2000 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: omapi.c,v 1.42 2001/02/12 21:10:10 mellon Exp $ Copyright (c) 1999-2000 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -279,11 +279,6 @@ isc_result_t dhcp_lease_get_value (omapi_object_t *h, omapi_object_t *id,
 		return omapi_make_const_value (value, name,
 					       lease -> uid,
 					       lease -> uid_len, MDL);
-	} else if (!omapi_ds_strcmp (name, "hostname")) {
-		if (lease -> hostname)
-			return omapi_make_string_value
-				(value, name, lease -> hostname, MDL);
-		return ISC_R_NOTFOUND;
 	} else if (!omapi_ds_strcmp (name, "client-hostname")) {
 		if (lease -> client_hostname)
 			return omapi_make_string_value
@@ -353,13 +348,9 @@ isc_result_t dhcp_lease_destroy (omapi_object_t *h, const char *file, int line)
 		lease -> uid = &lease -> uid_buf [0];
 		lease -> uid_len = 0;
 	}
-	if (lease -> hostname) {
-		dfree (lease -> hostname, MDL);
-		lease -> hostname = (char *)0;
-	}
 	if (lease -> client_hostname) {
 		dfree (lease -> client_hostname, MDL);
-		lease -> hostname = (char *)0;
+		lease -> client_hostname = (char *)0;
 	}
 	if (lease -> host)
 		host_dereference (&lease -> host, file, line);
@@ -473,15 +464,6 @@ isc_result_t dhcp_lease_stuff_values (omapi_object_t *c,
 		}
 	}
 
-	if (lease -> hostname) {
-		status = omapi_connection_put_name (c, "hostname");
-		if (status != ISC_R_SUCCESS)
-			return status;
-		status = omapi_connection_put_string (c, lease -> hostname);
-		if (status != ISC_R_SUCCESS)
-			return status;
-	}
-
 	if (lease -> client_hostname) {
 		status = omapi_connection_put_name (c, "client-hostname");
 		if (status != ISC_R_SUCCESS)