From fb67669902e6d473bf5fcc7e15dc2af7bb6bdef3 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Sun, 24 May 2020 21:51:26 -0400
Subject: [PATCH 1/2] Don't attempt to catch the uncatchable SIGKILL signal

---
 ddclient | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/ddclient b/ddclient
index 205c24a..709813d 100755
--- a/ddclient
+++ b/ddclient
@@ -834,10 +834,8 @@ if (!opt('daemon') && $programd =~ /d$/) {
 }
 my $caught_hup  = 0;
 my $caught_term = 0;
-my $caught_kill = 0;
 $SIG{'HUP'}    = sub { $caught_hup  = 1; };
 $SIG{'TERM'}   = sub { $caught_term = 1; };
-$SIG{'KILL'}   = sub { $caught_kill = 1; };
 # don't fork() if foreground or force is on
 if (opt('foreground') || opt('force')) {
     ;
@@ -893,7 +891,7 @@ do {
 	sendmail();
 
 	my $left = $daemon;
-	while (($left > 0) && !$caught_hup && !$caught_term && !$caught_kill) {
+	while (($left > 0) && !$caught_hup && !$caught_term) {
 		my $delay = $left > 10 ? 10 : $left;
 
 		$0 = sprintf("%s - sleeping for %s seconds", $program, $left);
@@ -913,9 +911,8 @@ do {
     } else {
 	$result = $result eq 'OK' ? 0 : 1;
     }
-} while ($daemon && !$result && !$caught_term && !$caught_kill);
+} while ($daemon && !$result && !$caught_term);
 
-warning("caught SIGKILL; exiting") if $caught_kill;
 unlink_pid();
 sendmail();
 

From f47ea295d5f248846eaaae50287a8ba8c1e8b246 Mon Sep 17 00:00:00 2001
From: Richard Hansen <rhansen@rhansen.org>
Date: Sun, 24 May 2020 21:56:07 -0400
Subject: [PATCH 2/2] Gracefully exit if interrupted by SIGINT

---
 ddclient | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ddclient b/ddclient
index 709813d..8b128db 100755
--- a/ddclient
+++ b/ddclient
@@ -834,8 +834,10 @@ if (!opt('daemon') && $programd =~ /d$/) {
 }
 my $caught_hup  = 0;
 my $caught_term = 0;
+my $caught_int  = 0;
 $SIG{'HUP'}    = sub { $caught_hup  = 1; };
 $SIG{'TERM'}   = sub { $caught_term = 1; };
+$SIG{'INT'}    = sub { $caught_int  = 1; };
 # don't fork() if foreground or force is on
 if (opt('foreground') || opt('force')) {
     ;
@@ -891,7 +893,7 @@ do {
 	sendmail();
 
 	my $left = $daemon;
-	while (($left > 0) && !$caught_hup && !$caught_term) {
+	while (($left > 0) && !$caught_hup && !$caught_term && !$caught_int) {
 		my $delay = $left > 10 ? 10 : $left;
 
 		$0 = sprintf("%s - sleeping for %s seconds", $program, $left);
@@ -911,8 +913,9 @@ do {
     } else {
 	$result = $result eq 'OK' ? 0 : 1;
     }
-} while ($daemon && !$result && !$caught_term);
+} while ($daemon && !$result && !$caught_term && !$caught_int);
 
+warning("caught SIGINT; exiting") if $caught_int;
 unlink_pid();
 sendmail();