External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 13:37:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

audit: Log only an info message if audit_level < 2 and audit is not supported

Browse Source 
Replace the error message during startup of libvirtd with an info
message if audit_level < 2 and audit is not supported by the
kernel. Audit is not supported by the current kernel if the kernel
does not have audit compiled in or if audit is disabled (e.g. by the
kernel cmdline).

Signed-off-by: Marc Hartmayer <mhartmay@linux.vnet.ibm.com>
Reviewed-by: Boris Fiuczynski <fiuczy@linux.vnet.ibm.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Marc Hartmayer 2017-12-13 11:56:13 +01:00 committed by Michal Privoznik
parent fbe32b78e0
commit 4199c2f221
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/libvirtd.c
View File

@ -1422,7 +1422,7 @@ int main(int argc, char **argv) {
if (config->audit_level) {
VIR_DEBUG("Attempting to configure auditing subsystem");
if (virAuditOpen() < 0) {
if (virAuditOpen(config->audit_level) < 0) {
if (config->audit_level > 1) {
ret = VIR_DAEMON_ERR_AUDIT;
goto cleanup;

16
src/util/viraudit.c
View File

@ -55,11 +55,23 @@ static int auditfd = -1;
#endif
static bool auditlog;
int virAuditOpen(void)
int virAuditOpen(unsigned int audit_level ATTRIBUTE_UNUSED)
{
#if WITH_AUDIT
if ((auditfd = audit_open()) < 0) {
virReportSystemError(errno, "%s", _("Unable to initialize audit layer"));
/* You get these error codes only when the kernel does not
* have audit compiled in or it's disabled (e.g. by the kernel
* cmdline) */
if (errno == EINVAL || errno == EPROTONOSUPPORT ||
errno == EAFNOSUPPORT) {
if (audit_level < 2)
VIR_INFO("Audit is not supported by the kernel");
else
virReportError(VIR_FROM_THIS, "%s", _("Audit is not supported by the kernel"));
} else {
virReportSystemError(errno, "%s", _("Unable to initialize audit layer"));
}
return -1;
}

2
src/util/viraudit.h
View File

@ -32,7 +32,7 @@ typedef enum {
VIR_AUDIT_RECORD_RESOURCE,
} virAuditRecordType;
int virAuditOpen(void);
int virAuditOpen(unsigned int audit_level);
void virAuditLog(bool enabled);