From 9750fd681919ed558a9b044248a284d567cddf1a Mon Sep 17 00:00:00 2001
From: Adam Sampson <ats@offog.org>
Date: Sun, 26 Dec 2021 18:16:10 +0000
Subject: [PATCH 1/2] libsubid: use log_set_progname in subid_init

The static Prog variable here is no longer used, so remove it.
---
 libsubid/api.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/libsubid/api.c b/libsubid/api.c
index 7a0ebaa5..4479163c 100644
--- a/libsubid/api.c
+++ b/libsubid/api.c
@@ -40,17 +40,16 @@
 #include "subid.h"
 #include "shadowlog.h"
 
-static const char *Prog = "(libsubid)";
-
 bool subid_init(const char *progname, FILE * logfd)
 {
 	FILE *shadow_logfd;
 	if (progname) {
 		progname = strdup(progname);
-		if (progname)
-			Prog = progname;
-		else
+		if (!progname)
 			return false;
+		log_set_progname(progname);
+	} else {
+		log_set_progname("(libsubid)");
 	}
 
 	if (logfd) {

From 2b0bdef6f9a18382e92b0fb6d893c4339123ffac Mon Sep 17 00:00:00 2001
From: Adam Sampson <ats@offog.org>
Date: Sun, 26 Dec 2021 18:21:09 +0000
Subject: [PATCH 2/2] lib: provide default values for
 shadow_progname/shadow_logfd

---
 lib/shadowlog.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/shadowlog.c b/lib/shadowlog.c
index d20d64fe..7bcc63ca 100644
--- a/lib/shadowlog.c
+++ b/lib/shadowlog.c
@@ -2,8 +2,8 @@
 
 #include "lib/shadowlog_internal.h"
 
-const char *shadow_progname;
-FILE *shadow_logfd;
+const char *shadow_progname = "libshadow";
+FILE *shadow_logfd = NULL;
 
 void log_set_progname(const char *progname)
 {