Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
openldap
OpenLDAP
Commits
b48afc2e
Commit
b48afc2e
authored
Aug 26, 2020
by
Quanah Gibson-Mount
Browse files
Merge remote-tracking branch 'origin/master' into OPENLDAP_REL_ENG_2_5
parents
afcb343c
8889f905
Pipeline
#785
passed with stage
in 55 minutes and 27 seconds
Changes
57
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
aclocal.m4
View file @
b48afc2e
# generated automatically by aclocal 1.1
5
.1 -*- Autoconf -*-
# generated automatically by aclocal 1.1
6
.1 -*- Autoconf -*-
# Copyright (C) 1996-201
7
Free Software Foundation, Inc.
# Copyright (C) 1996-201
8
Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
...
...
build/openldap.m4
View file @
b48afc2e
...
...
@@ -806,19 +806,3 @@ AC_DEFUN([OL_SASL_COMPAT],
#endif
], [ol_cv_sasl_compat=yes], [ol_cv_sasl_compat=no])])
])
dnl ====================================================================
dnl check for SSL compatibility
AC_DEFUN([OL_SSL_COMPAT],
[AC_CACHE_CHECK([OpenSSL library version (CRL checking capability)],
[ol_cv_ssl_crl_compat],[
AC_EGREP_CPP(__ssl_compat,[
#ifdef HAVE_OPENSSL_SSL_H
#include <openssl/ssl.h>
#endif
/* Require 0.9.7d+ */
#if OPENSSL_VERSION_NUMBER >= 0x0090704fL
char *__ssl_compat = "0.9.7d";
#endif
], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])])
])
build/shtool
View file @
b48afc2e
...
...
@@ -993,7 +993,7 @@ install )
if
[
".
$opt_t
"
=
.yes
]
;
then
echo
"strip
$dsttmp
"
1>&2
fi
strip
$dsttmp
||
shtool_exit
$?
$STRIP
$dsttmp
||
shtool_exit
$?
fi
if
[
".
$opt_o
"
!=
.
]
;
then
if
[
".
$opt_t
"
=
.yes
]
;
then
...
...
build/top.mk
View file @
b48afc2e
...
...
@@ -59,7 +59,7 @@ INSTALL_PROGRAM = $(INSTALL)
INSTALL_DATA
=
$(INSTALL)
-m
644
INSTALL_SCRIPT
=
$(INSTALL)
STRIP
=
-s
STRIP
_OPTS
=
-s
LINT
=
lint
5LINT
=
5lint
...
...
clients/tools/Makefile.in
View file @
b48afc2e
...
...
@@ -129,7 +129,7 @@ install-local: FORCE
-
$(MKDIR)
$(DESTDIR)$(bindir)
@
(
\
for
prg
in
$(PROGRAMS)
;
do
\
$(LTINSTALL)
$(INSTALLFLAGS)
$(STRIP)
-m
755
$$
prg
$(EXEEXT)
\
$(LTINSTALL)
$(INSTALLFLAGS)
$(STRIP
_OPTS
)
-m
755
$$
prg
$(EXEEXT)
\
$(DESTDIR)$(bindir)
;
\
done
\
)
...
...
configure
View file @
b48afc2e
#! /bin/sh
# From configure.in Id:
75ab097eec39e97bbfa7d4c8c504962072f2acc1
.
# From configure.in Id:
d9579fd63cb1e1b81292655b40f8ab8509120b85
.
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69.
#
...
...
@@ -737,7 +737,6 @@ DSYMUTIL
MANIFEST_TOOL
AWK
RANLIB
STRIP
ac_ct_AR
LN_S
NM
...
...
@@ -759,6 +758,7 @@ SET_MAKE
OBJDUMP
DLLTOOL
AS
STRIP
AR
CC
ldap_subdir
...
...
@@ -2710,7 +2710,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_aux_dir=
for ac_dir in build "$srcdir"/build; do
if test -f "$ac_dir/install-sh"; then
...
...
@@ -4720,6 +4719,57 @@ test -n "$AR" || AR="missing"
fi
fi
if test -z "${STRIP}"; then
for ac_prog in strip
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_prog_STRIP+:} false; then :
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
STRIP=$ac_cv_prog_STRIP
if test -n "$STRIP"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
$as_echo "$STRIP" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
test -n "$STRIP" && break
done
test -n "$STRIP" || STRIP="missing"
if test "${STRIP}" = "missing" ; then
as_fn_error $? "Unable to locate strip(1) or suitable replacement. Check PATH or set STRIP." "$LINENO" 5
fi
fi
enable_win32_dll=yes
case $host in
...
...
@@ -17203,6 +17253,23 @@ done
if test $ac_cv_header_openssl_ssl_h = yes ; then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <openssl/opensslv.h>
#if OPENSSL_VERSION_NUMBER < 0x1000200fL
#error "OpenSSL is too old"
#endif
_ACEOF
if ac_fn_c_try_cpp "$LINENO"; then :
else
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "OpenSSL 1.0.2a or newer required
See \`config.log' for more details" "$LINENO" 5; }
fi
rm -f conftest.err conftest.i conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_set_msg_callback in -lssl" >&5
$as_echo_n "checking for SSL_CTX_set_msg_callback in -lssl... " >&6; }
if ${ac_cv_lib_ssl_SSL_CTX_set_msg_callback+:} false; then :
...
...
@@ -17311,43 +17378,6 @@ $as_echo "#define HAVE_RSAREF 1" >>confdefs.h
else
TLS_LIBS="-lssl -lcrypto"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenSSL library version (CRL checking capability)" >&5
$as_echo_n "checking OpenSSL library version (CRL checking capability)... " >&6; }
if ${ol_cv_ssl_crl_compat+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef HAVE_OPENSSL_SSL_H
#include <openssl/ssl.h>
#endif
/* Require 0.9.7d+ */
#if OPENSSL_VERSION_NUMBER >= 0x0090704fL
char *__ssl_compat = "0.9.7d";
#endif
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "__ssl_compat" >/dev/null 2>&1; then :
ol_cv_ssl_crl_compat=yes
else
ol_cv_ssl_crl_compat=no
fi
rm -f conftest*
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ol_cv_ssl_crl_compat" >&5
$as_echo "$ol_cv_ssl_crl_compat" >&6; }
if test $ol_cv_ssl_crl_compat = yes ; then
$as_echo "#define HAVE_OPENSSL_CRL 1" >>confdefs.h
fi
fi
fi
fi
...
...
configure.in
View file @
b48afc2e
...
...
@@ -654,6 +654,15 @@ if test -z "${AR}"; then
fi
fi
if test -z "${STRIP}"; then
AC_CHECK_PROGS(STRIP,strip,missing)
if test "${STRIP}" = "missing" ; then
AC_MSG_ERROR([Unable to locate strip(1) or suitable replacement. Check PATH or set STRIP.])
fi
fi
AC_LIBTOOL_WIN32_DLL
AC_LIBTOOL_DLOPEN
AC_PROG_MAKE_SET
...
...
@@ -1151,6 +1160,13 @@ if test $ol_with_tls = openssl || test $ol_with_tls = auto ; then
AC_CHECK_HEADERS(openssl/ssl.h)
if test $ac_cv_header_openssl_ssl_h = yes ; then
AC_PREPROC_IFELSE([AC_LANG_SOURCE(
[[#include <openssl/opensslv.h>]
[#if OPENSSL_VERSION_NUMBER < 0x1000200fL]
[#error "OpenSSL is too old"]
[#endif]])],
, [AC_MSG_FAILURE([OpenSSL 1.0.2a or newer required])])
AC_CHECK_LIB(ssl, SSL_CTX_set_msg_callback,
[have_openssl=yes
need_rsaref=no], [have_openssl=no],
...
...
@@ -1179,12 +1195,6 @@ if test $ol_with_tls = openssl || test $ol_with_tls = auto ; then
else
TLS_LIBS="-lssl -lcrypto"
fi
OL_SSL_COMPAT
if test $ol_cv_ssl_crl_compat = yes ; then
AC_DEFINE(HAVE_OPENSSL_CRL, 1,
[define if you have OpenSSL with CRL checking capability])
fi
fi
fi
fi
...
...
contrib/slapd-modules/addpartial/addpartial-overlay.c
View file @
b48afc2e
...
...
@@ -337,6 +337,7 @@ static int collect_error_msg_cb( Operation *op, SlapReply *rs)
int
addpartial_init
()
{
addpartial
.
on_bi
.
bi_type
=
"addpartial"
;
addpartial
.
on_bi
.
bi_flags
=
SLAPO_BFLAG_SINGLE
;
addpartial
.
on_bi
.
bi_op_add
=
addpartial_add
;
return
(
overlay_register
(
&
addpartial
));
...
...
contrib/slapd-modules/adremap/adremap.c
View file @
b48afc2e
...
...
@@ -630,6 +630,7 @@ int adremap_initialize()
int
i
,
code
;
adremap
.
on_bi
.
bi_type
=
"adremap"
;
adremap
.
on_bi
.
bi_flags
=
SLAPO_BFLAG_SINGLE
;
adremap
.
on_bi
.
bi_db_init
=
adremap_db_init
;
adremap
.
on_bi
.
bi_db_destroy
=
adremap_db_destroy
;
adremap
.
on_bi
.
bi_op_search
=
adremap_search
;
...
...
contrib/slapd-modules/allop/allop.c
View file @
b48afc2e
...
...
@@ -245,6 +245,7 @@ allop_init()
{
allop
.
on_bi
.
bi_type
=
"allop"
;
allop
.
on_bi
.
bi_flags
=
SLAPO_BFLAG_SINGLE
;
allop
.
on_bi
.
bi_db_config
=
allop_db_config
;
allop
.
on_bi
.
bi_db_destroy
=
allop_db_destroy
;
...
...
contrib/slapd-modules/allowed/allowed.c
View file @
b48afc2e
...
...
@@ -475,6 +475,7 @@ aa_initialize( void )
aa
.
on_bi
.
bi_type
=
"allowed"
;
aa
.
on_bi
.
bi_flags
=
SLAPO_BFLAG_SINGLE
;
aa
.
on_bi
.
bi_operational
=
aa_operational
;
/* aa schema integration */
...
...
contrib/slapd-modules/authzid/authzid.c
View file @
b48afc2e
...
...
@@ -374,6 +374,7 @@ authzid_initialize( void )
authzid
.
on_bi
.
bi_type
=
"authzid"
;
authzid
.
on_bi
.
bi_flags
=
SLAPO_BFLAG_SINGLE
;
authzid
.
on_bi
.
bi_db_init
=
authzid_db_init
;
authzid
.
on_bi
.
bi_db_destroy
=
authzid_db_destroy
;
authzid
.
on_bi
.
bi_op_bind
=
authzid_op_bind
;
...
...
contrib/slapd-modules/autogroup/autogroup.c
View file @
b48afc2e
...
...
@@ -2207,6 +2207,7 @@ autogroup_initialize(void)
int
rc
=
0
;
autogroup
.
on_bi
.
bi_type
=
"autogroup"
;
autogroup
.
on_bi
.
bi_flags
=
SLAPO_BFLAG_SINGLE
;
autogroup
.
on_bi
.
bi_db_open
=
autogroup_db_open
;
autogroup
.
on_bi
.
bi_db_close
=
autogroup_db_close
;
autogroup
.
on_bi
.
bi_db_destroy
=
autogroup_db_destroy
;
...
...
contrib/slapd-modules/cloak/cloak.c
View file @
b48afc2e
...
...
@@ -332,6 +332,7 @@ int
cloak_initialize
(
void
)
{
int
rc
;
cloak_ovl
.
on_bi
.
bi_type
=
"cloak"
;
cloak_ovl
.
on_bi
.
bi_flags
=
SLAPO_BFLAG_SINGLE
;
cloak_ovl
.
on_bi
.
bi_db_destroy
=
cloak_db_destroy
;
cloak_ovl
.
on_bi
.
bi_op_search
=
cloak_search
;
cloak_ovl
.
on_bi
.
bi_cf_ocs
=
cloakocs
;
...
...
contrib/slapd-modules/denyop/denyop.c
View file @
b48afc2e
...
...
@@ -229,6 +229,7 @@ denyop_initialize( void )
{
memset
(
&
denyop
,
0
,
sizeof
(
slap_overinst
)
);
denyop
.
on_bi
.
bi_type
=
"denyop"
;
denyop
.
on_bi
.
bi_flags
=
SLAPO_BFLAG_SINGLE
;
denyop
.
on_bi
.
bi_db_init
=
denyop_over_init
;
denyop
.
on_bi
.
bi_db_config
=
denyop_config
;
denyop
.
on_bi
.
bi_db_destroy
=
denyop_destroy
;
...
...
contrib/slapd-modules/dupent/dupent.c
View file @
b48afc2e
...
...
@@ -541,6 +541,7 @@ dupent_initialize( void )
dupent
.
on_bi
.
bi_type
=
"dupent"
;
dupent
.
on_bi
.
bi_flags
=
SLAPO_BFLAG_SINGLE
;
dupent
.
on_bi
.
bi_op_search
=
dupent_op_search
;
return
overlay_register
(
&
dupent
);
...
...
contrib/slapd-modules/lastbind/lastbind.c
View file @
b48afc2e
...
...
@@ -298,6 +298,7 @@ int lastbind_initialize()
ad_authTimestamp
->
ad_type
->
sat_flags
|=
SLAP_AT_MANAGEABLE
;
lastbind
.
on_bi
.
bi_type
=
"lastbind"
;
lastbind
.
on_bi
.
bi_flags
=
SLAPO_BFLAG_SINGLE
;
lastbind
.
on_bi
.
bi_db_init
=
lastbind_db_init
;
lastbind
.
on_bi
.
bi_db_close
=
lastbind_db_close
;
lastbind
.
on_bi
.
bi_op_bind
=
lastbind_bind
;
...
...
contrib/slapd-modules/lastmod/lastmod.c
View file @
b48afc2e
...
...
@@ -933,6 +933,7 @@ int
lastmod_initialize
()
{
lastmod
.
on_bi
.
bi_type
=
"lastmod"
;
lastmod
.
on_bi
.
bi_flags
=
SLAPO_BFLAG_SINGLE
;
lastmod
.
on_bi
.
bi_db_init
=
lastmod_db_init
;
lastmod
.
on_bi
.
bi_db_config
=
lastmod_db_config
;
lastmod
.
on_bi
.
bi_db_destroy
=
lastmod_db_destroy
;
...
...
contrib/slapd-modules/noopsrch/noopsrch.c
View file @
b48afc2e
...
...
@@ -236,6 +236,7 @@ noopsrch_initialize( void )
noopsrch
.
on_bi
.
bi_type
=
"noopsrch"
;
noopsrch
.
on_bi
.
bi_flags
=
SLAPO_BFLAG_SINGLE
;
noopsrch
.
on_bi
.
bi_db_init
=
noopsrch_db_init
;
noopsrch
.
on_bi
.
bi_db_destroy
=
noopsrch_db_destroy
;
noopsrch
.
on_bi
.
bi_op_search
=
noopsrch_op_search
;
...
...
contrib/slapd-modules/nops/nops.c
View file @
b48afc2e
...
...
@@ -163,6 +163,7 @@ static
int
nops_initialize
(
void
)
{
nops_ovl
.
on_bi
.
bi_type
=
"nops"
;
nops_ovl
.
on_bi
.
bi_flags
=
SLAPO_BFLAG_SINGLE
;
nops_ovl
.
on_bi
.
bi_op_modify
=
nops_modify
;
return
overlay_register
(
&
nops_ovl
);
}
...
...
Prev
1
2
3
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment