From 98bd7ca0990e6d88e3345d3bc966ebe8216691a7 Mon Sep 17 00:00:00 2001
From: David Hankins <dhankins@isc.org>
Date: Tue, 8 May 2007 23:05:22 +0000
Subject: DHCPv6 branch merged to HEAD.

---
 dhcpctl/omshell.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'dhcpctl')

diff --git a/dhcpctl/omshell.c b/dhcpctl/omshell.c
index ffbde434..1107eeff 100644
--- a/dhcpctl/omshell.c
+++ b/dhcpctl/omshell.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: omshell.c,v 1.12 2007/01/29 10:25:55 shane Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: omshell.c,v 1.13 2007/05/08 23:05:20 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include <time.h>
@@ -58,6 +58,10 @@ int parse_allow_deny (struct option_cache **oc, struct parse *cfile, int flag)
 }
 void dhcp (struct packet *packet) { }
 void bootp (struct packet *packet) { }
+
+/* XXX: should we warn or something here? */
+void dhcpv6(struct packet *packet) { }
+
 int check_collection (struct packet *p, struct lease *l, struct collection *c)
 {
 	return 0;
@@ -76,8 +80,8 @@ static void check (isc_result_t status, const char *func) {
 	}
 }
 
-int main (int argc, char **argv, char **envp)
-{
+int 
+main(int argc, char **argv) {
 	isc_result_t status, waitstatus;
 	dhcpctl_handle connection;
 	dhcpctl_handle authenticator;
-- 
cgit v1.2.1