mirror of
https://git.openldap.org/openldap/openldap.git
synced 2026-02-19 02:28:47 -05:00
Reflect latest changes
This commit is contained in:
parent
2668fd43f9
commit
045d0dc60b
5 changed files with 749 additions and 626 deletions
8
CHANGES
8
CHANGES
|
|
@ -1,9 +1,15 @@
|
|||
OpenLDAP 2.2 Change Log
|
||||
|
||||
OpenLDAP 2.2.15 Engineering
|
||||
Fixed invalid cookie in pagedResults control (ITS#3089)
|
||||
Fixed back-bdb DB_DEADLOCK memory leak bug (ITS#3213)
|
||||
Fixed slapd oidValidate 0 bug (ITS#3211)
|
||||
Fixed slapd uniqueMember/nameUID bugs (ITS#3210)
|
||||
Fixed slapd operational attribute log message bug (ITS#3205)
|
||||
Fixed slapd invalid cookie in pagedResults control (ITS#3089)
|
||||
Fixed libldap sasl_encode 64-bit bug (ITS#3054,3212)
|
||||
Fixed libldap matchedValues parsing bug (ITS#3208)
|
||||
Fixed libldap_r runqueue
|
||||
Fixed slapi slapi_int_compute_output_ber attrs bug
|
||||
Build environments
|
||||
Added default ldapi:// SSF build setting
|
||||
|
||||
|
|
|
|||
|
|
@ -899,6 +899,11 @@ if test $ac_cv_func_res_query = no ; then
|
|||
ac_cv_func_res_query=$ac_cv_lib_resolv___res_query
|
||||
fi
|
||||
|
||||
if test $ac_cv_func_res_query = no ; then
|
||||
AC_CHECK_LIB(resolv, _res_9_query)
|
||||
ac_cv_func_res_query=$ac_cv_lib_resolv_res_9_query
|
||||
fi
|
||||
|
||||
if test "$ac_cv_func_res_query" = yes ; then
|
||||
AC_DEFINE(HAVE_RES_QUERY,1,
|
||||
[define if you have res_query()])
|
||||
|
|
|
|||
|
|
@ -221,32 +221,22 @@ base object for the search. The default is to never dereference aliases.
|
|||
Specify the LDAP protocol version to use.
|
||||
.TP
|
||||
.BI \-l \ timelimit
|
||||
wait at most \fItimelimit\fP seconds for a search to complete. A
|
||||
timelimit of
|
||||
.I 0
|
||||
(zero) removes the
|
||||
.B ldap.conf
|
||||
limit.
|
||||
wait at most \fItimelimit\fP seconds for a search to complete.
|
||||
A timelimit of
|
||||
.I 0
|
||||
(zero) or
|
||||
.I none
|
||||
uses
|
||||
.I maxInt
|
||||
(2147483647, RFC 2251) as timelimit.
|
||||
means no limit.
|
||||
A server may impose a maximal timelimit which only
|
||||
the root user may override.
|
||||
.TP
|
||||
.BI \-z \ sizelimit
|
||||
retrieve at most \fIsizelimit\fP entries for a search. A sizelimit
|
||||
of
|
||||
.I 0
|
||||
(zero) removes the
|
||||
.B ldap.conf
|
||||
limit.
|
||||
retrieve at most \fIsizelimit\fP entries for a search.
|
||||
A sizelimit of
|
||||
.I 0
|
||||
(zero) or
|
||||
.I none
|
||||
uses
|
||||
.I maxInt
|
||||
(2147483647, RFC 2251) as sizelimit.
|
||||
means no limit.
|
||||
A server may impose a maximal sizelimit which only
|
||||
the root user may override.
|
||||
.TP
|
||||
|
|
@ -314,8 +304,8 @@ The following command:
|
|||
ldapsearch -LLL "(sn=smith)" cn sn telephoneNumber
|
||||
.fi
|
||||
.LP
|
||||
will perform a subtree search (using the default search base defined
|
||||
in
|
||||
will perform a subtree search (using the default search base and
|
||||
other parameters defined in
|
||||
.BR ldap.conf (5))
|
||||
for entries with a surname (sn) of smith. The common name (cn), surname
|
||||
(sn) and telephoneNumber values will be retrieved and printed to
|
||||
|
|
|
|||
|
|
@ -66,12 +66,11 @@ ldap_pvt_runqueue_remove(
|
|||
break;
|
||||
}
|
||||
|
||||
assert ( e == entry );
|
||||
assert( e == entry );
|
||||
|
||||
LDAP_STAILQ_REMOVE( &rq->task_list, entry, re_s, tnext );
|
||||
|
||||
LDAP_FREE( entry );
|
||||
|
||||
}
|
||||
|
||||
struct re_s*
|
||||
|
|
@ -148,7 +147,7 @@ ldap_pvt_runqueue_resched(
|
|||
|
||||
LDAP_STAILQ_REMOVE( &rq->task_list, entry, re_s, tnext );
|
||||
|
||||
if ( entry->interval.tv_sec && !defer ) {
|
||||
if ( !defer ) {
|
||||
entry->next_sched.tv_sec = time( NULL ) + entry->interval.tv_sec;
|
||||
} else {
|
||||
entry->next_sched.tv_sec = 0;
|
||||
|
|
|
|||
Loading…
Reference in a new issue