Blame SOURCES/shadow-4.6-libsubid_init_not_print_error_messages.patch
|
 |
24ea25 |
From b0e86b959fe5c086ffb5e7eaf3c1b1e9219411e9 Mon Sep 17 00:00:00 2001
|
|
|
24ea25 |
From: Serge Hallyn <serge@hallyn.com>
|
|
|
24ea25 |
Date: Sun, 23 May 2021 08:03:10 -0500
|
|
|
24ea25 |
Subject: [PATCH] libsubid_init: don't print messages on error
|
|
|
24ea25 |
|
|
|
24ea25 |
Signed-off-by: Serge Hallyn <serge@hallyn.com>
|
|
|
24ea25 |
---
|
|
|
24ea25 |
libsubid/api.c | 7 ++-----
|
|
|
24ea25 |
1 file changed, 2 insertions(+), 5 deletions(-)
|
|
|
24ea25 |
|
|
|
24ea25 |
diff --git a/libsubid/api.c b/libsubid/api.c
|
|
|
24ea25 |
index c4848142..b477b271 100644
|
|
|
24ea25 |
--- a/libsubid/api.c
|
|
|
24ea25 |
+++ b/libsubid/api.c
|
|
|
24ea25 |
@@ -46,12 +46,10 @@ bool libsubid_init(const char *progname, FILE * logfd)
|
|
|
24ea25 |
{
|
|
|
24ea25 |
if (progname) {
|
|
|
24ea25 |
progname = strdup(progname);
|
|
|
24ea25 |
- if (progname) {
|
|
|
24ea25 |
+ if (progname)
|
|
|
24ea25 |
Prog = progname;
|
|
|
24ea25 |
- } else {
|
|
|
24ea25 |
- fprintf(stderr, "Out of memory");
|
|
|
24ea25 |
+ else
|
|
|
24ea25 |
return false;
|
|
|
24ea25 |
- }
|
|
|
24ea25 |
}
|
|
|
24ea25 |
|
|
|
24ea25 |
if (logfd) {
|
|
|
24ea25 |
@@ -60,7 +58,6 @@ bool libsubid_init(const char *progname, FILE * logfd)
|
|
|
24ea25 |
}
|
|
|
24ea25 |
shadow_logfd = fopen("/dev/null", "w");
|
|
|
24ea25 |
if (!shadow_logfd) {
|
|
|
24ea25 |
- fprintf(stderr, "ERROR opening /dev/null for error messages. Using stderr.");
|
|
|
24ea25 |
shadow_logfd = stderr;
|
|
|
24ea25 |
return false;
|
|
|
24ea25 |
}
|
|
|
24ea25 |
--
|
|
|
24ea25 |
2.30.2
|
|
|
24ea25 |
|