From: Ted Lemon <source@isc.org>
Date: Tue, 16 Jan 2001 23:00:49 +0000 (+0000)
Subject: Add a send statement that behaves the same as the supersede statement.
X-Git-Tag: V3-BETA-2-PATCH-12~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33454222e7efc431413be7c0ca4d8ff9c5c118f8;p=thirdparty%2Fdhcp.git

Add a send statement that behaves the same as the supersede statement.
---

diff --git a/common/execute.c b/common/execute.c
index 1a136e0e4..e7b8ca7c7 100644
--- a/common/execute.c
+++ b/common/execute.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: execute.c,v 1.43 2001/01/03 23:15:33 mellon Exp $ Copyright (c) 1998-2000 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: execute.c,v 1.44 2001/01/16 22:56:56 mellon Exp $ Copyright (c) 1998-2000 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -224,8 +224,11 @@ int execute_statements (result, packet, lease, client_state,
 			return 1;
 
 		      case supersede_option_statement:
+		      case send_option_statement:
 #if defined (DEBUG_EXPRESSIONS)
-			log_debug ("exec: supersede option %s.%s",
+			log_debug ("exec: %s option %s.%s",
+			      (r -> op == supersede_option_statement
+			       ? "supersede" : "send"),
 			      r -> data.option -> option -> universe -> name,
 			      r -> data.option -> option -> name);
 			goto option_statement;
@@ -627,6 +630,7 @@ int executable_statement_dereference (ptr, file, line)
 		break;
 
 	      case supersede_option_statement:
+	      case send_option_statement:
 	      case default_option_statement:
 	      case append_option_statement:
 	      case prepend_option_statement:
@@ -780,6 +784,7 @@ void write_statements (file, statements, indent)
 			break;
 
 		      case supersede_option_statement:
+		      case send_option_statement:
 			s = "supersede";
 			goto option_statement;
 
diff --git a/common/options.c b/common/options.c
index ab2bda2e9..4a3738e3d 100644
--- a/common/options.c
+++ b/common/options.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: options.c,v 1.78 2001/01/11 23:13:50 mellon Exp $ Copyright (c) 1995-2001 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: options.c,v 1.79 2001/01/16 23:00:49 mellon Exp $ Copyright (c) 1995-2001 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #define DHCP_OPTION_DATA
@@ -1195,6 +1195,7 @@ void set_option (universe, options, option, op)
 		break;
 
 	      case supersede_option_statement:
+	      case send_option_statement:
 		/* Install the option, replacing any existing version. */
 		save_option (universe, options, option);
 		break;