detect and use fcntl (for BSD/OS)

detect inet_ntop (for MacOSX)

diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
index dd47ecbb03f6cdb0b942dd010c6971e5b9ae2461..58c86d3f72a5c08d8b5e1ac8847480ab0eaa23df 100644 (file)
--- a/clients/tools/ldapsearch.c
+++ b/clients/tools/ldapsearch.c
@@ -1075,7 +1075,8 @@ print_entry(
                                                continue;
                                        }
 
-                                       if (( tmpfd = open( tmpfname, O_WRONLY|O_CREAT|O_EXCL, 0600 )) == -1 ) {
+                                       tmpfd = open( tmpfname, O_WRONLY|O_CREAT|O_EXCL, 0600 );
+                                       if ( tmpfd == -1 ) {
                                                perror( tmpfname );
                                                continue;
                                        }

diff --git a/configure b/configure
index 48a96411c78a8cb52dec995d775359048c33bcf5..e59776dbf44d92e317c544293bb71bd826cc12b5 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # $OpenLDAP$
-# from OpenLDAP: pkg/ldap/configure.in,v 1.351 2001/01/22 06:51:26 kurt Exp  
+# from OpenLDAP: pkg/ldap/configure.in,v 1.352 2001/05/02 23:13:51 kurt Exp  
 
 # Copyright 1998-2000 The OpenLDAP Foundation.  All Rights Reserved.
 # 
@@ -5823,7 +5823,7 @@ if test "$ol_enable_dnssrv" = yes -a "$ol_link_dnssrv" = no ; then
        { echo "configure: error: DNSSRV requires res_query()" 1>&2; exit 1; }
 fi
 
-for ac_func in getaddrinfo 
+for ac_func in getaddrinfo inet_ntop 
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 echo "configure:5830: checking for $ac_func" >&5
@@ -5881,9 +5881,9 @@ done
 
 
 ol_link_ipv6=no
-if test $ac_cv_func_getaddrinfo = no ; then
+if test $ac_cv_func_getaddrinfo = no -o $ac_cv_func_inet_ntop = no ; then
        if test $ol_enable_ipv6 = yes ; then
-               { echo "configure: error: IPv6 support requires getaddrinfo()" 1>&2; exit 1; }
+               { echo "configure: error: IPv6 support requires getaddrinfo() and inet_ntop()" 1>&2; exit 1; }
        fi
 else
        for ac_func in gai_strerror 
@@ -16102,6 +16102,7 @@ for ac_func in \
        chroot                  \
        endgrent                \
        endpwent                \
+       fcntl                   \
        flock                   \
        getdtablesize   \
        getgrgid                \
@@ -16149,12 +16150,12 @@ for ac_func in \
 
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16153: checking for $ac_func" >&5
+echo "configure:16154: checking for $ac_func" >&5
 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16158 "configure"
+#line 16159 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -16178,7 +16179,7 @@ f = $ac_func;
 
 ; return 0; }
 EOF
-if { (eval echo configure:16182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -16206,12 +16207,12 @@ done
 for ac_func in getopt tempnam
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16210: checking for $ac_func" >&5
+echo "configure:16211: checking for $ac_func" >&5
 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16215 "configure"
+#line 16216 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -16235,7 +16236,7 @@ f = $ac_func;
 
 ; return 0; }
 EOF
-if { (eval echo configure:16239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -16272,13 +16273,13 @@ fi
 
 # Check Configuration
 echo $ac_n "checking declaration of sys_errlist""... $ac_c" 1>&6
-echo "configure:16276: checking declaration of sys_errlist" >&5
+echo "configure:16277: checking declaration of sys_errlist" >&5
 if eval "test \"\${ol_cv_dcl_sys_errlist+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
        cat > conftest.$ac_ext <<EOF
-#line 16282 "configure"
+#line 16283 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16291,7 +16292,7 @@ int main() {
 char *c = (char *) *sys_errlist
 ; return 0; }
 EOF
-if { (eval echo configure:16295: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ol_cv_dcl_sys_errlist=yes
        ol_cv_have_sys_errlist=yes
@@ -16314,20 +16315,20 @@ EOF
 
 
        echo $ac_n "checking existence of sys_errlist""... $ac_c" 1>&6
-echo "configure:16318: checking existence of sys_errlist" >&5
+echo "configure:16319: checking existence of sys_errlist" >&5
 if eval "test \"\${ol_cv_have_sys_errlist+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
                cat > conftest.$ac_ext <<EOF
-#line 16324 "configure"
+#line 16325 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int main() {
 char *c = (char *) *sys_errlist
 ; return 0; }
 EOF
-if { (eval echo configure:16331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ol_cv_have_sys_errlist=yes
 else

diff --git a/configure.in b/configure.in
index 4cdd02583f2a5425c777000752c2c31329938313..098b081527e2ce398f103efbb6a0f3dca9b01357 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -823,12 +823,12 @@ fi
 dnl ----------------------------------------------------------------
 dnl PF_INET6 support requires getaddrinfo and INET6_ADDRSTRLEN
 dnl PF_LOCAL may use getaddrinfo in available
-AC_CHECK_FUNCS( getaddrinfo )
+AC_CHECK_FUNCS( getaddrinfo inet_ntop )
 
 ol_link_ipv6=no
-if test $ac_cv_func_getaddrinfo = no ; then
+if test $ac_cv_func_getaddrinfo = no -o $ac_cv_func_inet_ntop = no ; then
        if test $ol_enable_ipv6 = yes ; then
-               AC_MSG_ERROR([IPv6 support requires getaddrinfo()])
+               AC_MSG_ERROR([IPv6 support requires getaddrinfo() and inet_ntop()])
        fi
 else
        AC_CHECK_FUNCS( gai_strerror )
@@ -2166,6 +2166,7 @@ AC_CHECK_FUNCS(           \
        chroot                  \
        endgrent                \
        endpwent                \
+       fcntl                   \
        flock                   \
        getdtablesize   \
        getgrgid                \

diff --git a/include/portable.h.in b/include/portable.h.in
index 5b4dc1b86cc944311a8a68f2ae9692e7c71fd7d0..0b1952aa2b03b506985f3055d2948236b22d1ee2 100644 (file)
--- a/include/portable.h.in
+++ b/include/portable.h.in
@@ -141,6 +141,9 @@
 /* Define if you have the endpwent function.  */
 #undef HAVE_ENDPWENT
 
+/* Define if you have the fcntl function.  */
+#undef HAVE_FCNTL
+
 /* Define if you have the flock function.  */
 #undef HAVE_FLOCK
 
@@ -186,6 +189,9 @@
 /* Define if you have the gettimeofday function.  */
 #undef HAVE_GETTIMEOFDAY
 
+/* Define if you have the inet_ntop function.  */
+#undef HAVE_INET_NTOP
+
 /* Define if you have the initgroups function.  */
 #undef HAVE_INITGROUPS
 

diff --git a/libraries/liblber/sockbuf.c b/libraries/liblber/sockbuf.c
index 95a67a7d87c6f26f68b8ec969522ba3db02db014..e16a76c6f92c8c3b356df8dd5eb7beeb8e18caae 100644 (file)
--- a/libraries/liblber/sockbuf.c
+++ b/libraries/liblber/sockbuf.c
@@ -21,6 +21,10 @@
 #include <io.h>
 #endif /* HAVE_IO_H */
 
+#if defined( HAVE_FCNTL_H )
+#include <fcntl.h>
+#endif
+
 #if defined( HAVE_SYS_FILIO_H )
 #include <sys/filio.h>
 #elif defined( HAVE_SYS_IOCTL_H )

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 10c726fb007074b251061158db90bde2950541d3..6ed0db5eb93c6a23a9d5feb3b63c7dae7bff3e16 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -743,7 +743,7 @@ static Listener * slap_open_listener(
 
        case AF_INET: {
                char *s;
-#ifdef HAVE_GETADDRINFO
+#if defined( HAVE_GETADDRINFO ) && defined( INET_NTOP )
                char addr[INET_ADDRSTRLEN];
                inet_ntop( AF_INET, &((struct sockaddr_in *)*sal)->sin_addr,
                           addr, sizeof(addr) );

diff --git a/tests/data/slapd-repl-slave.conf b/tests/data/slapd-repl-slave.conf
index deecc1dc7c306947987d053794789e478c90ff95..8086ba7487610ce747c9006898170e539aad85b5 100644 (file)
--- a/tests/data/slapd-repl-slave.conf
+++ b/tests/data/slapd-repl-slave.conf
@@ -1,6 +1,6 @@
 # $OpenLDAP$
 #
-# master slapd config -- for testing of replication
+# slave slapd config -- for testing of replication
 #
 ucdata-path    ./ucdata
 include ./schema/core.schema