From: Ted Lemon <source@isc.org>
Date: Mon, 12 Feb 2001 21:59:31 +0000 (+0000)
Subject: Fix some trace-related ifdefs.
X-Git-Tag: V3-BETA-2-PATCH-18~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=662df45ac02d7e9e75c2dda5d026ecfca1966614;p=thirdparty%2Fdhcp.git

Fix some trace-related ifdefs.
---

diff --git a/server/confpars.c b/server/confpars.c
index b98412bce..ed2d02575 100644
--- a/server/confpars.c
+++ b/server/confpars.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: confpars.c,v 1.132 2001/02/12 20:53:04 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: confpars.c,v 1.133 2001/02/12 21:59:30 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -53,7 +53,6 @@ static TIME parsed_time;
 #if defined (TRACING)
 trace_type_t *trace_readconf_type;
 trace_type_t *trace_readleases_type;
-#endif
 
 void parse_trace_setup ()
 {
@@ -64,6 +63,7 @@ void parse_trace_setup ()
 						     trace_conf_input,
 						     trace_conf_stop, MDL);
 }
+#endif
 
 /* conf-file :== parameters declarations EOF
    parameters :== <nil> | parameter | parameters parameter
diff --git a/server/dhcpd.c b/server/dhcpd.c
index f671c06bb..c80f4f011 100644
--- a/server/dhcpd.c
+++ b/server/dhcpd.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char ocopyright[] =
-"$Id: dhcpd.c,v 1.110 2001/02/12 21:04:06 mellon Exp $ Copyright 1995-2001 Internet Software Consortium.";
+"$Id: dhcpd.c,v 1.111 2001/02/12 21:59:31 mellon Exp $ Copyright 1995-2001 Internet Software Consortium.";
 #endif
 
   static char copyright[] =
@@ -210,8 +210,10 @@ int main (argc, argv, envp)
 	int no_dhcpd_conf = 0;
 	int no_dhcpd_db = 0;
 	int no_dhcpd_pid = 0;
+#if defined (TRACING)
 	char *traceinfile = (char *)0;
 	char *traceoutfile = (char *)0;
+#endif
 
 	/* Set up the client classification system. */
 	classification_setup ();
@@ -300,6 +302,7 @@ int main (argc, argv, envp)
 		} else if (!strcmp (argv [i], "--version")) {
 			log_info ("isc-dhcpd-%s", DHCP_VERSION);
 			exit (0);
+#if defined (TRACING)
 		} else if (!strcmp (argv [i], "-tf")) {
 			if (++i == argc)
 				usage ();
@@ -309,6 +312,7 @@ int main (argc, argv, envp)
 				usage ();
 			traceinfile = argv [i];
 			trace_replay_init ();
+#endif /* TRACING */
 		} else if (argv [i][0] == '-') {
 			usage ();
 		} else {
@@ -847,8 +851,12 @@ static void usage ()
 
 	log_fatal ("Usage: dhcpd [-p <UDP port #>] [-d] [-f]%s%s%s%s",
 		   "\n             [-cf config-file] [-lf lease-file]",
+#if defined (TRACING)
 		   "\n		   [-tf trace-output-file]",
 		   "\n		   [-play trace-input-file]",
+#else
+		   "", "",
+#endif /* TRACING */
 		   "\n             [-t] [-T] [-s server] [if0 [...ifN]]");
 }