mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-03-31 14:50:34 +08:00
Update build environment
- remove OpenLDAP defaults from ldap.conf - add "edit configuration" step to INSTALL doc - update AC_TRY_LINK detections (mainly affects pthread detections)
This commit is contained in:
parent
cbfbb7fb3b
commit
0e2fc7970c
3
CHANGES
3
CHANGES
@ -5,7 +5,10 @@ Changes included in OpenLDAP 1.2
|
||||
Fixed slapd/back-ldbm/cache entry lock assert bugs
|
||||
Fixed slapd uncaught signals in main thread problem
|
||||
Build environment
|
||||
Fixed detections requiring AC_TRY_LINK
|
||||
Fixed build/man.mk "ln -sf" bug
|
||||
Removed "ldap.openldap.org" as default HOST
|
||||
Removed "dc=OpenLDAP, dc=org" as default BASE
|
||||
|
||||
Changes included in OpenLDAP 1.2
|
||||
CVS Tag: OPENLDAP_REL_ENG_1_2_BETA2
|
||||
|
7
INSTALL
7
INSTALL
@ -109,6 +109,13 @@ these steps:
|
||||
|
||||
There are section 5 man pages for all of these files.
|
||||
|
||||
9. edit client configuration files as needed.
|
||||
See ldap.conf(5) for details.
|
||||
|
||||
10. edit server configuration files as needed.
|
||||
See slapd.conf(5) if running slapd.
|
||||
See ldapd.conf(5) if running ldapd.
|
||||
|
||||
|
||||
Building LDAP For More Than One Platform
|
||||
|
||||
|
@ -316,7 +316,7 @@ modify_dn (LDAP * ld, char *targetdn, char *pwattr, char *oldpw,
|
||||
mods[1] =NULL;
|
||||
|
||||
if (!noupdates && (ret = ldap_modify_s (ld, targetdn, mods)) != LDAP_SUCCESS)
|
||||
ldap_perror (ld, "ldap_modify_s");
|
||||
ldap_perror (ld, "ldap_modify");
|
||||
|
||||
free (hashed_pw);
|
||||
free (buf);
|
||||
@ -615,7 +615,7 @@ main (int argc, char *argv[])
|
||||
i != LDAP_TIMELIMIT_EXCEEDED &&
|
||||
i != LDAP_SIZELIMIT_EXCEEDED)
|
||||
{
|
||||
ldap_perror (ld, "ldap_search_s");
|
||||
ldap_perror (ld, "ldap_search");
|
||||
exit (1);
|
||||
}
|
||||
|
||||
|
20
configure.in
20
configure.in
@ -457,7 +457,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
|
||||
dnl save the flags
|
||||
save_LIBS="$LIBS"
|
||||
LIBS="-kthread $LIBS"
|
||||
AC_TRY_LINK([char pthread();],[
|
||||
AC_TRY_LINK([char pthread_create();],[
|
||||
pthread_create();
|
||||
], ol_cv_kthread_flag=yes, ol_cv_kthread_flag=no)
|
||||
dnl restore the LIBS
|
||||
@ -477,7 +477,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
|
||||
dnl save the flags
|
||||
save_LIBS="$LIBS"
|
||||
LIBS="-pthread $LIBS"
|
||||
AC_TRY_LINK([char pthread();],[
|
||||
AC_TRY_LINK([char pthread_create();],[
|
||||
pthread_create();
|
||||
], ol_cv_pthread_flag=yes, ol_cv_pthread_flag=no)
|
||||
dnl restore the LIBS
|
||||
@ -497,8 +497,10 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
|
||||
dnl save the flags
|
||||
save_LIBS="$LIBS"
|
||||
LIBS="-pthreads $LIBS"
|
||||
AC_TRY_LINK([char pthread();],[
|
||||
pthread_create();
|
||||
AC_TRY_LINK([
|
||||
#include <pthread.h>
|
||||
],[
|
||||
pthread_create(NULL,NULL,NULL,NULL);
|
||||
], ol_cv_pthreads_flag=yes, ol_cv_pthreads_flag=no)
|
||||
dnl restore the LIBS
|
||||
LIBS="$save_LIBS"
|
||||
@ -517,7 +519,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
|
||||
dnl save the flags
|
||||
save_LIBS="$LIBS"
|
||||
LIBS="-thread $LIBS"
|
||||
AC_TRY_LINK([char pthread();],[
|
||||
AC_TRY_LINK([char pthread_create();],[
|
||||
pthread_create();
|
||||
], ol_cv_thread_flag=yes, ol_cv_thread_flag=no)
|
||||
dnl restore the LIBS
|
||||
@ -645,7 +647,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
|
||||
dnl save the flags
|
||||
save_LIBS="$LIBS"
|
||||
LIBS="-threads $LIBS"
|
||||
AC_TRY_LINK([char pthread();],[
|
||||
AC_TRY_LINK([char pthread_create();],[
|
||||
pthread_create();
|
||||
], ol_cv_thread_flag=yes, ol_cv_thread_flag=no)
|
||||
dnl restore the LIBS
|
||||
@ -1001,11 +1003,7 @@ if test $ol_link_threads != no ; then
|
||||
dnl with the thread libraries
|
||||
AC_CACHE_CHECK([for thread specific errno],
|
||||
[ol_cv_errno_thread_specific], [
|
||||
AC_TRY_LINK([
|
||||
#include <errno.h>
|
||||
], [
|
||||
int x = errno;
|
||||
],
|
||||
AC_TRY_LINK([#include <errno.h>], [int x = errno;],
|
||||
[ol_cv_errno_thread_specific=yes],
|
||||
[ol_cv_errno_thread_specific=no])
|
||||
])
|
||||
|
@ -5,8 +5,8 @@
|
||||
# See ldap.conf(5) for details
|
||||
# This file should be world readable.
|
||||
|
||||
BASE dc=OpenLDAP, dc=Org
|
||||
HOST ldap.openldap.org
|
||||
#BASE dc=OpenLDAP, dc=Org
|
||||
#HOST ldap.openldap.org
|
||||
|
||||
#HOST ldap.openldap.org ldap-master.openldap.org:666
|
||||
#PORT 389
|
||||
|
Loading…
x
Reference in New Issue
Block a user