Merge pull request #282 from ikerexxe/sssd_cache_error

lib/sssd: redirect warning message to file
This commit is contained in:
Serge Hallyn 2020-10-02 19:38:35 -05:00 committed by GitHub
commit e84df9e163
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -11,7 +11,7 @@
#include "prototypes.h" #include "prototypes.h"
#include "sssd.h" #include "sssd.h"
#define MSG_SSSD_FLUSH_CACHE_FAILED "%s: Failed to flush the sssd cache.\n" #define MSG_SSSD_FLUSH_CACHE_FAILED "%s: Failed to flush the sssd cache."
int sssd_flush_cache (int dbflags) int sssd_flush_cache (int dbflags)
{ {
@ -46,24 +46,22 @@ int sssd_flush_cache (int dbflags)
free(sss_cache_args); free(sss_cache_args);
if (rv != 0) { if (rv != 0) {
/* run_command writes its own more detailed message. */ /* run_command writes its own more detailed message. */
(void) fprintf (stderr, _(MSG_SSSD_FLUSH_CACHE_FAILED), Prog); SYSLOG ((LOG_WARN, MSG_SSSD_FLUSH_CACHE_FAILED, Prog));
return -1; return -1;
} }
code = WEXITSTATUS (status); code = WEXITSTATUS (status);
if (!WIFEXITED (status)) { if (!WIFEXITED (status)) {
(void) fprintf (stderr, SYSLOG ((LOG_WARN, "%s: sss_cache did not terminate normally (signal %d)",
_("%s: sss_cache did not terminate normally (signal %d)\n"), Prog, WTERMSIG (status)));
Prog, WTERMSIG (status));
return -1; return -1;
} else if (code == E_CMD_NOTFOUND) { } else if (code == E_CMD_NOTFOUND) {
/* sss_cache is not installed, or it is installed but uses an /* sss_cache is not installed, or it is installed but uses an
interpreter that is missing. Probably the former. */ interpreter that is missing. Probably the former. */
return 0; return 0;
} else if (code != 0) { } else if (code != 0) {
(void) fprintf (stderr, _("%s: sss_cache exited with status %d\n"), SYSLOG ((LOG_WARN, "%s: sss_cache exited with status %d", Prog, code));
Prog, code); SYSLOG ((LOG_WARN, MSG_SSSD_FLUSH_CACHE_FAILED, Prog));
(void) fprintf (stderr, _(MSG_SSSD_FLUSH_CACHE_FAILED), Prog);
return -1; return -1;
} }