sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

lib/util: use RUNNING_ON_VALGRIND to check if valgrind is used

Browse Source 
We should not skip all of close_low_fd() just because we
detected valgrind headers at build time.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
This commit is contained in:
Stefan Metzmacher 2023-05-31 12:09:09 +02:00
parent be5e4d164d
commit bfb1494e81
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/util/close_low_fd.c
View File

@ -21,11 +21,22 @@
#include "system/filesys.h"
#include "close_low_fd.h"
#ifdef HAVE_VALGRIND_VALGRIND_H
#include <valgrind/valgrind.h>
#elif defined(HAVE_VALGRIND_H)
#include <valgrind.h>
#else
#define RUNNING_ON_VALGRIND 0
#endif
_PUBLIC_ int close_low_fd(int fd)
{
#ifndef VALGRIND
int ret, dev_null;
if (RUNNING_ON_VALGRIND) {
return 0;
}
dev_null = open("/dev/null", O_RDWR, 0);
if ((dev_null == -1) && (errno == ENFILE)) {
@ -60,6 +71,5 @@ _PUBLIC_ int close_low_fd(int fd)
return err;
}
close(dev_null);
#endif
return 0;
}