If we are using lutil_lock functions then define NEED_SIMPLE_LOCKING or

liblutil/lockf.c wont be compiled.

diff --git a/include/ac/unistd.h b/include/ac/unistd.h
index 0162d49ca468876490e72aaa79858fd01be10da1..e5b3eb3300b2ebc2a3d26e5c619ee3529de1bc1a 100644 (file)
--- a/include/ac/unistd.h
+++ b/include/ac/unistd.h
@@ -85,6 +85,7 @@ extern char* getpass LDAP_P((const char *getpass));
 
 #if !defined( ldap_lockf )
        /* use some simplistic locking method */
+#      define NEED_SIMPLE_LOCKING
 #      include <lutil_lockf.h>
 #      define ldap_lockf(x)    lutil_lockf(x)
 #      define ldap_unlockf(x)  lutil_unlockf(x)

diff --git a/libraries/liblutil/lockf.c b/libraries/liblutil/lockf.c
index 7307720dd68744af161365b245c2762fb73e092b..13226bbf590471e6ef9fea5dd1ca97b75e2d8c29 100644 (file)
--- a/libraries/liblutil/lockf.c
+++ b/libraries/liblutil/lockf.c
@@ -7,14 +7,14 @@
  * license is available at http://www.OpenLDAP.org/license.html or
  * in file LICENSE in the top-level directory of the distribution.
  */
-/* File locking methods */
+/* Simple file locking method for systems without */
 
 #include "portable.h"
 
 #include <stdio.h>
 #include <ac/unistd.h>
 
-#if defined(NEED_FCNTL_LOCKING)
+#ifdef NEED_SIMPLE_LOCKING
 
 int lutil_lockf ( FILE *fp ) {
        struct flock file_lock;
@@ -36,4 +36,4 @@ int lutil_unlockf ( FILE *fp ) {
        return ( fcntl( fileno(fp), F_SETLK, &file_lock ) );
 }
 
-#endif /* !HAVE_FILE_LOCKING */
+#endif /* NEED_SIMPLE_LOCKING */