 @@ -1,14 +1,14 @@
-/*	$NetBSD: dhcrelay.c,v 1.6 2016/01/10 20:10:45 christos Exp $	*/
+/*	$NetBSD: dhcrelay.c,v 1.6.8.1 2017/06/10 06:30:07 snj Exp $	*/
 /* dhcrelay.c
    DHCP/BOOTP Relay Agent. */
 /*
  * Copyright(c) 2004-2015 by Internet Systems Consortium, Inc.("ISC")
  * Copyright(c) 1997-2003 by Internet Software Consortium
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
 @@ -18,27 +18,27 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
  * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
  *   Internet Systems Consortium, Inc.
  *   950 Charter Street
  *   Redwood City, CA 94063
  *   <info@isc.org>
  *   https://www.isc.org/
+ *
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: dhcrelay.c,v 1.6 2016/01/10 20:10:45 christos Exp $");
+__RCSID("$NetBSD: dhcrelay.c,v 1.6.8.1 2017/06/10 06:30:07 snj Exp $");
 #include "dhcpd.h"
 #include <syslog.h>
 #include <signal.h>
 #include <sys/time.h>
 TIME default_lease_time = 43200; /* 12 hours... */
 TIME max_lease_time = 86400; /* 24 hours... */
 struct tree_cache *global_options[256];
 struct option *requested_opts[2];
 /* Needed to prevent linking against conflex.c. */
 @@ -197,33 +197,26 @@ main(int argc, char **argv) {
 	if (fd == 1)
 		fd = open("/dev/null", O_RDWR);
 	if (fd == 2)
 		log_perror = 0; /* No sense logging to /dev/null. */
 	else if (fd != -1)
 		close(fd);
 	openlog("dhcrelay", DHCP_LOG_OPTIONS, LOG_DAEMON);
 #if !defined(DEBUG)
 	setlogmask(LOG_UPTO(LOG_INFO));
 #endif
 	/* Set up the isc and dns library managers */
 	status = dhcp_context_create(DHCP_CONTEXT_PRE_DB | DHCP_CONTEXT_POST_DB,
 				     NULL, NULL);
 	if (status != ISC_R_SUCCESS)
 		log_fatal("Can't initialize context: %s",
 			  isc_result_totext(status));
 	/* Set up the OMAPI. */
 	status = omapi_init();
 	if (status != ISC_R_SUCCESS)
 		log_fatal("Can't initialize OMAPI: %s",
 			   isc_result_totext(status));
 	/* Set up the OMAPI wrappers for the interface object. */
 	interface_setup();
 	for (i = 1; i < argc; i++) {
 		if (!strcmp(argv[i], "-4")) {
 #ifdef DHCPv6
 			if (local_family_set && (local_family == AF_INET6)) {
 @@ -526,37 +519,26 @@ main(int argc, char **argv) {
 					     dhcpv6_universe.code_hash,
 					     &code, 0, MDL))
 			log_fatal("Unable to find the RELAY_MSG "
 				  "option definition.");
 		code = D6O_INTERFACE_ID;
 		if (!option_code_hash_lookup(&requested_opts[1],
 					     dhcpv6_universe.code_hash,
 					     &code, 0, MDL))
 			log_fatal("Unable to find the INTERFACE_ID "
 				  "option definition.");
+	}
 #endif
 	/* Get the current time... */
 	gettimeofday(&cur_tv, NULL);
 	/* Discover all the network interfaces. */
 	discover_interfaces(DISCOVER_RELAY);
 #ifdef DHCPv6
 	if (local_family == AF_INET6)
 		setup_streams();
 #endif
 	/* Become a daemon... */
 	if (!no_daemon) {
 		int pid;
 		FILE *pf;
 		int pfdesc;
 		log_perror = 0;
 		if ((pid = fork()) < 0)
 			log_fatal("Can't fork daemon: %m");
 		else if (pid)
 			exit(0);
 @@ -577,26 +559,44 @@ main(int argc, char **argv) {
 					fclose(pf);
+				}
+			}
+		}
 		(void) close(0);
 		(void) close(1);
 		(void) close(2);
 		(void) setsid();
 		IGNORE_RET (chdir("/"));
+	}
 	/* Set up the isc and dns library managers */
 	status = dhcp_context_create(DHCP_CONTEXT_PRE_DB | DHCP_CONTEXT_POST_DB,
 				     NULL, NULL);
 	if (status != ISC_R_SUCCESS)
 		log_fatal("Can't initialize context: %s",
 			  isc_result_totext(status));
 	/* Get the current time... */
 	gettimeofday(&cur_tv, NULL);
 	/* Discover all the network interfaces. */
 	discover_interfaces(DISCOVER_RELAY);
 #ifdef DHCPv6
 	if (local_family == AF_INET6)
 		setup_streams();
 #endif
 	/* Set up the packet handler... */
 	if (local_family == AF_INET)
 		bootp_packet_handler = do_relay4;
 #ifdef DHCPv6
 	else
 		dhcpv6_packet_handler = do_packet6;
 #endif
 #if defined(ENABLE_GENTLE_SHUTDOWN)
 	/* no signal handlers until we deal with the side effects */
         /* install signal handlers */
 	signal(SIGINT, dhcp_signal_handler);   /* control-c */
 	signal(SIGTERM, dhcp_signal_handler);  /* kill */
 @@ -938,27 +938,27 @@ find_interface_by_agent_option(struct dh
 	/* If we didn't get a match, the circuit ID was bogus. */
 	++bad_circuit_id;
 	return (-1);
+}
 /*
  * Examine a packet to see if it's a candidate to have a Relay
  * Agent Information option tacked onto its tail.   If it is, tack
  * the option on.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: dhcrelay.c,v 1.6 2016/01/10 20:10:45 christos Exp $");
+__RCSID("$NetBSD: dhcrelay.c,v 1.6.8.1 2017/06/10 06:30:07 snj Exp $");
 static int
 add_relay_agent_options(struct interface_info *ip, struct dhcp_packet *packet,
 			unsigned length, struct in_addr giaddr) {
 	int is_dhcp = 0, mms;
 	unsigned optlen;
 	u_int8_t *op, *nextop, *sp, *max, *end_pad = NULL;
 	/* If we're not adding agent options to packets, we can skip
 	   this. */
 	if (!add_agent_options)
 		return (length);
 	/* If there's no cookie, it's a bootp packet, so we should just