emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

nss: get shadow_logfd with log_get_logfd()

Browse Source 
If /etc/nsswitch.conf doesn't exist podman crashes because shadow_logfd
is NULL. In order to avoid that load the log file descriptor with the
log_get_logfd() helper function.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2038811

Signed-off-by: Iker Pedrosa <ipedrosa@redhat.com>
This commit is contained in:
Iker Pedrosa 2022-01-10 15:30:28 +01:00 committed by Serge Hallyn
parent fd5945e533
commit e101219ad7
1 changed files with 3 additions and 1 deletions

4
lib/nss.c

@ -9,6 +9,7 @@
#include "prototypes.h" #include "prototypes.h"
#include "../libsubid/subid.h" #include "../libsubid/subid.h"
#include "shadowlog_internal.h" #include "shadowlog_internal.h"
#include "shadowlog.h"
#define NSSWITCH "/etc/nsswitch.conf" #define NSSWITCH "/etc/nsswitch.conf"
@ -42,6 +43,7 @@ void nss_init(const char *nsswitch_path) {
FILE *nssfp = NULL; FILE *nssfp = NULL;
char *line = NULL, *p, *token, *saveptr; char *line = NULL, *p, *token, *saveptr;
size_t len = 0; size_t len = 0;
FILE *shadow_logfd = log_get_logfd();
if (atomic_flag_test_and_set(&nss_init_started)) { if (atomic_flag_test_and_set(&nss_init_started)) {
// Another thread has started nss_init, wait for it to complete // Another thread has started nss_init, wait for it to complete
@ -57,7 +59,7 @@ void nss_init(const char *nsswitch_path) {
// subid: files // subid: files
nssfp = fopen(nsswitch_path, "r"); nssfp = fopen(nsswitch_path, "r");
if (!nssfp) { if (!nssfp) {
fprintf(shadow_logfd, "Failed opening %s: %m", nsswitch_path); fprintf(shadow_logfd, "Failed opening %s: %m\n", nsswitch_path);
atomic_store(&nss_init_completed, true); atomic_store(&nss_init_completed, true);
return; return;
} }