389-commits September 2014

389-commits@lists.fedoraproject.org

6 participants
74 discussions

Branch '389-ds-base-1.3.3' - VERSION.sh
by Noriko Hosoi 05 Sep '14

05 Sep '14

VERSION.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b17f09b1fdf6952f70fb27ca9cc253fcbe72e149 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Fri Sep 5 16:15:55 2014 -0700 bump version to 1.3.3.1 diff --git a/VERSION.sh b/VERSION.sh index fe6bb4e..4a3ec3e 100644 --- a/VERSION.sh +++ b/VERSION.sh @@ -10,7 +10,7 @@ vendor="389 Project" # PACKAGE_VERSION is constructed from these VERSION_MAJOR=1 VERSION_MINOR=3 -VERSION_MAINT=3.0 +VERSION_MAINT=3.1 # if this is a PRERELEASE, set VERSION_PREREL # otherwise, comment it out # be sure to include the dot prefix in the prerel

1 0

VERSION.sh
by Noriko Hosoi 05 Sep '14

05 Sep '14

VERSION.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 13e5790d6e38ffcf900f41b838238384a4f8d5f8 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Fri Sep 5 15:44:40 2014 -0700 bump version to 1.3.4.a1 diff --git a/VERSION.sh b/VERSION.sh index df5dd85..78fd85f 100644 --- a/VERSION.sh +++ b/VERSION.sh @@ -10,11 +10,11 @@ vendor="389 Project" # PACKAGE_VERSION is constructed from these VERSION_MAJOR=1 VERSION_MINOR=3 -VERSION_MAINT=3 +VERSION_MAINT=4 # if this is a PRERELEASE, set VERSION_PREREL # otherwise, comment it out # be sure to include the dot prefix in the prerel -VERSION_PREREL=.a2 +VERSION_PREREL=.a1 # NOTES on VERSION_PREREL # use aN for an alpha release e.g. a1, a2, etc. # use rcN for a release candidate e.g. rc1, rc2, etc.

1 0

Branch '389-ds-base-1.2.11' - ldap/servers
by Ludwig Krispenz 05 Sep '14

05 Sep '14

ldap/servers/plugins/deref/deref.c | 46 ++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 23 deletions(-) New commits: commit 39f44c5af958011cdffc699d26d0e481ec0dbcb6 Author: Ludwig Krispenz <lkrispen(a)redhat.com> Date: Wed Sep 3 13:44:17 2014 +0200 Ticket 47885 - deref plugin should not return references with noc access rights Bug Description: deref shows derefernced entries for which th client doesn't have access as dn and empty attribute list Fix Description: if client has no accesss to the derferernced entry then omit it from the list in the deref control In general, if no entries are returned don't send an empty control https://fedorahosted.org/389/ticket/47885 Reviewed by: noriko, thanks diff --git a/ldap/servers/plugins/deref/deref.c b/ldap/servers/plugins/deref/deref.c index c6630df..50295b9 100644 --- a/ldap/servers/plugins/deref/deref.c +++ b/ldap/servers/plugins/deref/deref.c @@ -589,13 +589,14 @@ deref_values_free(Slapi_ValueSet** results, char** actual_type_name, int buffer_ slapi_vattr_values_free(results, actual_type_name, buffer_flags); } -static void -deref_do_deref_attr(Slapi_PBlock *pb, BerElement *ctrlber, const char *derefdn, const char **attrs) +static int +deref_do_deref_attr(Slapi_PBlock *pb, BerElement *ctrlber, const char *derefdn, const char *derefattr, const char **attrs) { char **retattrs = NULL; Slapi_PBlock *derefpb = NULL; Slapi_Entry **entries = NULL; int rc; + int needcontrol = 0; /* If the access check on the attributes is done without retrieveing the entry * it cannot handle acis which need teh entry, eg to apply a targetfilter rule @@ -624,7 +625,9 @@ deref_do_deref_attr(Slapi_PBlock *pb, BerElement *ctrlber, const char *derefdn, slapi_log_error(SLAPI_LOG_PLUGIN, DEREF_PLUGIN_SUBSYSTEM, "The client does not have permission to read the requested " "attributes in entry %s\n", derefdn); - } else { + } else { + needcontrol = 1; + ber_printf(ctrlber, "{ss", derefattr, derefdn); /* begin DerefRes + derefAttr + derefVal */ for (ii = 0; retattrs[ii]; ++ii) { Slapi_Value *sv; int idx = 0; @@ -681,6 +684,7 @@ deref_do_deref_attr(Slapi_PBlock *pb, BerElement *ctrlber, const char *derefdn, if (needattrvals == 0) { ber_printf(ctrlber, "}"); } + ber_printf(ctrlber, "}"); /* end DerefRes */ } } } else { /* nothing */ @@ -697,7 +701,7 @@ deref_do_deref_attr(Slapi_PBlock *pb, BerElement *ctrlber, const char *derefdn, slapi_pblock_destroy(derefpb); slapi_ch_free((void **)&retattrs); /* retattrs does not own the strings */ - return; + return needcontrol; } static int @@ -711,6 +715,7 @@ deref_pre_entry(Slapi_PBlock *pb) LDAPControl *ctrl = NULL; const LDAPControl **searchctrls = NULL; LDAPControl **newsearchctrls = NULL; + int needcontrol = 0; if (!speclist) { return 0; /* nothing to do */ @@ -754,31 +759,26 @@ deref_pre_entry(Slapi_PBlock *pb) for (; results && sv; idx = slapi_valueset_next_value(results, idx, &sv)) { const char *derefdn = slapi_value_get_string(sv); - ber_printf(ctrlber, "{ss", spec->derefattr, derefdn); /* begin DerefRes + derefAttr + derefVal */ - deref_do_deref_attr(pb, ctrlber, derefdn, (const char **)spec->attrs); - ber_printf(ctrlber, "}"); /* end DerefRes */ + needcontrol += deref_do_deref_attr(pb, ctrlber, derefdn, spec->derefattr, (const char **)spec->attrs); } deref_values_free(&results, &actual_type_name, buffer_flags); } ber_printf(ctrlber, "}"); /* end control val */ - - slapi_build_control(LDAP_CONTROL_X_DEREF, ctrlber, 0, &ctrl); - - ber_free(ctrlber, 1); - - /* get the list of controls */ + + if (needcontrol) { + slapi_build_control(LDAP_CONTROL_X_DEREF, ctrlber, 0, &ctrl); + /* get the list of controls */ slapi_pblock_get(pb, SLAPI_SEARCH_CTRLS, &searchctrls); - - /* dup them */ - slapi_add_controls(&newsearchctrls, (LDAPControl **)searchctrls, 1); - - /* add our control */ - slapi_add_control_ext(&newsearchctrls, ctrl, 0); - ctrl = NULL; /* newsearchctrls owns it now */ - - /* set the controls in the pblock */ - slapi_pblock_set(pb, SLAPI_SEARCH_CTRLS, newsearchctrls); + /* dup them */ + slapi_add_controls(&newsearchctrls, (LDAPControl **)searchctrls, 1); + /* add our control */ + slapi_add_control_ext(&newsearchctrls, ctrl, 0); + ctrl = NULL; /* newsearchctrls owns it now */ + /* set the controls in the pblock */ + slapi_pblock_set(pb, SLAPI_SEARCH_CTRLS, newsearchctrls); + } + ber_free(ctrlber, 1); return 0; }

1 0

Branch '389-ds-base-1.2.11' - configure m4/openldap.m4
by Noriko Hosoi 04 Sep '14

04 Sep '14

configure | 73 --------------------------------------------------------- m4/openldap.m4 | 4 --- 2 files changed, 77 deletions(-) New commits: commit dd7c125b499a3c6b36651f5d2a00c2ed45df6d41 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Thu Sep 4 17:38:50 2014 -0400 Ticket #47875 - dirsrv not running with old openldap Description: removed unnecessary checking for -lldif from openldap.m4. diff --git a/configure b/configure index 702f691..13ab36f 100755 --- a/configure +++ b/configure @@ -22581,79 +22581,6 @@ else ldap_lib_ldif= fi - if test -z "$ldap_lib_ldif" ; then - { $as_echo "$as_me:$LINENO: checking for _init in -lldif" >&5 -$as_echo_n "checking for _init in -lldif... " >&6; } -if test "${ac_cv_lib_ldif__init+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lldif $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char _init (); -int -main () -{ -return _init (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_lib_ldif__init=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_ldif__init=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ldif__init" >&5 -$as_echo "$ac_cv_lib_ldif__init" >&6; } -if test "x$ac_cv_lib_ldif__init" = x""yes; then - ldap_lib_ldif=-lldif -else - ldap_lib_ldif= -fi - - fi LDFLAGS="$save_ldflags" CPPFLAGS="$save_cppflags" diff --git a/m4/openldap.m4 b/m4/openldap.m4 index 70312c7..5d09ff5 100644 --- a/m4/openldap.m4 +++ b/m4/openldap.m4 @@ -148,10 +148,6 @@ if test "$with_openldap" = yes ; then LDFLAGS="$LDFLAGS -lldap$ol_libver" AC_CHECK_LIB([ldif$ol_libver], [_init], [ldap_lib_ldif=-lldif$ol_libver], [ldap_lib_ldif=]) - if test -z "$ldap_lib_ldif" ; then - AC_CHECK_LIB([ldif], [_init], [ldap_lib_ldif=-lldif], - [ldap_lib_ldif=]) - fi AC_SUBST([ldap_lib_ldif]) LDFLAGS="$save_ldflags" CPPFLAGS="$save_cppflags"

1 0

Branch '389-ds-base-1.3.2' - configure m4/openldap.m4
by Noriko Hosoi 04 Sep '14

04 Sep '14

configure | 44 -------------------------------------------- m4/openldap.m4 | 4 ---- 2 files changed, 48 deletions(-) New commits: commit eb6d5a31c79746cf5ffd47d103a56ece2970f68e Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Thu Sep 4 14:26:17 2014 -0700 Ticket #47875 - dirsrv not running with old openldap Description: removed unnecessary checking for -lldif from openldap.m4. (cherry picked from commit 0172a730686eaa054dd5b7b0a8921a6638af63aa) (cherry picked from commit 48b3153aee7cb2b1f65554b9da432004d23f10e7) diff --git a/configure b/configure index 61922f2..7073a5d 100755 --- a/configure +++ b/configure @@ -19332,50 +19332,6 @@ else ldap_lib_ldif= fi - if test -z "$ldap_lib_ldif" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _init in -lldif" >&5 -$as_echo_n "checking for _init in -lldif... " >&6; } -if ${ac_cv_lib_ldif__init+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lldif $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char _init (); -int -main () -{ -return _init (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_ldif__init=yes -else - ac_cv_lib_ldif__init=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldif__init" >&5 -$as_echo "$ac_cv_lib_ldif__init" >&6; } -if test "x$ac_cv_lib_ldif__init" = xyes; then : - ldap_lib_ldif=-lldif -else - ldap_lib_ldif= -fi - - fi LDFLAGS="$save_ldflags" CPPFLAGS="$save_cppflags" diff --git a/m4/openldap.m4 b/m4/openldap.m4 index 70312c7..5d09ff5 100644 --- a/m4/openldap.m4 +++ b/m4/openldap.m4 @@ -148,10 +148,6 @@ if test "$with_openldap" = yes ; then LDFLAGS="$LDFLAGS -lldap$ol_libver" AC_CHECK_LIB([ldif$ol_libver], [_init], [ldap_lib_ldif=-lldif$ol_libver], [ldap_lib_ldif=]) - if test -z "$ldap_lib_ldif" ; then - AC_CHECK_LIB([ldif], [_init], [ldap_lib_ldif=-lldif], - [ldap_lib_ldif=]) - fi AC_SUBST([ldap_lib_ldif]) LDFLAGS="$save_ldflags" CPPFLAGS="$save_cppflags"

1 0

Branch '389-ds-base-1.3.3' - configure m4/openldap.m4
by Noriko Hosoi 04 Sep '14

04 Sep '14

configure | 44 -------------------------------------------- m4/openldap.m4 | 4 ---- 2 files changed, 48 deletions(-) New commits: commit 48b3153aee7cb2b1f65554b9da432004d23f10e7 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Thu Sep 4 14:26:17 2014 -0700 Ticket #47875 - dirsrv not running with old openldap Description: removed unnecessary checking for -lldif from openldap.m4. (cherry picked from commit 0172a730686eaa054dd5b7b0a8921a6638af63aa) diff --git a/configure b/configure index 8eb5892..a6b5689 100755 --- a/configure +++ b/configure @@ -19452,50 +19452,6 @@ else ldap_lib_ldif= fi - if test -z "$ldap_lib_ldif" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _init in -lldif" >&5 -$as_echo_n "checking for _init in -lldif... " >&6; } -if ${ac_cv_lib_ldif__init+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lldif $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char _init (); -int -main () -{ -return _init (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_ldif__init=yes -else - ac_cv_lib_ldif__init=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldif__init" >&5 -$as_echo "$ac_cv_lib_ldif__init" >&6; } -if test "x$ac_cv_lib_ldif__init" = xyes; then : - ldap_lib_ldif=-lldif -else - ldap_lib_ldif= -fi - - fi LDFLAGS="$save_ldflags" CPPFLAGS="$save_cppflags" diff --git a/m4/openldap.m4 b/m4/openldap.m4 index 70312c7..5d09ff5 100644 --- a/m4/openldap.m4 +++ b/m4/openldap.m4 @@ -148,10 +148,6 @@ if test "$with_openldap" = yes ; then LDFLAGS="$LDFLAGS -lldap$ol_libver" AC_CHECK_LIB([ldif$ol_libver], [_init], [ldap_lib_ldif=-lldif$ol_libver], [ldap_lib_ldif=]) - if test -z "$ldap_lib_ldif" ; then - AC_CHECK_LIB([ldif], [_init], [ldap_lib_ldif=-lldif], - [ldap_lib_ldif=]) - fi AC_SUBST([ldap_lib_ldif]) LDFLAGS="$save_ldflags" CPPFLAGS="$save_cppflags"

1 0

configure m4/openldap.m4
by Noriko Hosoi 04 Sep '14

04 Sep '14

configure | 44 -------------------------------------------- m4/openldap.m4 | 4 ---- 2 files changed, 48 deletions(-) New commits: commit 0172a730686eaa054dd5b7b0a8921a6638af63aa Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Thu Sep 4 14:26:17 2014 -0700 Ticket #47875 - dirsrv not running with old openldap Description: removed unnecessary checking for -lldif from openldap.m4. diff --git a/configure b/configure index 8eb5892..a6b5689 100755 --- a/configure +++ b/configure @@ -19452,50 +19452,6 @@ else ldap_lib_ldif= fi - if test -z "$ldap_lib_ldif" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _init in -lldif" >&5 -$as_echo_n "checking for _init in -lldif... " >&6; } -if ${ac_cv_lib_ldif__init+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lldif $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char _init (); -int -main () -{ -return _init (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_ldif__init=yes -else - ac_cv_lib_ldif__init=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldif__init" >&5 -$as_echo "$ac_cv_lib_ldif__init" >&6; } -if test "x$ac_cv_lib_ldif__init" = xyes; then : - ldap_lib_ldif=-lldif -else - ldap_lib_ldif= -fi - - fi LDFLAGS="$save_ldflags" CPPFLAGS="$save_cppflags" diff --git a/m4/openldap.m4 b/m4/openldap.m4 index 70312c7..5d09ff5 100644 --- a/m4/openldap.m4 +++ b/m4/openldap.m4 @@ -148,10 +148,6 @@ if test "$with_openldap" = yes ; then LDFLAGS="$LDFLAGS -lldap$ol_libver" AC_CHECK_LIB([ldif$ol_libver], [_init], [ldap_lib_ldif=-lldif$ol_libver], [ldap_lib_ldif=]) - if test -z "$ldap_lib_ldif" ; then - AC_CHECK_LIB([ldif], [_init], [ldap_lib_ldif=-lldif], - [ldap_lib_ldif=]) - fi AC_SUBST([ldap_lib_ldif]) LDFLAGS="$save_ldflags" CPPFLAGS="$save_cppflags"

1 0

Branch '389-ds-base-1.2.11' - configure m4/openldap.m4
by Noriko Hosoi 04 Sep '14

04 Sep '14

configure | 2 +- m4/openldap.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 3612ac6ab98e08a4fceec3bfcf85fe857d772185 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Thu Sep 4 13:53:52 2014 -0700 Ticket #47875 - dirsrv not running with old openldap Description: To check libldif, -lldap$ol_libver needs to be added to LDFLAGS to compile test conftest.c. (cherry picked from commit 8c7ac72659758ef1ea96794552e584fdbe803778) (cherry picked from commit 84f91ddac5020295cbc0a3f84f14ab24f539ed00) (cherry picked from commit a690f70780e658c331ffdb3a2e7ff335a801c257) diff --git a/configure b/configure index 8f2cfcc..702f691 100755 --- a/configure +++ b/configure @@ -22504,7 +22504,7 @@ _ACEOF fi ldap_lib_ldif="" - LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -lldap$ol_libver" as_ac_Lib=`$as_echo "ac_cv_lib_ldif$ol_libver''__init" | $as_tr_sh` { $as_echo "$as_me:$LINENO: checking for _init in -lldif$ol_libver" >&5 $as_echo_n "checking for _init in -lldif$ol_libver... " >&6; } diff --git a/m4/openldap.m4 b/m4/openldap.m4 index 1e297c4..70312c7 100644 --- a/m4/openldap.m4 +++ b/m4/openldap.m4 @@ -145,7 +145,7 @@ if test "$with_openldap" = yes ; then dnl look for separate libldif - newer versions of openldap have moved the dnl ldif functionality into libldap ldap_lib_ldif="" - LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -lldap$ol_libver" AC_CHECK_LIB([ldif$ol_libver], [_init], [ldap_lib_ldif=-lldif$ol_libver], [ldap_lib_ldif=]) if test -z "$ldap_lib_ldif" ; then

1 0

Branch '389-ds-base-1.3.2' - configure m4/openldap.m4
by Noriko Hosoi 04 Sep '14

04 Sep '14

configure | 2 +- m4/openldap.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit a690f70780e658c331ffdb3a2e7ff335a801c257 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Thu Sep 4 13:53:52 2014 -0700 Ticket #47875 - dirsrv not running with old openldap Description: To check libldif, -lldap$ol_libver needs to be added to LDFLAGS to compile test conftest.c. (cherry picked from commit 8c7ac72659758ef1ea96794552e584fdbe803778) (cherry picked from commit 84f91ddac5020295cbc0a3f84f14ab24f539ed00) diff --git a/configure b/configure index c450b65..61922f2 100755 --- a/configure +++ b/configure @@ -19287,7 +19287,7 @@ $as_echo "#define HAVE_LDAP_URL_PARSE_EXT 1" >>confdefs.h fi ldap_lib_ldif="" - LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -lldap$ol_libver" as_ac_Lib=`$as_echo "ac_cv_lib_ldif$ol_libver''__init" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _init in -lldif$ol_libver" >&5 $as_echo_n "checking for _init in -lldif$ol_libver... " >&6; } diff --git a/m4/openldap.m4 b/m4/openldap.m4 index 1e297c4..70312c7 100644 --- a/m4/openldap.m4 +++ b/m4/openldap.m4 @@ -145,7 +145,7 @@ if test "$with_openldap" = yes ; then dnl look for separate libldif - newer versions of openldap have moved the dnl ldif functionality into libldap ldap_lib_ldif="" - LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -lldap$ol_libver" AC_CHECK_LIB([ldif$ol_libver], [_init], [ldap_lib_ldif=-lldif$ol_libver], [ldap_lib_ldif=]) if test -z "$ldap_lib_ldif" ; then

1 0

Branch '389-ds-base-1.3.3' - configure m4/openldap.m4
by Noriko Hosoi 04 Sep '14

04 Sep '14

configure | 3 +-- m4/openldap.m4 | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) New commits: commit 84f91ddac5020295cbc0a3f84f14ab24f539ed00 Author: Noriko Hosoi <nhosoi(a)redhat.com> Date: Thu Sep 4 13:53:52 2014 -0700 Ticket #47875 - dirsrv not running with old openldap Description: To check libldif, -lldap$ol_libver needs to be added to LDFLAGS to compile test conftest.c. (cherry picked from commit 8c7ac72659758ef1ea96794552e584fdbe803778) diff --git a/configure b/configure index ec58a1b..8eb5892 100755 --- a/configure +++ b/configure @@ -19407,7 +19407,7 @@ $as_echo "#define HAVE_LDAP_URL_PARSE_EXT 1" >>confdefs.h fi ldap_lib_ldif="" - LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -lldap$ol_libver" as_ac_Lib=`$as_echo "ac_cv_lib_ldif$ol_libver''__init" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _init in -lldif$ol_libver" >&5 $as_echo_n "checking for _init in -lldif$ol_libver... " >&6; } @@ -21376,7 +21376,6 @@ fi - # AC_DEFINE([USE_OLD_UNHASHED], [], [Use old unhashed code]) $as_echo "#define LDAP_DEBUG 1" >>confdefs.h diff --git a/m4/openldap.m4 b/m4/openldap.m4 index 1e297c4..70312c7 100644 --- a/m4/openldap.m4 +++ b/m4/openldap.m4 @@ -145,7 +145,7 @@ if test "$with_openldap" = yes ; then dnl look for separate libldif - newer versions of openldap have moved the dnl ldif functionality into libldap ldap_lib_ldif="" - LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS -lldap$ol_libver" AC_CHECK_LIB([ldif$ol_libver], [_init], [ldap_lib_ldif=-lldif$ol_libver], [ldap_lib_ldif=]) if test -z "$ldap_lib_ldif" ; then

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

389-commits September 2014