Clean up obsolete dregs.

diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index d40de1b86dc4609e0eae8edbff5094996c4defa9..521142d756842ec58b3f0f75f4ff01a30b7c3f73 100644 (file)
--- a/includes/dhcpd.h
+++ b/includes/dhcpd.h
@@ -47,7 +47,6 @@
 #include "tree.h"
 #include "hash.h"
 #include "inet.h"
-#include "sysconf.h"
 #include "auth.h"
 
 #if !defined (OPTION_HASH_SIZE)
@@ -683,36 +682,6 @@ struct dns_query {
        int backoff;                    /* Current backoff, in seconds. */
 };
 
-struct interact_client; /* forward */
-
-/* Actions that can be taken by an interactive connection to the dhcp server
-   or client. */
-
-struct interact_actions {
-       void (*ls) PROTO ((struct interact_client *));
-       void (*print) PROTO ((struct interact_client *, char *));
-       void (*set) PROTO ((struct interact_client *, char *));
-       void (*rm) PROTO ((struct interact_client *, char *));
-       void (*cd) PROTO ((struct interact_client *, char *));
-       void (*cdup) PROTO ((struct interact_client *));
-       void * (*next) PROTO ((struct interact_client *, void *));
-};
-
-/* Interactive connection state. */
-
-struct interact_client {
-       struct interact_client *next;
-       int fd;
-       struct interact_actions cur_node_actions;
-       void *cur_node;
-       int cur_node_classp;
-       int last_input;
-       struct protocol *proto;
-
-       char ibuf [1024];
-       int ibuflen;
-};
-
 /* Bitmask of dhcp option codes. */
 typedef unsigned char option_mask [16];
 
@@ -1335,7 +1304,6 @@ int script_go PROTO ((struct client_state *));
 struct client_lease *packet_to_lease PROTO ((struct packet *));
 void go_daemon PROTO ((void));
 void write_client_pid_file PROTO ((void));
-void status_message PROTO ((struct sysconf_header *, void *));
 void client_location_changed PROTO ((void));
 
 /* db.c */
@@ -1461,20 +1429,6 @@ struct name_server *first_name_server PROTO ((void));
 int inet_aton PROTO ((const char *, struct in_addr *));
 #endif
 
-/* sysconf.c */
-void sysconf_startup PROTO ((void (*) (struct sysconf_header *, void *)));
-void sysconf_restart PROTO ((void *));
-void sysconf_message PROTO ((struct protocol *proto));
-
-/* interact.c */
-void interact_startup PROTO ((void));
-void new_interact_connection PROTO ((struct protocol *));
-void interact_client_input PROTO ((struct protocol *));
-int interact_client_write PROTO ((struct interact_client *, char *, int));
-
-/* dhcpdi.c */
-extern struct interact_actions top_level_actions;
-
 /* class.c */
 extern int have_billing_classes;
 struct class unknown_class;

diff --git a/server/Makefile.dist b/server/Makefile.dist
index 7fecba2adf3dd3958d5e5f749987f380f7d3406e..84760a3af174a56a7b0f5f5823d894424ff3814f 100644 (file)
--- a/server/Makefile.dist
+++ b/server/Makefile.dist
@@ -19,7 +19,7 @@
 
 CATMANPAGES = dhcpd.cat8 dhcpd.conf.cat5 dhcpd.leases.cat5
 SRCS   = dhcpd.c dhcp.c bootp.c confpars.c db.c class.c failover.c
-OBJS   = dhcpd.o dhcp.o bootp.o confpars.o db.o dhcpdi.o class.o failover.o
+OBJS   = dhcpd.o dhcp.o bootp.o confpars.o db.o class.o failover.o
 PROG   = dhcpd
 MAN    = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
 

diff --git a/server/dhcpd.c b/server/dhcpd.c
index 5ebe94afec2e81ca7e8084081df47d257584bd0e..744a0932acfde95356dcaa43209f093502793fdf 100644 (file)
--- a/server/dhcpd.c
+++ b/server/dhcpd.c
@@ -22,7 +22,7 @@
 
 #ifndef lint
 static char ocopyright[] =
-"$Id: dhcpd.c,v 1.59 1999/03/16 05:50:44 mellon Exp $ Copyright 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.";
+"$Id: dhcpd.c,v 1.60 1999/03/16 05:55:40 mellon Exp $ Copyright 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium.";
 #endif
 
   static char copyright[] =
@@ -184,9 +184,6 @@ int main (argc, argv, envp)
        dns_startup (); 
 #endif
 
-       /* Start the interactive client listener. */
-       interact_startup ();
-
        /* Set up the client classification system. */
        classification_setup ();