Ignore HUP signals. If you need to modify the running configuration

just run dhclient again, which does the same thing. i.e. kills
existing dhclient processes and exec's a new copy.

One less knob. Improves documention by eliminating very non-standard
SIGNALS section.

Feedback from schwarze@. ok deraadt@

2 files changed, 4 insertions, 21 deletions

diff --git a/sbin/dhclient/dhclient.8 b/sbin/dhclient/dhclient.8
index 4285c284e84..cb9b7260d84 100644
--- a/sbin/dhclient/dhclient.8
+++ b/sbin/dhclient/dhclient.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: dhclient.8,v 1.37 2018/05/19 22:10:22 krw Exp $
+.\" $OpenBSD: dhclient.8,v 1.38 2019/01/18 07:39:53 krw Exp $
 .\"
 .\" Copyright (c) 1997 The Internet Software Consortium.
 .\" All rights reserved.
@@ -35,7 +35,7 @@
 .\" Enterprises.  To learn more about the Internet Software Consortium,
 .\" see ``http://www.isc.org/isc''.  To learn more about Vixie
 .\" Enterprises, see ``http://www.vix.com''.
-.Dd $Mdocdate: May 19 2018 $
+.Dd $Mdocdate: January 18 2019 $
 .Dt DHCLIENT 8
 .Os
 .Sh NAME
@@ -260,16 +260,6 @@ In that case, it may be advantageous to
 arrange with the network administrator for an entry on the BOOTP
 database, so that the host can boot quickly on that network rather
 than cycling through the list of old leases.
-.Sh SIGNALS
-.Bl -tag -width "HUP"
-.It Dv HUP
-On receiving
-.Dv HUP
-.Nm
-will restart itself, reading
-.Xr dhclient.conf 5
-and obtaining a new lease.
-.El
 .Sh FILES
 .Bl -tag -width "/var/db/dhclient.leases.<IFNAME>XXX" -compact
 .It Pa /etc/dhclient.conf
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index 7b9ca99da52..2cd7af4e192 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dhclient.c,v 1.611 2019/01/18 01:38:58 krw Exp $	*/
+/*	$OpenBSD: dhclient.c,v 1.612 2019/01/18 07:39:53 krw Exp $	*/
 
 /*
  * Copyright 2004 Henning Brauer <henning@openbsd.org>
@@ -125,7 +125,6 @@ struct proposal {
 	int		inits;
 };
 
-void		 sighdlr(int);
 void		 usage(void);
 int		 res_hnok_list(const char *);
 int		 addressinuse(char *, struct in_addr, char *);
@@ -190,12 +189,6 @@ struct client_lease *get_recorded_lease(struct interface_info *);
 static FILE *leaseFile;
 static FILE *optionDB;
 
-void
-sighdlr(int sig)
-{
-	quit = sig;
-}
-
 int
 get_ifa_family(char *cp, int n)
 {
@@ -2107,7 +2100,7 @@ go_daemon(void)
 	log_procinit(log_procname);
 
 	setproctitle("%s", log_procname);
-	signal(SIGHUP, sighdlr);
+	signal(SIGHUP, SIG_IGN);
 	signal(SIGPIPE, SIG_IGN);
 }