From: Hallvard Furuseth <hallvard@openldap.org>
Date: Tue, 6 Sep 2016 15:56:13 +0000 (+0200)
Subject: Clean up strange fcntl result check
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d87ee20e0bf7fc751f75412082df307647165d56;p=openldap

Clean up strange fcntl result check

...and check !MDB_CLOEXEC in an 'if' rather than '#if'
to match its non-zero usage.
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index b8ecfd8779..087cb98bc1 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -4818,9 +4818,9 @@ mdb_env_setup_locks(MDB_env *env, char *lpath, int mode, int *excl)
 #ifdef O_CLOEXEC	/* Linux: Open file and set FD_CLOEXEC atomically */
 #	define MDB_CLOEXEC		O_CLOEXEC
 #else
-	int fdflags;
 #	define MDB_CLOEXEC		0
 #endif
+	int fdflags;
 #endif
 #ifdef MDB_USE_SYSV_SEM
 	int semid;
@@ -4848,10 +4848,10 @@ mdb_env_setup_locks(MDB_env *env, char *lpath, int mode, int *excl)
 		}
 		goto fail;
 	}
-#if ! ((MDB_CLOEXEC) || defined(_WIN32))
+#ifndef _WIN32
 	/* Lose record locks when exec*() */
-	if ((fdflags = fcntl(env->me_lfd, F_GETFD) | FD_CLOEXEC) >= 0)
-			fcntl(env->me_lfd, F_SETFD, fdflags);
+	if (!(MDB_CLOEXEC) && (fdflags = fcntl(env->me_lfd, F_GETFD)) != -1)
+			fcntl(env->me_lfd, F_SETFD, fdflags | FD_CLOEXEC);
 #endif
 
 	if (!(env->me_flags & MDB_NOTLS)) {