From: Ted Lemon <source@isc.org>
Date: Sun, 14 Feb 1999 19:40:22 +0000 (+0000)
Subject: Fix up mistakes in recent 2.0 pullups.
X-Git-Tag: V3-ALPHA-19990315~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=339b0231e472d8953057bd5cdd74d5a1215f8ce1;p=thirdparty%2Fdhcp.git

Fix up mistakes in recent 2.0 pullups.
---

diff --git a/client/dhclient.c b/client/dhclient.c
index ae9a2adfc..e9a6c2d93 100644
--- a/client/dhclient.c
+++ b/client/dhclient.c
@@ -55,8 +55,8 @@
  */
 
 #ifndef lint
-static char copyright[] =
-"$Id: dhclient.c,v 1.54 1999/02/14 18:37:42 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+static char ocopyright[] =
+"$Id: dhclient.c,v 1.55 1999/02/14 19:40:20 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -1656,11 +1656,11 @@ void make_request (client, lease)
 	    client -> state == S_REBINDING) {
 		memcpy (&client -> packet.ciaddr,
 			lease -> address.iabuf, lease -> address.len);
-		ip -> client -> packet.flags = 0;
+		client -> packet.flags = 0;
 	} else {
 		memset (&client -> packet.ciaddr, 0,
 			sizeof client -> packet.ciaddr);
-		ip -> client -> packet.flags = htons (BOOTP_BROADCAST);
+		client -> packet.flags = htons (BOOTP_BROADCAST);
 	}
 
 	memset (&client -> packet.yiaddr, 0,
diff --git a/common/socket.c b/common/socket.c
index 03063edb0..ff9b8f50e 100644
--- a/common/socket.c
+++ b/common/socket.c
@@ -50,7 +50,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: socket.c,v 1.28 1999/02/14 18:55:32 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: socket.c,v 1.29 1999/02/14 19:40:21 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -102,7 +102,7 @@ int if_register_socket (info)
 	int sock;
 	int flag;
 
-#ifndef SO_BINDTODEVICE && !defined (USE_FALLBACK)
+#if !defined (SO_BINDTODEVICE) && !defined (USE_FALLBACK)
 	/* Make sure only one interface is registered. */
 	if (once)
 		error ("The standard socket API can only support %s",
diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index fd5ef2694..a0a9d0ff2 100644
--- a/includes/dhcpd.h
+++ b/includes/dhcpd.h
@@ -1221,7 +1221,7 @@ void maybe_setup_fallback PROTO ((void));
 
 /* dispatch.c */
 extern struct interface_info *interfaces,
-	*dummy_interfaces, fallback_interface;
+	*dummy_interfaces, *fallback_interface;
 extern struct protocol *protocols;
 extern int quiet_interface_discovery;
 extern void (*bootp_packet_handler) PROTO ((struct interface_info *,
diff --git a/relay/dhcrelay.c b/relay/dhcrelay.c
index 7bd7c2792..b3653c688 100644
--- a/relay/dhcrelay.c
+++ b/relay/dhcrelay.c
@@ -41,8 +41,8 @@
  */
 
 #ifndef lint
-static char copyright[] =
-"$Id: dhcrelay.c,v 1.17 1999/02/14 19:04:05 mellon Exp $ Copyright (c) 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
+static char ocopyright[] =
+"$Id: dhcrelay.c,v 1.18 1999/02/14 19:40:22 mellon Exp $ Copyright (c) 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
diff --git a/server/bootp.c b/server/bootp.c
index 438e8c626..5f7421646 100644
--- a/server/bootp.c
+++ b/server/bootp.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: bootp.c,v 1.36 1999/02/14 19:06:57 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: bootp.c,v 1.37 1999/02/14 19:40:22 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -221,7 +221,7 @@ void bootp (packet)
 			memset (&raw.file [d1.len],
 				0, (sizeof raw.file) - d1.len);
 		data_string_forget (&d1, "bootrequest");
-	} else {
+	} else
 		memcpy (raw.file, packet -> raw -> file, sizeof raw.file);
 
 	/* Choose a server name as above. */
diff --git a/server/confpars.c b/server/confpars.c
index 10738a3ec..2b29200ac 100644
--- a/server/confpars.c
+++ b/server/confpars.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: confpars.c,v 1.57 1999/02/14 19:08:51 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: confpars.c,v 1.58 1999/02/14 19:40:22 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -1335,7 +1335,6 @@ void parse_subnet_declaration (cfile, share)
 	else {
 		u = (struct subnet *)0;
 		for (t = share -> subnets;
-		     t -> next_sibling; t = t -> next_sibling) {
 		     t -> next_sibling; t = t -> next_sibling) {
 			if (subnet_inner_than (subnet, t, 0)) {
 				if (u)
diff --git a/sysconfd/sysconfd.c b/sysconfd/sysconfd.c
index 86a335126..8434b1488 100644
--- a/sysconfd/sysconfd.c
+++ b/sysconfd/sysconfd.c
@@ -44,7 +44,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: sysconfd.c,v 1.6 1998/11/05 18:36:34 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: sysconfd.c,v 1.7 1999/02/14 19:40:19 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -62,7 +62,6 @@ static void client_input PROTO ((struct protocol *));
 int log_priority;
 int log_perror;
 
-struct interface_info fallback_interface;
 TIME cur_time;
 u_int16_t local_port;