Changes to 'refs/tags/389-ds-console-1.2.4'
by Richard Allen Megginson
Changes since the dawn of time:
Endi S. Dewata (3):
Bug 496863 - 'Construct' button creates incorrect referral urls
Resolves: bug 574098
Bug 563513 - New replication -> No changelong configured-msg
Nathan Kinder (20):
171941 - Adjusted the version number and branding. I had to modify the checkVersion method to deal with running in Console 1.0. I also cleaned up references to consolesdk in the Ant build files. They should be console instead since we dropped the consolesdk naming. The external and internal imports files were adjusted to pick up the new 1.0 Console component.
171941 - checkVersion was comparing versions with greater than when it should have been using greater than or equal to
177696 - Changed usage of enum keyword as a variable name for Java 1.5 compatibility
Bug(s) fixed: 181570
Resolves: 246513
Summary: Initial fedora-ds-console specfile.
Resolves: ?
Resolves: 250137
Resolves: 250145
Resolves: 204510
Resolves: 250636
Resolves: 252036
Add default ldapjdk path as well as a settable parameter
Fixed typo from last checkin
Use less restrictive version of Open Publication License for online help docs.
Resolves: 308221
Resolves: 333171
Resolves: 178247
Resolves: 379191
Bug 599732 - Root node in directory browser shows DN syntax error
Noriko Hosoi (18):
Changed the ldapconsole package name to <brand>-ds-<version>.jar
Modified ant move syntax to support ant 1.6.2
[186105] Admin Server Makefile updates for Internal build
Resolves: #247215
Resolves: #248073
Resolves: #379191
Resolves: #386041
Resolves: #379191
Resolves: #379191
Resolves: #379191
Resolves: #379191
Resolves: #379191
Resolves: 178947
Bug 553066 - Directory Console: do not display "subtree" index type
Bug 151705 - Need to update Console Cipher Preferences with new ciphers
Bug 661116 - 389-console Configuration tab admin permissions
Bug 387981 - plain files can be chosen on the Restore Directory dialog
Bug 450016 - RFE- Console display values in KB/MB/GB
Rich Megginson (35):
Bug(s) fixed: 167761
allow the definition of the console location on the command line with different directory layouts than the default
Bug(s) fixed: 178478
The console now builds jar files in the format
bump version to 1.0.3
updated spec for Fedora DS 1.1 release
Resolves: bug 428357
Bump version to 1.1.2
this is for the 1.1.2 release
Resolves: bug 469261
Resolves: bug 469261
Resolves: bug 234948
Resolves: bug 452596
Resolves: bug 178947
Resolves: bug 177334
Resolves: bug 249120
Resolves: bug 238762
Resolves: bug 179193
Resolves: bug 179184
change version to 1.1.3
Resolves: bug 487831
Resolves: bug 481213
Resolves: bug 483660
Resolves: bug 483660
updated for 1.1.3
version must correspond to ds base version - 1.2.0
rename to 389
change mode of spec file to 644
added separate doc subpackage
update to version 1.2.1
Bug 586571 - DS Console shows escaped DNs
bump version to 1.2.2
Bug 586571 - DS Console shows escaped DNs
Bug 591989 - [console] mis-matched trademark and text
bump version to 1.2.4
foxworth (2):
Import initial source drop of Fedora DirectoryConsole
Import initial source drop of Fedora DirectoryConsole
13 years, 1 month
- 1
- 0
console build.properties,1.19,1.20
by Richard Allen Megginson
Author: rmeggins
Update of /cvs/dirsec/console
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22278
Modified Files:
build.properties
Log Message:
bump version to 1.1.16
Index: build.properties
===================================================================
RCS file: /cvs/dirsec/console/build.properties,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- build.properties 3 May 2010 20:56:31 -0000 1.19
+++ build.properties 23 Feb 2011 16:34:46 -0000 1.20
@@ -23,7 +23,7 @@
console.root=.
console.version=11
-console.dotversion=1.1.5
+console.dotversion=1.1.6
console.dotgenversion=1.1
mcc.core=idm-console-mcc
13 years, 1 month
- 1
- 0
build.properties
by Richard Allen Megginson
build.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0905c019fbcf7ced91b75def297622dd0a40679f
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Tue Feb 22 20:07:09 2011 -0700
bump version to 1.2.4
diff --git a/build.properties b/build.properties
index 4640f55..68263a4 100755
--- a/build.properties
+++ b/build.properties
@@ -21,7 +21,7 @@
lang=en
ldapconsole.root=..
-ldapconsole.version=1.2.3
+ldapconsole.version=1.2.4
ldapconsole.gen.version=1.2
brand=389
ldapconsole.name=${brand}-ds-${ldapconsole.version}
13 years, 1 month
- 1
- 0
Changes to 'refs/tags/389-admin-1.1.15'
by Richard Allen Megginson
Changes since 389-admin-1.1.11:
Endi S. Dewata (3):
Bug 573889 - Migration does not remove deprecated schema
Bug 644929 - FDS to 389 DS migration results in both Fedora and 389 entries
Bug 470576 - Migration could do addition checks before commiting actions
Nathan Kinder (7):
Bug 648949 - Merge selinux policy into base OS
Regenerated autoconf files
Bug 638511 - dirsrv-admin crashes at startup with SELinux enabled
Bug 668950 - Add posix group support to Console
Bug 672468 - Don't use empty path elements in LD_LIBRARY_PATH
Bug 618897 - Wrong permissions when creating instance from Console
Bug 493424 - remove unneeded modules for admin server apache config
Noriko Hosoi (8):
Bug 151705 - Need to update Console Cipher Preferences with new ciphers
start-ds-admin.in -- replaced "return 1" with "exit 1"
Bug 616260 - libds-admin-serv linking fails due to unresolved link-time dependencies
Bug 618858 - move start-ds-admin env file into main admin server
Bug 387981 - plain files can be chosen on the Restore Directory dialog
Bug 604881 - admin server log files have incorrect permissions/ownerships
Bug 604881 - admin server log files have incorrect permissions/ownerships
Bug 245278 - Changing to a password with a single quote does not work
Rich Megginson (18):
bump version to 1.1.12.a1
initial support for openldap
add selinux policy for dsgw
skip LD_PRELOAD if using openldap
add more log information if nss init fails
add even more nss debugging
Bug 618454 - mod_admserv should only clear NSS caches and shutdown if NSS is initialized
bump version to 1.1.12.a2
fix building with mozldap
bump version to 1.1.12.a3
fix autotool build issues with properties files
setup-ds-admin.pl -u exits with ServerAdminID and as_uid related error
Bug 656441 - Missing library path entry causes LD_PRELOAD error
bump version to 1.1.13
bump version to 1.1.14.a1
Bug 664671 - Admin server segfault when full SSL access (http+ldap+console) required
bump version to 1.1.14
bump version to 1.1.15
---
Makefile.am | 70
Makefile.in | 1395 -
VERSION.sh | 4
aclocal.m4 | 6879 -----
admserv/cfgstuff/httpd-2.2.conf.in | 11
admserv/cfgstuff/start-ds-admin.in | 83
admserv/cgi-src40/admlib.mk | 119
admserv/cgi-src40/admpw.c | 67
admserv/cgi-src40/dllglue.c | 42
admserv/cgi-src40/ds_create.in | 6
admserv/cgi-src40/dsconfig.c | 9
admserv/cgi-src40/htmladmin.c | 166
admserv/cgi-src40/sec-activate.c | 21
admserv/cgi-src40/security.c | 2
admserv/cgi-src40/viewdata.c | 150
admserv/cgi-src40/viewlog.c | 21
admserv/newinst/src/25changefedorato389.pl | 155
admserv/newinst/src/AdminMigration.pm.in | 59
admserv/newinst/src/AdminServer.pm.in | 40
admserv/newinst/src/AdminUtil.pm.in | 1
admserv/schema/ldif/02globalpreferences.ldif.tmpl | 10
compile | 21
config.guess | 302
config.h.in | 24
config.sub | 232
configure |29652 +++++++++-------------
configure.ac | 26
depcomp | 172
include/libadmin/libadmin.h | 62
include/libdsa/dsalib.h | 6
install-sh | 517
lib/libadmin/dllglue.c | 77
lib/libadmin/util.c | 737
lib/libdsa/dsalib_conf.c | 15
lib/libdsa/dsalib_confs.c | 72
ltmain.sh | 8473 +++---
m4/mozldap.m4 | 116
m4/openldap.m4 | 131
m4/selinux.m4 | 3
missing | 104
mod_admserv/mod_admserv.c | 166
mod_admserv/mod_admserv.h | 15
selinux/dirsrv-admin.fc.in | 5
selinux/dirsrv-admin.te | 2
tests/ds_create/testget.1 | 2
tests/htmladmin/testget.2 | 2
tests/htmladmin/testget.3 | 2
tests/htmladmin/testget.4 | 2
tests/htmladmin/testget.5 | 2
tests/htmladmin/testget.6 | 2
tests/htmladmin/testget.7 | 2
tests/htmladmin/testget.8 | 2
tests/setup.sh | 250
tests/ugdsconfig/testget.10 | 2
tests/viewdata/testget.2 | 2
tests/viewdata/testget.3 | 2
tests/viewdata/testget.4 | 2
tests/viewlog/testget.3 | 2
tests/viewlog/testget.4 | 2
59 files changed, 21166 insertions(+), 29352 deletions(-)
---
13 years, 1 month
- 1
- 0
Changes to 'refs/tags/389-ds-base-1.2.8.a3'
by Richard Allen Megginson
Changes since 389-ds-base-1.2.6.a1:
Endi S. Dewata (168):
Bug 545620 - Password cannot start with minus sign
Bug 538525 - Ability to create instance as non-root user
Bug 570542 - Root password cannot contain matching curly braces
Bug 470684 - Pam_passthru plugin doesn't verify account activation
Bug 573375 - MODRDN operation not logged
Bug 520151 - Error when modifying userPassword with proxy user
Bug 455489 - Address compiler warnings about strict-aliasing rules
Bug 566320 - RFE: add exception to removal of attributes in cn=config for aci
Bug 566043 - startpid file is only cleaned by initscript runs
Bug 584109 - Slapd crashes while parsing DNA configuration
Bug 542570 - Directory Server port number is not validated in the beginning.
Bug 145181 - Plugin target/bind subtrees only take 1 value.
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 619122 - fix coverify Defect Type: Resource leaks issues CID 11975 - 12053
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverify Defect Type: Resource leaks issues CID 12094 - 12136
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 628096 - spurious error message from /sbin/service when doing a stop on no instances
Bug 573889 - Migration does not remove deprecated schema
Bug 606545 - core schema should include numSubordinates
Bug 643979 - Strange byte sequence for attribute with no values (nsslapd-referral)
Endi Sukma Dewata (16):
Bug 630092 - Coverity #12117: Resource leaks issues
Bug 630092 - Coverity #15478: Resource leaks issues
Bug 630092 - Coverity #15479: Resource leaks issues
Bug 630092 - Coverity #15481: Resource leaks issues
Bug 630092 - Coverity #15482: Resource leaks issues
Bug 630092 - Coverity #15483: Resource leaks issues
Bug 630092 - Coverity #15484: Resource leaks issues
Bug 630092 - Coverity #15485: Resource leaks issues
Bug 630092 - Coverity #15487: Resource leaks issues
Bug 630092 - Coverity #15490: Resource leaks issues
Bug 630092 - Coverity #15497: Resource leaks issues
Bug 630092 - Coverity #11991: Resource leaks issues
Bug 630092 - Coverity #12000: Resource leaks issues
Bug 630092 - Coverity #12003: Resource leaks issues
Bug 630092 - Coverity #11985: Resource leaks issues
Bug 630092 - Coverity #11992,11993: Resource leaks issues
Nathan Kinder (131):
Bug 549554 - Trim single-valued attributes before sending to AD
Improve search for pcre header file
Bug 434735 - Allow SASL ANONYMOUS mech to work
Bug 570912 - Avoid selinux context conflict with httpd
Allow instance name to be parsed from start-slapd
Add managed entries plug-in
Bug 572355 - Label instance files and ports during upgrade.
Bug 578863 - Password modify extop needs to send referrals on replicas
Bug 584156 - Remove ldapi socket file during upgrade
Fix rsearch usage of name files for random filters
Bug 584497 - Allow DNA plugin to set same value on multiple attributes
Add replication session hooks
Correct function prototype for repl session hook
Bug 592389 - Set anonymous resource limits properly
Bug 601433 - Add man pages for start-dirsrv and related commands
Bug 604263 - Fix memory leak when password change is rejected
Bug 612242 - membership change on DS does not show on AD
Bug 613833 - Allow dirsrv_t to bind to rpc ports
Bug 594745 - Get rid of dirsrv_lib_t label
Bug 620927 - Allow multiple membership attributes in memberof plugin
Bug 612264 - ACI issue with (targetattr='userPassword')
Bug 630098 - fix coverity Defect Type: Code maintainability issues
Bug 630098 - fix coverity Defect Type: Code maintainability issues
Bug 630093 - (cov#15511) Don't use unintialized search_results in refint plugin
Bug 630093 - (cov#15518) Need to intialize fd in ldbm2ldif code
Bug 630096 - (cov#11778) check return value of ldap_parse_result
Bug 630096 - (cov#15446) check return value of ber_scanf()
Bug 630096 - (cov#15449,15450) Check return value of stat()
Bug 630096 - (cov#15448) Check return value of cache_replace()
Bug 630096 - (cov#15447) - Check return value of idl_append_extend()
Bug 630090 - (cov#11974) Remove unused ACL functions
Bug 630090 - (cov#15445) Fix illegal free in archive code
Bug 630094 - (cov#11818) Fix unreachable return in snmp subagent
Bug 630094 - (cov#15451) Get rid of unreachable free statements
Bug 630094 - (cov#15452) Remove NULL checking for op_string
Bug 630094 - (cov#15453) Eliminate NULL check for local_newentry
Bug 630094 - (cov#15454) Fix deadcode issue in mapping tree code
Bug 630094 - (cov#15455) Remove deadcode in attr_index_config()
Bug 630094 - (cov#15456) Remove NULL check for srdn in import code
Bug 630094 - (cov#15457) Remove deadcode in import code
Bug 630094 - (cov#15458) Fix deadcode issue in moddn code
Bug 630094 - (cov#15459) Remove NULL check for srdn in ldif2ldbm code
Bug 630094 - (cov#15520) Fix unreachable code issue if perfctrs code
Bug 630094 - (cov#15581) Add missing breaks in agt_mopen_stats()
Bug 690090 - (cov#11974) Remove additional unused ACL functions
Bug 630091 - (cov#15512) Fix usage of uninitialized bervals
Bug 630091 - (cov#15513) Fix usage of uninitialized bervals
Bug 630091 - (cov#15514) Initialize DBT in entryrdn_get_parent()
Bug 630091 - (cov#15515) Use of uninitialized array in index config code
Bug 630091 - (cov#15516,15517) Initialize pointers before attempting to free
Bug 630091 - (cov#15519) Initialize bervals in search_easter_egg()
Bug 630091 - (cov#15582) Free of uninitialized pointer in attr_index_config()
Bug 630097 - (cov#11933) Fix NULL dereference in schema code
Bug 630097 - (cov#11938) NULL dereference in mmldif
Bug 630097 - (cov#11946) NULL dereference in ResHashCreate()
Bug 630097 - (cov#11964) Remove dead code from libaccess
Bug 630097 - (cov#12143) NULL dereference in cos cache code
Bug 630097 - (cov#12148) NULL dereference in ruvInit()
Bug 630097 - (cov#12182,12183) NULL dereference in import code
Bug 630097 - (cov#15460) NULL deference in ACL URL code
Bug 630097 - (cov#15461) Remove unnecessary NULL check in DNA
Bug 630097 - (cov#15462) NULL dereference in mep_modrdn_post_op()
Bug 630097 - (cov#15463) Remove NULL check in referint plugin
Bug 630097 - (cov#15464) NULL dereference in repl code
Bug 630097 - (cov#15465) Null dereference in USN code
Bug 630097 - (cov#15473) NULL dereference in ResHashCreate()
Bug 630097 - (cov#15505) NULL dereference in memberOf code
Bug 630097 - (cov#15506) NULL dereference in dblayer code
Bug 630097 - (cov#15507,15508) NULL dereference in entryrdn code
Bug 630097 - (cov#15509) NULL dereference in idsktune
Bug 630097 - (cov#11938) NULL dereference in mmldif
Bug 630097 - (cov#15477) NULL dereference in ACL plug-in code
Bug 630091 - (cov#12209) Use of uninitialized pointer in libaccess
Bug 630092 - (cov#12116) Resource leak in ldclt code
Bug 630092 - (cov#12105) Resource leak in pwdscheme config code
Bug 630092 - (cov#12068) Resource leak in certmap code
Bug 630091 - (cov#11973) Array overrun in libaccess
Bug 522055 - Scope check for managed attribute fails
Bug 625335 - Self-write aci has permission to invalid attribute
Bug 631993 - Log authzid when proxy auth control is used
Cov #16300 - Unused variable in account policy plugin
Bug 544321 - remove-ds.pl should not throw error unlabelling port
Bug 555955 - Allow CoS values to be merged
Bug 643937 - Initialize replication version flags
Bug 305131 - Allow empty modify operation
Bug 619633 - Make attribute uniqueness obey requiredObjectClass
Bug 619623 - attr-unique-plugin ignores requiredObjectClass on modrdn operations
Bug 189985 - Improve attribute uniqueness error message
Bug 647932 - multiple memberOf configuration adding memberOf where there is no member
Bug 521088 - DNA should check ACLs before getting a value from the range
Bug 635009 - Add one-way AD sync capability
Bump VERSION.sh to 1.2.8.a1
Bug 648949 - Move selinux policy into base OS
Bug 648949 - Update configure
Roll back VERSION.sh for 1.2.7 release
Bug 625950 - hash nsslapd-rootpw changes in audit log
Bug 656392 - Remove calls to ber_err_print()
Bug 656515 - Allow Name and Optional UID syntax for grouping attributes
Bug 197886 - Avoid overflow of UUID generator
Bug 658312 - Allow mapped attribute types to be quoted
Bug 197886 - Initialize return value for UUID generation code
Bug 658309 - Process escaped characters in managed entry mappings
Bug 659456 - Incorrect usage of ber_printf() in winsync code
Bug 641944 - Don't normalize non-DN RDN values
Bug 658312 - Invalid free in Managed Entry plug-in
Bug 661792 - Valid managed entry config rejected
Bug 588791 - Allow anonymous rootDSE access only
Bug 606439 - Creating server instance with LDAPI takes too long
Bug 632670 - Chain-on-update logs managed-entries-plugin errors
Bug 621008 - parsing purge RUV from changelog at startup fails
Bug 663191 - Don't use $USER in DSCreate.pm
Bug 663597 - Memory leaks in normalization code
Bug 659131 - Incorrect RDN values added with multi-valued RDN
Bug 661102 - Rename of managed entries not handled correctly
Bug 193297 - Call pre-bind plug-ins for all SASL bind steps
Bug 201652 - LDAPv2 bind with expired password doesn't unbind correctly
Bug 470576 - Migration could do addition checks before commiting actions
Bug 481195 - Missing op type in log when password change required
Bug 509897 - Validate dnaScope to ensure it is a legal DN
Bug 505722 - Allow ntGroup to have mail attribute present
Bug 543633 - replication problems if supplier is killed under update load
Bug 671033 - range sharing between server breaks with SASL/GSSAPI auth
Bug 527912 - setup-ds.pl appears to hang when DNS is unreachable
Bug 252249 - Add pkg-config file for plug-in developers
Bug 670616 - Allow SSF to be set for local (ldapi) connections
Bug 668862 - init scripts return wrong error code
Bug 674430 - Improve error messages for attribute uniqueness
Bug 675853 - dirsrv crash segfault in need_new_pw()
Bug 678646 - Ignore tombstone operations in managed entry plug-in
Bug 671199 - Don't allow other to write to rundir
Bug 672468 - Don't use empty path elements in LD_LIBRARY_PATH
Noriko Hosoi (211):
544089 - Referential Integrity Plugin does not take into account the attribute
557224 - subtree rename breaks the referential integrity plug-in
247413 - Incorrect error on multiple identical value add
559016 - Attempting to rename suffix returns inappropriate errors
555577 - Syntax validation fails for "ou=NetscapeRoot" tree
Undo - 555577 - Syntax validation fails for "ou=NetscapeRoot" tree
560827 - Admin Server templates: DistinguishName validation fails
548535 - memory leak in attrcrypt
563365 - Error handling problems in the backend functions
565664 - Incorrect parameter for CACHE_RETURN()
565987 - redhat-ds-base fails to build due to undefined struct
527848 - make sure db upgrade to 4.7 and later works correctly
539618 - Replication bulk import reports Invalid read/write
567370 - dncache: assertion failure in id2entry_delete
548115 - memory leak in schema reload
555970 - missing read lock in the combination of cos and nsview
539618 - Replication bulk import reports Invalid read/write
570667 - MMR: simultaneous total updates on the masters cause
Merge branch '547503'
Revert "Merge branch '547503'"
Bug 554573 - ACIs use bind DN from bind req rather than cert mapped DN from sasl/external
199923 - subtree search fails to find items under a db
570107 - The import of LDIFs with base-64 encoded DNs fails,
572649 - DS8.2 crashes on RHEL 4 (corresponding to bob, ber_2 test case)
573060 - DN normalizer: ESC HEX HEX is not normalized (
573896 - initializing subtree with invalid syntax crashes ns-slapd
515805 - Stop "initialize Database" crashes the server
548533 - memory leak in Repl_5_Inc_Protocol_new
Fixing a syntax error
Update to New DN Format
585905 - ACL with targattrfilters error crashes the server
574167 - An escaped space at the end of the RDN value is not
590931 - rhds81 import - hardcoded pages_limit for nsslapd-import-cache-autosize
591336 - Implementing upgrade DN format tool
593453 - Creating password policy with ns-newpolicy.pl on Replicated
593110 - backup-restore does not ALWAYS work
593899 - adding specific ACI causes very large mem allocate request
588867 - entryusn plugin fails on solaris
593899 - adding specific ACI causes very large mem allocate request
595893 - Base DN in SASL mapping is not normalized
511112 - Password history limited to 25 values
597375 - Deleting LDBM database causes backup/restore problem
574101 - MODRDN request never returns - possible deadlock
606920 - anonymous resource limit - nstimelimit -
605827 - In-place upgrade: upgrade dn format should not run in setup-ds-admin.pl
578296 - Attribute type entrydn needs to be added when subtree
609256 - Selinux: pwdhash fails if called via Admin Server CGI
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
609255 - fix coverity Defect Type: Memory - illegal accesses issues
616618 - 389 v1.2.5 accepts 2 identical entries with different DN formats
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
610281 - fix coverity Defect Type: Control flow issues
616608 - SIGBUS in RDN index reads on platforms with strict alignments
619595 - Upgrading sub suffix under non-normalized suffix disappears
513166 - Simple Paged result doesn't provide the server's estimate
621928 - Unable to enable replica (rdn problem?) on 1.2.6 rc6
Bug 194531 - db2bak is too noisy
Bug 622628 - fix coverity Defect Type: Integer handling issues
Bug 622628 - fix coverity Defect Type: Integer handling issues
Bug 622628 - fix coverity Defect Type: Integer handling issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 622903 - fix coverity Defect Type: Code maintainability issues
Bug 623118 - Simplepaged results going in infinite loop
Bug 614511 - fix coverity Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 619122 - fix coverity Defect Type: Resource leaks issues CID 11975 - 12051
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 617630 - fix coverity Defect Type: Resource leaks issues CID 12052 - 12093
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 616500 - fix coverity Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverity Defect Type: Resource leaks issues CID 12094 - 12136
Bug 616500 - fix coverity Defect Type: Resource leaks issues CID 12094 - 12136
Bug 614511 - fix coverify Defect Type: Null pointer dereferences issues 11846 - 11891
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892 - 11939
Bug 613056 - fix coverify Defect Type: Null pointer dereferences issues 11892
Bug 616500 - fix coverity Defect Type: Resource leaks issues
Bug 623507 - fix coverity Defect Type: Incorrect expression issues
Bug 623507 - fix coverity Defect Type: Incorrect expression issues
Bug 613056 - fix coverify Defect Type: Null pointer dereferences
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 610119 - fix coverify Defect Type: Null pointer dereferences issues 12167 - 12199
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Bug 611790 - fix coverify Defect Type: Null pointer dereferences issues 11940 - 12166
Removed redundant code in agmt_new_from_entry
Bug 617630 - fix coverify Defect Type: Resource leaks issues CID 12052 - 12093
Bug 628300 - DN is not normalized in dn/entry cache when an entry is added, entrydn is not present in search results
Bug 531642 - EntryUSN: RFE: a configuration option to make entryusn "global"
Bug 627738 - The cn=monitor statistics entries for the dnentry cache do not change or change very rarely
DN normalizer should check the invalid type
Bug 627738 - The cn=monitor statistics entries for the dnentry cache
Bug 629710 - escape_string does not check '\<HEX><HEX>'
agmtlist_shutdown (repl5_agmtlist.c) had an illegal access defect.
Bug 633168 - Share backend dbEnv with the replication changelog
Bug 633168 - Share backend dbEnv with the replication changelog
Bug 631862 - crash - delete entries not in cache + referint
Bug 625014 - SubTree Renames: ModRDN operation fails and the server hangs if the entry is moved to "under" the same DN.
Bug 558099 - Enhancement request: Log more information about the search result being a paged one
Bug 635987 - Incorrect sub scope search result with
Bug 606920 - anonymous resource limit- nstimelimit -
Bug 635987 - Incorrect sub scope search result with ACL containing ldap:///self
Bug 639289 - Adding a new CN entry with UpperCase UTF-8 Character
Bug 640027 - Naming attribute with a special char sequence parsing bug
Bug 640854 - changelog db: _cl5WriteOperation: failed to
Bug 637852 - sasl_io_start_packet: failed - read only 3 bytes
Bug 586966 - Sample update script has syntax errors
Bug 586973 - Sample update ldif points to non-existent directory
Bug 602456 - Allow to add any cn=config attributes;
Bug 244229 - targetattr not verified against schema when setting an aci
Bug 643532 - Incorrect DNs sometimes returned on searches
Bug 592397 - Upgrade tool dn2rdn: it does not clean up
Bug 645061 - Upgrade: 06inetorgperson.ldif and 05rfc4524.ldif
Bug 629681 - Retro Changelog trimming does not behave as expected
Bug 644608 - RHDS 8.1->8.2 upgrade fails to properly migrate ACIs
Bug 644608 - RHDS 8.1->8.2 upgrade fails to properly migrate ACIs
Bug 644608 - RHDS 8.1->8.2 upgrade fails to properly migrate ACIs
Bug 638773 - permissions too loose on pid and lock files
Bug 491733 - dbtest crashes
Bug 329751 - "nested" filtered roles searches candidates more
Bug 567282 - server can not abandon searchRequest of "simple paged results"
Bug 572018 - Upgrading from 1.2.5 to 1.2.6.a2 deletes userRoot
Bug 651571 - When attrcrypt is on, entrydn is stored in the backend db
Bug 661918 - 389-ds MMR plugin's changelogdb path logic is incorrect
Bug 182507 - clear-password mod from replica is discarded before changelogged
Bug 602456 - Allow to add any cn=config attributes;
Bug 489379 - passwordExpirationTime in entry being added
Bug 663484 - Entry usn plugin fails to properly tag entries on initialization
Bug 664563 - GER: ger for non-present entry is not correct
Bug 653007 - db2ldif export of clear text passwords lacks storage scheme
Bug 667488 - Cannot recreate numsubordinates index with db2index
Bug 663752 - Cert renewal for attrcrypt and encchangelog
Bug 615100 - log rotationinfo always recreated at startup,
Bug 624442 - MMR: duplicate replica ID
Bug 669205 - db2bak: backed up changelog should include RUVs
Bug 616850 - ldapmodify failed to reject the replace operation
Bug 627993 - Inconsistent storage of password expiry times
Bug 627993 - Inconsistent storage of password expiry times
dn2rdn should respect the DB version info
Bug 646381 - Faulty password for nsmultiplexorcredentials does not give any error message in logs
Bug 624547 - attrcrypt should query the given slot/token for
Bug 668619 - slapd stops responding
Bug 151705 - Need to update Console Cipher Preferences with new ciphers
Bug 615052 - intrinsics and 64-bit atomics code fails to compile
Bug 616213 - insufficient stack size for HP-UX on PA-RISC
Bug 675265 - preventryusn gets added to entries on a failed delete
Bug 604881 - admin server log files have incorrect permissions/ownerships
Bug 676053 - export task followed by import task causes cache assertion
Bug 676053 - export task followed by import task causes cache assertion
Bug 676053 - export task followed by import task causes cache assertion
Bug 450016 - RFE- Console display values in KB/MB/GB
Cancelling commit 886d2473639f8162c2737cad50fe8029f7b49b19
Rich Megginson (146):
Net::LDAP password modify extop breaks; msgid in response is 0xFF
Clean up assert for entrydn
Bug 543080 - Bitwise plugin fails to return the exact matched entries for Bitwise search filter
Bug 537466 - nsslapd-distribution-plugin should not require plugin name to begin with "lib"
bump version to 1.2.6.a2
Do not use syntax plugins directly for filters, indexing
wrap new style matching rule plugins for use in old style indexing code
change extensible filter code to use new syntax function style mr funcs
change syntax plugins to register required matching rule plugins
crash looking up compat syntax; numeric string syntax using integer; make octet string ordering work correctly
fix memory leak in attr replace when replacement fails
fix dso linking issues found by fedora 13 linking
problems linking with -z defs
389 DS segfaults on libsyntax-plugin.so - part 1
389 DS segfaults on libsyntax-plugin.so - part 2
389 DS segfaults on libsyntax-plugin.so - part 3
Bug 460162 - FedoraDS "with-FHS" installs init.d StartupScript in wrong location on non-RHEL/Fedora OS
Bug 568196 - Install DS8.2 on Solaris fails
Bug 568196 - Install DS8.2 on Solaris fails - part 2
Bug 551198 - LDAPI: incorrect logging to access log
bump version to 1.2.6.a3
fix various memory leaks
Bug 551198 - LDAPI: incorrect logging to access log - part 2
Bug 554573 - ACIs use bind DN from bind req rather than cert mapped DN from sasl/external
cleanup build warnings
Bug 571514 - upgrade to 1.2.6 should upgrade 05rfc4523.ldif (cert schema)
Bug 570905 - postalAddress syntax should allow empty lines (should allow $$)
Add support for additional schema/matching rules included with 389
Bug 572677 - Memory leak in searches including GER control
Bug 571677 - Busy replica on consumers when directly deleting a replication conflict
Bug 576074 - search filters with parentheses fail
Bug 567429 - slapd didn't close connection and get into CLOSE_WAIT state
Bug 578167 - repl. of mod/replace deletes multi-valued attrs
Bug 561575 - setup-ds-admin fails to supply nsds5ReplicaName when configuring via ConfigFile
Bug 572162 - the string "|*" within a search filter on a non-indexed attribute returns all elements.
Bug 576644 - segfault while multimaster replication (paired node won't find deleted entries)
start of 1.2.6.a4
Bug 572018 - Upgrading from 1.2.5 to 1.2.6.a2 deletes userRoot
Fix too few args for format warning in acllas
Bug 586571 - DS Console shows escaped DNs
Bug 591685 - Server instances Fail to Start on Solaris due to Library Path and pcre
bump console version to 1.2.3
Repl Session API needs to check for NULL api before init
Bug 593392 - setup-ds-admin.pl -k creates world readable file
Bug 595874 - 99user.ldif getting overpopulated
bump version to 1.2.6.a5
bump version to 1.2.6.rc1
bump version to 1.2.6.rc2
bump version to 1.2.6.rc3
Bug 604453 - SASL Stress and Server crash: Program quits with the assertion failure in PR_Poll
Bug 604453 - SASL Stress and Server crash: Program quits with the assertion failure in PR_Poll
Bug 603942 - null deref in _ger_parse_control() for subjectdn
bump version to 1.2.6.rc4
Bug 609590 - fix coverity Defect Type: Memory - corruptions issues
Bug 609590 - fix coverity Defect Type: Memory - corruptions issues
Bug 609590 - fix coverity Defect Type: Memory - corruptions issues
Bug 609590 - fix coverity Defect Type: Memory - corruptions issues
Bug 609590 - fix coverity Defect Type: Memory - corruptions issues
Bug 609590 - fix coverity Defect Type: Memory - corruptions issues
Bug 609590 - fix coverity Defect Type: Memory - corruptions issues
Bug 609590 - fix coverity Defect Type: Memory - corruptions issues
Bug 609590 - fix coverity Defect Type: Memory - corruptions issues
Bug 602530 - coverity: op_shared_modify: compare pre, post and original entries before freeing them
Bug 602531 - coverity: op_shared_delete: compare preop entry and GLUE_PARENT_ENTRY before freeing them
Bug 609590 - fix coverity Defect Type: Memory - corruptions issues
Bug 610177 - fix coverity Defect Type: Uninitialized variables issues
Bug 610276 - fix coverity Defect Type: API usage errors issues
Bug 611850 - fix coverity Defect Type: Error handling issues
Bug 614242 - C99/ANSI C++ related compile errors on HP-UX
Bug 547503 - replication broken again, with 389 MMR replication and TCP errors
Bug 617013 - repl-monitor.pl use cpu upto 90%
fix build failures due to libtool problems
Bug 617629 - Missing aliases in new schema files
Bug 617862 - Replication: Unable to delete tombstone errors
bump version to 1.2.7.a1
Bug 610281 - fix coverity Defect Type: Control flow issues - daemon.c:write_function()
Bug 610281 - fix coverity Defect Type: Control flow issues - last repl init status
postalAddress syntax does not accept empty values
ger should support both "dn" and "distinguishedName"
openldap - ldap_url_parse_ext is not part of the public api
fix memleak in ldbm_config_read_instance_entries
Add -x option to ldap tools when using openldap
openldap - add support for missing controls, add ldif api, fix NSS usage
port client tools to use openldap API
use the mozldap versions of the proxy auth control create function
document slapi wrappers for openldap/mozldap functions that differ
fix some compiler warnings
use strcasecmp with ptype and type->bv_val
ber_printf 'o' cannot handle NULL bv_val
fix the url_parse logic when looking for a missing suffix DN
openldap ldapsearch uses -LLL to suppress # version: N
add ldaptool_opts for the non BUNDLE case in Makefile.am
openldap ldapsearch returns empty line at end of LDIF output
have to use LDAP_OPT_X_TLS_NEVER to defeat cert hostname checking
openldap_read_function needs to set EWOULDBLOCK if the buffer is empty
do not terminate unwrapped LDIF line with another newline
slapi_ldap_url_parse must handle multiple host:port in url
convert mozldap host list to openldap uri list
move the out pointer back if continuation lines were removed
check src < *out only; only check for \nspace if src < *out - 2
use slapi_ldap_url_parse in the acl code
do not un-null-terminate normalized DN until new url is constructed
implement slapi_ldap_explode_dn and slapi_ldap_explode_rdn
use slapi_pblock_set to set the ldap result code for the be postop plugins
pass the string copy to slapi_dn_normalize_original
bug 614511 - fix coverity null reference - revert macro aci $dn logic
fix compiler warnings - unused vars/funcs, invalid casts
use slapi_mods_init_passin/get_ldapmods_passout if modifying the smods
Have to explicitly set protocol version to 3
Only check modrdn ops for backend/suffix correctness if not the default backend
Bug 634561 - Server crushes when using Windows Sync Agreement
openldap ber_init will assert if the bv->bv_val is NULL
add the account policy plugin and related server code, schema, and config
fix pblock memory leak
do not register pre/post op plugins if disabled
add support for global inactivity limit
fix typos in Makefile.am, acctpolicy schema
bump version to 1.2.7.a2
remove extra format argument; use %lu for size_t printf format
Bug 644013 - uniqueness plugin segfault bug
bump version to 1.2.7.a3
bump to 1.2.7.a4
bump version to 1.2.7.a5
put replication config entries in separate file
bump version to 1.2.7.a6
bump version to 1.2.7.1
bump version to 1.2.7.2
bump version to 1.2.7.3
bump version to 1.2.7.4
Bug 515329 - Multiple mods in one operation can result in an inconsistent replica
bump version to 1.2.8.a1
Bug 642046 - Segfault when using SASL/GSSAPI multimaster replication, possible krb5_creds doublefree
Bug 624485 - setup dsktune check step should default to "yes" if no problems found
Bug 622907 - support piped passwords to perl-based maintenance commands
Bug 624485 - setup dsktune check step should default to "yes" if no problems found
Bug 576534 - Password displayed on console when entered in command-line utilities
Bug 667935 - DS pipe log script's logregex.py plugin is not redirecting the log output to the text file
bump version to 1.2.8.a2
Bug 668385 - DS pipe log script is executed as many times as the dirsrv service is restarted
Bug 676689 - crash while adding a new user to be synced to windows
Bug 675113 - ns-slapd core dump in windows_tot_run if oneway sync is used
Bug 677440 - clean up compiler warnings in 389-ds-base 1.2.8
Bug 677774 - DS fails to start after reboot
Bug 666076 - dirsrv crash (1.2.7.5) with multiple simple paged result searches
Bug 675320 - empty modify operation with repl on or lastmod off will crash server
bump version to 1.2.8.a3 - console version is 1.2.4
root (1):
Bug 480787 - Autoconf parameter --with and --without
---
.gitignore | 1
Makefile.am | 156
Makefile.in | 5002 +
VERSION.sh | 7
aclocal.m4 | 6884 --
compile | 21
config.guess | 302
config.h.in | 9
config.sub | 232
configure |30167 +++++-------
configure.ac | 94
depcomp | 172
dirsrv.pc.in | 7
include/base/dbtbase.h | 2
include/base/lexer.h | 126
include/i18n.h | 115
include/ldaputil/ldaputil.h | 10
include/libaccess/aclerror.h | 1
include/libaccess/aclproto.h | 15
include/libaccess/aclstruct.h | 2
include/libaccess/dbtlibaccess.h | 3
include/public/nsacl/aclapi.h | 7
install-sh | 517
ldap/admin/src/scripts/10cleanupldapi.pl | 23
ldap/admin/src/scripts/10fixrundir.pl | 11
ldap/admin/src/scripts/50smd5pwdstorageplugin.ldif | 5
ldap/admin/src/scripts/60upgradeschemafiles.pl | 2
ldap/admin/src/scripts/80upgradednformat.pl | 206
ldap/admin/src/scripts/81changelog.pl | 29
ldap/admin/src/scripts/90subtreerename.pl | 6
ldap/admin/src/scripts/DSCreate.pm.in | 225
ldap/admin/src/scripts/DSDialogs.pm | 4
ldap/admin/src/scripts/DSMigration.pm.in | 40
ldap/admin/src/scripts/DSUpdate.pm.in | 14
ldap/admin/src/scripts/DSUtil.pm.in | 106
ldap/admin/src/scripts/DialogManager.pm | 241
ldap/admin/src/scripts/DialogManager.pm.in | 241
ldap/admin/src/scripts/Inf.pm | 53
ldap/admin/src/scripts/Migration.pm.in | 19
ldap/admin/src/scripts/Setup.pm.in | 19
ldap/admin/src/scripts/SetupDialogs.pm.in | 3
ldap/admin/src/scripts/ds-logpipe.py | 139
ldap/admin/src/scripts/exampleupdate.ldif | 2
ldap/admin/src/scripts/exampleupdate.sh | 10
ldap/admin/src/scripts/logregex.py | 16
ldap/admin/src/scripts/migrate-ds.pl.in | 13
ldap/admin/src/scripts/remove-ds.pl.in | 28
ldap/admin/src/scripts/repl-monitor.pl.in | 3
ldap/admin/src/scripts/restart-dirsrv.in | 25
ldap/admin/src/scripts/setup-ds.pl.in | 7
ldap/admin/src/scripts/setup-ds.res.in | 11
ldap/admin/src/scripts/start-dirsrv.in | 43
ldap/admin/src/scripts/stop-dirsrv.in | 27
ldap/admin/src/scripts/template-bak2db.in | 49
ldap/admin/src/scripts/template-bak2db.pl.in | 29
ldap/admin/src/scripts/template-db2bak.in | 53
ldap/admin/src/scripts/template-db2bak.pl.in | 29
ldap/admin/src/scripts/template-db2index.in | 14
ldap/admin/src/scripts/template-db2index.pl.in | 33
ldap/admin/src/scripts/template-db2ldif.in | 15
ldap/admin/src/scripts/template-db2ldif.pl.in | 29
ldap/admin/src/scripts/template-dbverify.in | 15
ldap/admin/src/scripts/template-dn2rdn.in | 16
ldap/admin/src/scripts/template-fixup-linkedattrs.pl.in | 29
ldap/admin/src/scripts/template-fixup-memberof.pl.in | 29
ldap/admin/src/scripts/template-ldif2db.in | 15
ldap/admin/src/scripts/template-ldif2db.pl.in | 29
ldap/admin/src/scripts/template-ldif2ldap.in | 19
ldap/admin/src/scripts/template-monitor.in | 19
ldap/admin/src/scripts/template-ns-accountstatus.pl.in | 33
ldap/admin/src/scripts/template-ns-activate.pl.in | 33
ldap/admin/src/scripts/template-ns-inactivate.pl.in | 33
ldap/admin/src/scripts/template-ns-newpwpolicy.pl.in | 27
ldap/admin/src/scripts/template-restart-slapd.in | 2
ldap/admin/src/scripts/template-restoreconfig.in | 15
ldap/admin/src/scripts/template-saveconfig.in | 15
ldap/admin/src/scripts/template-schema-reload.pl.in | 29
ldap/admin/src/scripts/template-start-slapd.in | 3
ldap/admin/src/scripts/template-stop-slapd.in | 2
ldap/admin/src/scripts/template-suffix2instance.in | 15
ldap/admin/src/scripts/template-syntax-validate.pl.in | 29
ldap/admin/src/scripts/template-upgradedb.in | 15
ldap/admin/src/scripts/template-upgradednformat.in | 63
ldap/admin/src/scripts/template-usn-tombstone-cleanup.pl.in | 29
ldap/admin/src/scripts/template-verify-db.pl.in | 19
ldap/admin/src/scripts/template-vlvindex.in | 15
ldap/admin/src/slapd.inf.in | 2
ldap/include/ldaplog.h | 32
ldap/ldif/50replication-plugins.ldif | 26
ldap/ldif/template-baseacis.ldif.in | 2
ldap/ldif/template-bitwise.ldif.in | 6
ldap/ldif/template-dse.ldif.in | 57
ldap/ldif/template-suffix-db.ldif.in | 1
ldap/schema/00core.ldif | 72
ldap/schema/01core389.ldif | 3
ldap/schema/02common.ldif | 8
ldap/schema/05rfc4523.ldif | 14
ldap/schema/05rfc4524.ldif | 30
ldap/schema/06inetorgperson.ldif | 5
ldap/schema/10mep-plugin.ldif | 104
ldap/schema/30ns-common.ldif | 4
ldap/schema/50ns-directory.ldif | 2
ldap/schema/60acctpolicy.ldif | 47
ldap/schema/60qmail.ldif | 4
ldap/servers/plugins/acctpolicy/acct_config.c | 143
ldap/servers/plugins/acctpolicy/acct_init.c | 191
ldap/servers/plugins/acctpolicy/acct_plugin.c | 314
ldap/servers/plugins/acctpolicy/acct_util.c | 257
ldap/servers/plugins/acctpolicy/acctpolicy.h | 81
ldap/servers/plugins/acctpolicy/sampleconfig.ldif | 40
ldap/servers/plugins/acctpolicy/samplepolicy.ldif | 27
ldap/servers/plugins/acl/acl.c | 105
ldap/servers/plugins/acl/acl.h | 15
ldap/servers/plugins/acl/acl_ext.c | 29
ldap/servers/plugins/acl/aclanom.c | 1
ldap/servers/plugins/acl/acleffectiverights.c | 111
ldap/servers/plugins/acl/aclgroup.c | 9
ldap/servers/plugins/acl/acllas.c | 379
ldap/servers/plugins/acl/acllist.c | 14
ldap/servers/plugins/acl/aclparse.c | 606
ldap/servers/plugins/acl/aclplugin.c | 27
ldap/servers/plugins/acl/aclproxy.c | 232
ldap/servers/plugins/acl/aclutil.c | 103
ldap/servers/plugins/bitwise/bitwise.c | 20
ldap/servers/plugins/chainingdb/cb.h | 2
ldap/servers/plugins/chainingdb/cb_add.c | 76
ldap/servers/plugins/chainingdb/cb_bind.c | 65
ldap/servers/plugins/chainingdb/cb_compare.c | 55
ldap/servers/plugins/chainingdb/cb_config.c | 13
ldap/servers/plugins/chainingdb/cb_conn_stateless.c | 72
ldap/servers/plugins/chainingdb/cb_controls.c | 12
ldap/servers/plugins/chainingdb/cb_delete.c | 80
ldap/servers/plugins/chainingdb/cb_init.c | 4
ldap/servers/plugins/chainingdb/cb_instance.c | 68
ldap/servers/plugins/chainingdb/cb_modify.c | 74
ldap/servers/plugins/chainingdb/cb_modrdn.c | 82
ldap/servers/plugins/chainingdb/cb_search.c | 99
ldap/servers/plugins/chainingdb/cb_utils.c | 3
ldap/servers/plugins/collation/collate.c | 22
ldap/servers/plugins/cos/cos_cache.c | 258
ldap/servers/plugins/deref/deref.c | 8
ldap/servers/plugins/dna/dna.c | 608
ldap/servers/plugins/http/http_impl.c | 81
ldap/servers/plugins/linkedattrs/fixup_task.c | 4
ldap/servers/plugins/linkedattrs/linked_attrs.c | 17
ldap/servers/plugins/memberof/memberof.c | 449
ldap/servers/plugins/memberof/memberof.h | 6
ldap/servers/plugins/memberof/memberof_config.c | 231
ldap/servers/plugins/mep/mep.c | 2426
ldap/servers/plugins/mep/mep.h | 129
ldap/servers/plugins/pam_passthru/pam_ptimpl.c | 17
ldap/servers/plugins/passthru/ptconfig.c | 43
ldap/servers/plugins/pwdstorage/smd5_pwd.c | 9
ldap/servers/plugins/referint/referint.c | 700
ldap/servers/plugins/replication/cl5.h | 1
ldap/servers/plugins/replication/cl5_api.c | 2083
ldap/servers/plugins/replication/cl5_api.h | 92
ldap/servers/plugins/replication/cl5_clcache.c | 33
ldap/servers/plugins/replication/cl5_clcache.h | 2
ldap/servers/plugins/replication/cl5_config.c | 190
ldap/servers/plugins/replication/cl5_init.c | 2
ldap/servers/plugins/replication/cl_crypt.c | 203
ldap/servers/plugins/replication/cl_crypt.h | 53
ldap/servers/plugins/replication/legacy_consumer.c | 1
ldap/servers/plugins/replication/repl-session-plugin.h | 119
ldap/servers/plugins/replication/repl5.h | 45
ldap/servers/plugins/replication/repl5_agmt.c | 96
ldap/servers/plugins/replication/repl5_agmtlist.c | 11
ldap/servers/plugins/replication/repl5_connection.c | 119
ldap/servers/plugins/replication/repl5_inc_protocol.c | 27
ldap/servers/plugins/replication/repl5_init.c | 28
ldap/servers/plugins/replication/repl5_plugins.c | 53
ldap/servers/plugins/replication/repl5_prot_private.h | 4
ldap/servers/plugins/replication/repl5_protocol.c | 99
ldap/servers/plugins/replication/repl5_protocol_util.c | 506
ldap/servers/plugins/replication/repl5_replica.c | 205
ldap/servers/plugins/replication/repl5_replica_config.c | 351
ldap/servers/plugins/replication/repl5_ruv.c | 84
ldap/servers/plugins/replication/repl5_ruv.h | 2
ldap/servers/plugins/replication/repl5_tot_protocol.c | 28
ldap/servers/plugins/replication/repl5_total.c | 22
ldap/servers/plugins/replication/repl_compare.c | 1
ldap/servers/plugins/replication/repl_controls.c | 2
ldap/servers/plugins/replication/repl_extop.c | 262
ldap/servers/plugins/replication/repl_globals.c | 1
ldap/servers/plugins/replication/repl_init.c | 1
ldap/servers/plugins/replication/repl_objset.c | 9
ldap/servers/plugins/replication/repl_session_plugin.c | 188
ldap/servers/plugins/replication/repl_shared.h | 17
ldap/servers/plugins/replication/replutil.c | 26
ldap/servers/plugins/replication/test_repl_session_plugin.c | 335
ldap/servers/plugins/replication/urp.c | 1
ldap/servers/plugins/replication/windows_connection.c | 136
ldap/servers/plugins/replication/windows_inc_protocol.c | 52
ldap/servers/plugins/replication/windows_private.c | 112
ldap/servers/plugins/replication/windows_protocol_util.c | 270
ldap/servers/plugins/replication/windows_tot_protocol.c | 117
ldap/servers/plugins/replication/windowsrepl.h | 11
ldap/servers/plugins/replication/winsync-plugin.h | 2
ldap/servers/plugins/retrocl/retrocl.c | 3
ldap/servers/plugins/retrocl/retrocl.h | 2
ldap/servers/plugins/retrocl/retrocl_create.c | 13
ldap/servers/plugins/retrocl/retrocl_po.c | 11
ldap/servers/plugins/retrocl/retrocl_trim.c | 20
ldap/servers/plugins/rever/des.c | 72
ldap/servers/plugins/rever/rever.c | 8
ldap/servers/plugins/roles/roles_cache.c | 64
ldap/servers/plugins/schema_reload/schema_reload.c | 5
ldap/servers/plugins/shared/plugin-utils.h | 112
ldap/servers/plugins/shared/utils.c | 508
ldap/servers/plugins/statechange/statechange.c | 7
ldap/servers/plugins/syntaxes/bin.c | 142
ldap/servers/plugins/syntaxes/bitstring.c | 36
ldap/servers/plugins/syntaxes/ces.c | 140
ldap/servers/plugins/syntaxes/cis.c | 288
ldap/servers/plugins/syntaxes/dn.c | 42
ldap/servers/plugins/syntaxes/int.c | 64
ldap/servers/plugins/syntaxes/nameoptuid.c | 41
ldap/servers/plugins/syntaxes/numericstring.c | 118
ldap/servers/plugins/syntaxes/string.c | 198
ldap/servers/plugins/syntaxes/syntax.h | 59
ldap/servers/plugins/syntaxes/syntax_common.c | 117
ldap/servers/plugins/syntaxes/tel.c | 62
ldap/servers/plugins/syntaxes/validate.c | 17
ldap/servers/plugins/syntaxes/value.c | 116
ldap/servers/plugins/uiduniq/7bit.c | 7
ldap/servers/plugins/uiduniq/plugin-utils.h | 96
ldap/servers/plugins/uiduniq/uid.c | 202
ldap/servers/plugins/uiduniq/utils.c | 249
ldap/servers/plugins/usn/usn.c | 112
ldap/servers/plugins/usn/usn.h | 2
ldap/servers/plugins/usn/usn_cleanup.c | 13
ldap/servers/plugins/views/views.c | 6
ldap/servers/slapd/abandon.c | 7
ldap/servers/slapd/add.c | 118
ldap/servers/slapd/agtmmap.c | 56
ldap/servers/slapd/attr.c | 80
ldap/servers/slapd/attrlist.c | 7
ldap/servers/slapd/attrsyntax.c | 85
ldap/servers/slapd/auth.c | 79
ldap/servers/slapd/back-ldbm/ancestorid.c | 10
ldap/servers/slapd/back-ldbm/archive.c | 91
ldap/servers/slapd/back-ldbm/back-ldbm.h | 42
ldap/servers/slapd/back-ldbm/cache.c | 47
ldap/servers/slapd/back-ldbm/dbhelp.c | 12
ldap/servers/slapd/back-ldbm/dblayer.c | 1541
ldap/servers/slapd/back-ldbm/dblayer.h | 12
ldap/servers/slapd/back-ldbm/dbtest.c | 349
ldap/servers/slapd/back-ldbm/dbversion.c | 47
ldap/servers/slapd/back-ldbm/dn2entry.c | 12
ldap/servers/slapd/back-ldbm/filterindex.c | 98
ldap/servers/slapd/back-ldbm/findentry.c | 72
ldap/servers/slapd/back-ldbm/id2entry.c | 174
ldap/servers/slapd/back-ldbm/idl.c | 17
ldap/servers/slapd/back-ldbm/idl_new.c | 18
ldap/servers/slapd/back-ldbm/import-merge.c | 28
ldap/servers/slapd/back-ldbm/import-threads.c | 1230
ldap/servers/slapd/back-ldbm/import.c | 395
ldap/servers/slapd/back-ldbm/import.h | 20
ldap/servers/slapd/back-ldbm/index.c | 127
ldap/servers/slapd/back-ldbm/init.c | 10
ldap/servers/slapd/back-ldbm/instance.c | 31
ldap/servers/slapd/back-ldbm/ldbm_add.c | 142
ldap/servers/slapd/back-ldbm/ldbm_attr.c | 247
ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c | 985
ldap/servers/slapd/back-ldbm/ldbm_attrcrypt_config.c | 2
ldap/servers/slapd/back-ldbm/ldbm_config.c | 101
ldap/servers/slapd/back-ldbm/ldbm_delete.c | 156
ldap/servers/slapd/back-ldbm/ldbm_entryrdn.c | 523
ldap/servers/slapd/back-ldbm/ldbm_index_config.c | 106
ldap/servers/slapd/back-ldbm/ldbm_instance_config.c | 225
ldap/servers/slapd/back-ldbm/ldbm_modify.c | 100
ldap/servers/slapd/back-ldbm/ldbm_modrdn.c | 170
ldap/servers/slapd/back-ldbm/ldbm_search.c | 135
ldap/servers/slapd/back-ldbm/ldbm_usn.c | 74
ldap/servers/slapd/back-ldbm/ldif2ldbm.c | 608
ldap/servers/slapd/back-ldbm/matchrule.c | 26
ldap/servers/slapd/back-ldbm/misc.c | 287
ldap/servers/slapd/back-ldbm/monitor.c | 14
ldap/servers/slapd/back-ldbm/nextid.c | 17
ldap/servers/slapd/back-ldbm/perfctrs.c | 24
ldap/servers/slapd/back-ldbm/proto-back-ldbm.h | 33
ldap/servers/slapd/back-ldbm/sort.c | 13
ldap/servers/slapd/back-ldbm/start.c | 29
ldap/servers/slapd/back-ldbm/vlv.c | 216
ldap/servers/slapd/back-ldbm/vlv_srch.c | 6
ldap/servers/slapd/back-ldbm/vlv_srch.h | 3
ldap/servers/slapd/back-ldif/back-ldif.h | 2
ldap/servers/slapd/back-ldif/modrdn.c | 12
ldap/servers/slapd/backend.c | 64
ldap/servers/slapd/backend_manager.c | 8
ldap/servers/slapd/bind.c | 274
ldap/servers/slapd/charray.c | 6
ldap/servers/slapd/compare.c | 31
ldap/servers/slapd/configdse.c | 84
ldap/servers/slapd/connection.c | 187
ldap/servers/slapd/control.c | 7
ldap/servers/slapd/csn.c | 5
ldap/servers/slapd/csngen.c | 6
ldap/servers/slapd/daemon.c | 93
ldap/servers/slapd/delete.c | 82
ldap/servers/slapd/dn.c | 1113
ldap/servers/slapd/dse.c | 36
ldap/servers/slapd/dynalib.c | 29
ldap/servers/slapd/entry.c | 557
ldap/servers/slapd/entrywsi.c | 69
ldap/servers/slapd/eventq.c | 4
ldap/servers/slapd/extendop.c | 42
ldap/servers/slapd/factory.c | 1
ldap/servers/slapd/fe.h | 5
ldap/servers/slapd/fedse.c | 19
ldap/servers/slapd/filter.c | 2
ldap/servers/slapd/filter.h | 1
ldap/servers/slapd/filtercmp.c | 25
ldap/servers/slapd/filterentry.c | 27
ldap/servers/slapd/index_subsystem.c | 18
ldap/servers/slapd/intrinsics.h | 7
ldap/servers/slapd/ldaputil.c | 686
ldap/servers/slapd/lenstr.c | 6
ldap/servers/slapd/libglobs.c | 332
ldap/servers/slapd/libslapd.def | 1
ldap/servers/slapd/log.c | 28
ldap/servers/slapd/main.c | 270
ldap/servers/slapd/mapping_tree.c | 258
ldap/servers/slapd/match.c | 57
ldap/servers/slapd/modify.c | 309
ldap/servers/slapd/modrdn.c | 215
ldap/servers/slapd/modutil.c | 30
ldap/servers/slapd/opshared.c | 119
ldap/servers/slapd/pagedresults.c | 118
ldap/servers/slapd/passwd_extop.c | 109
ldap/servers/slapd/pblock.c | 289
ldap/servers/slapd/plugin.c | 197
ldap/servers/slapd/plugin_internal_op.c | 12
ldap/servers/slapd/plugin_mr.c | 472
ldap/servers/slapd/plugin_syntax.c | 352
ldap/servers/slapd/protect_db.c | 24
ldap/servers/slapd/protect_db.h | 7
ldap/servers/slapd/proto-slap.h | 52
ldap/servers/slapd/proxyauth.c | 247
ldap/servers/slapd/psearch.c | 1
ldap/servers/slapd/pw.c | 210
ldap/servers/slapd/pw_mgmt.c | 139
ldap/servers/slapd/rdn.c | 14
ldap/servers/slapd/regex.c | 3
ldap/servers/slapd/result.c | 36
ldap/servers/slapd/rootdse.c | 4
ldap/servers/slapd/sasl_io.c | 167
ldap/servers/slapd/sasl_map.c | 53
ldap/servers/slapd/saslbind.c | 126
ldap/servers/slapd/schema.c | 62
ldap/servers/slapd/search.c | 47
ldap/servers/slapd/security_wrappers.c | 36
ldap/servers/slapd/slap.h | 102
ldap/servers/slapd/slapi-plugin-compat4.h | 6
ldap/servers/slapd/slapi-plugin.h | 492
ldap/servers/slapd/slapi-private.h | 37
ldap/servers/slapd/slapi_counter.c | 6
ldap/servers/slapd/snmp_collator.c | 3
ldap/servers/slapd/ssl.c | 8
ldap/servers/slapd/str2filter.c | 1
ldap/servers/slapd/task.c | 94
ldap/servers/slapd/test-plugins/testpostop.c | 1
ldap/servers/slapd/time.c | 85
ldap/servers/slapd/tools/dbscan.c | 72
ldap/servers/slapd/tools/ldclt/data.c | 50
ldap/servers/slapd/tools/ldclt/ldapfct.c | 150
ldap/servers/slapd/tools/ldclt/ldclt.c | 33
ldap/servers/slapd/tools/ldclt/ldclt.h | 2
ldap/servers/slapd/tools/ldclt/ldcltU.c | 24
ldap/servers/slapd/tools/ldclt/parser.c | 19
ldap/servers/slapd/tools/ldclt/scalab01.c | 49
ldap/servers/slapd/tools/ldif.c | 4
ldap/servers/slapd/tools/mmldif.c | 9
ldap/servers/slapd/tools/pwenc.c | 2
ldap/servers/slapd/tools/rsearch/addthread.c | 25
ldap/servers/slapd/tools/rsearch/searchthread.c | 62
ldap/servers/slapd/utf8compare.c | 2
ldap/servers/slapd/util.c | 162
ldap/servers/slapd/uuid.c | 6
ldap/servers/slapd/value.c | 26
ldap/servers/slapd/valueset.c | 68
ldap/servers/slapd/vattr.c | 69
ldap/servers/snmp/ldap-agent.c | 26
ldap/servers/snmp/main.c | 9
ldap/systools/idsktune.c | 65
lib/base/crit.cpp | 6
lib/base/ereport.cpp | 2
lib/base/lexer.cpp | 1015
lib/base/plist.cpp | 3
lib/base/util.cpp | 13
lib/ldaputil/cert.c | 4
lib/ldaputil/certmap.c | 409
lib/ldaputil/dbconf.c | 1
lib/ldaputil/utest/Makefile | 149
lib/ldaputil/utest/auth.cpp | 611
lib/ldaputil/utest/authtest | 138
lib/ldaputil/utest/certmap.conf | 68
lib/ldaputil/utest/dblist.conf | 47
lib/ldaputil/utest/example.c | 153
lib/ldaputil/utest/plugin.c | 152
lib/ldaputil/utest/plugin.h | 57
lib/ldaputil/utest/stubs.c | 144
lib/ldaputil/utest/stubs.cpp | 139
lib/ldaputil/utest/test.ref | 480
lib/ldaputil/vtable.c | 2
lib/libaccess/acl.tab.cpp | 21
lib/libaccess/aclcache.cpp | 105
lib/libaccess/aclflush.cpp | 1
lib/libaccess/aclpriv.h | 1
lib/libaccess/acltools.cpp | 1724
lib/libaccess/authdb.cpp | 112
lib/libaccess/lasdns.cpp | 7
lib/libaccess/lasip.cpp | 16
lib/libaccess/nseframe.cpp | 1
lib/libaccess/oneeval.cpp | 17
lib/libaccess/permhash.h | 11
lib/libaccess/register.cpp | 50
lib/libaccess/usrcache.cpp | 14
lib/libaccess/utest/.purify | 19
lib/libaccess/utest/Makefile | 147
lib/libaccess/utest/acl.dat | 44
lib/libaccess/utest/aclfile0 | 87
lib/libaccess/utest/aclfile1 | 43
lib/libaccess/utest/aclfile10 | 45
lib/libaccess/utest/aclfile11 | 43
lib/libaccess/utest/aclfile12 | 43
lib/libaccess/utest/aclfile13 | 43
lib/libaccess/utest/aclfile14 | 43
lib/libaccess/utest/aclfile15 | 43
lib/libaccess/utest/aclfile16 | 43
lib/libaccess/utest/aclfile17 | 43
lib/libaccess/utest/aclfile18 | 51
lib/libaccess/utest/aclfile19 | 46
lib/libaccess/utest/aclfile2 | 43
lib/libaccess/utest/aclfile3 | 43
lib/libaccess/utest/aclfile4 | 43
lib/libaccess/utest/aclfile5 | 43
lib/libaccess/utest/aclfile6 | 55
lib/libaccess/utest/aclfile7 | 43
lib/libaccess/utest/aclfile8 | 43
lib/libaccess/utest/aclfile9 | 43
lib/libaccess/utest/aclgrp0 | 42
lib/libaccess/utest/aclgrp1 | 42
lib/libaccess/utest/aclgrp2 | 42
lib/libaccess/utest/aclgrp3 | 42
lib/libaccess/utest/aclgrp4 | 42
lib/libaccess/utest/acltest.cpp | 794
lib/libaccess/utest/onetest.cpp | 77
lib/libaccess/utest/shexp.cpp | 331
lib/libaccess/utest/shexp.h | 168
lib/libaccess/utest/test.ref | 217
lib/libaccess/utest/testmain.cpp | 89
lib/libaccess/utest/twotest.cpp | 87
lib/libaccess/utest/ustubs.cpp | 331
lib/libadmin/error.c | 2
lib/libadmin/template.c | 2
lib/libadmin/util.c | 48
lib/libsi18n/coreres.c | 141
lib/libsi18n/coreres.h | 52
lib/libsi18n/getlang.c | 330
lib/libsi18n/getstrmem.c | 160
lib/libsi18n/getstrmem.h | 1
lib/libsi18n/getstrprop.c | 85
lib/libsi18n/makstrdb.c | 21
lib/libsi18n/propset.c | 442
lib/libsi18n/propset.h | 80
lib/libsi18n/reshash.c | 21
ltmain.sh | 8473 +--
m4/db.m4 | 21
m4/fhs.m4 | 4
m4/icu.m4 | 25
m4/kerberos.m4 | 4
m4/mozldap.m4 | 38
m4/netsnmp.m4 | 15
m4/nspr.m4 | 17
m4/nss.m4 | 17
m4/openldap.m4 | 23
m4/pcre.m4 | 28
m4/sasl.m4 | 25
m4/selinux.m4 | 13
m4/svrcore.m4 | 41
man/man8/restart-dirsrv.8 | 50
man/man8/start-dirsrv.8 | 50
man/man8/stop-dirsrv.8 | 50
missing | 104
selinux/dirsrv.fc.in | 2
selinux/dirsrv.if | 41
selinux/dirsrv.te | 11
wrappers/cl-dump.in | 11
wrappers/dbscan.in | 10
wrappers/infadd.in | 12
wrappers/initscript.in | 243
wrappers/ldap-agent-initscript.in | 20
wrappers/ldap-agent.in | 12
wrappers/ldclt.in | 12
wrappers/ldif.in | 12
wrappers/migratecred.in | 14
wrappers/mmldif.in | 14
wrappers/pwdhash.in | 14
wrappers/repl-monitor.in | 11
wrappers/rsearch.in | 12
502 files changed, 53392 insertions(+), 49300 deletions(-)
---
13 years, 1 month
- 1
- 0
VERSION.sh
by Richard Allen Megginson
VERSION.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6ce1d86fac2600595fcda1fa4a851d0026b108a7
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Tue Feb 22 20:05:41 2011 -0700
bump version to 1.1.15
diff --git a/VERSION.sh b/VERSION.sh
index 33599fe..86093d2 100644
--- a/VERSION.sh
+++ b/VERSION.sh
@@ -11,7 +11,7 @@ vendorurl=http://port389.org
# PACKAGE_VERSION is constructed from these
VERSION_MAJOR=1
VERSION_MINOR=1
-VERSION_MAINT=14
+VERSION_MAINT=15
# if this is a PRERELEASE, set VERSION_PREREL
# otherwise, comment it out
# be sure to include the dot prefix in the prerel
13 years, 1 month
- 1
- 0
build.properties
by Richard Allen Megginson
build.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 57c0b9b8d974d79b699b0bcbc1735f72266f31cd
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Tue Feb 22 14:58:50 2011 -0700
bump version to 1.1.6
diff --git a/build.properties b/build.properties
index 97ff931..2393a6c 100644
--- a/build.properties
+++ b/build.properties
@@ -21,7 +21,7 @@
lang=en
admservconsole.root=..
-admservconsole.version=1.1.5
+admservconsole.version=1.1.6
admservconsole.gen.version=1.1
brand=389
admservconsole.name=${brand}-admin-${admservconsole.version}
13 years, 1 month
- 1
- 0
src/com
by Noriko Hosoi
src/com/netscape/admin/dirserv/dirserv.properties | 18 +
src/com/netscape/admin/dirserv/panel/BlankPanel.java | 48 ++++
src/com/netscape/admin/dirserv/panel/DSEntryLong.java | 18 +
src/com/netscape/admin/dirserv/panel/LDBMInstancePanel.java | 4
src/com/netscape/admin/dirserv/panel/LDBMPluginSettingPanel.java | 109 ++++++----
src/com/netscape/admin/dirserv/panel/LDBMSettingsPanel.java | 61 +++--
6 files changed, 184 insertions(+), 74 deletions(-)
New commits:
commit a88ddd993f1f44f4d383649bdcf30b8b4df76e8d
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Tue Feb 22 15:02:10 2011 -0800
Bug 450016 - RFE- Console display values in KB/MB/GB
https://bugzilla.redhat.com/show_bug.cgi?id=450016
Description: Entry cache size in Database Settings as well as
DB cache size and Import cache size in LDBM Plug-in Settings
allow users to choose display unit from bytes, KB, MB, and GB.
The value in the text area is recalculated based upon the unit.
Note: The size value sent to the server is in bytes regardless
of the unit selection. Also, the selected unit is not stored.
Every time, the Console is started, the default unit "bytes"
is selected and the size is displayed in bytes.
diff --git a/src/com/netscape/admin/dirserv/dirserv.properties b/src/com/netscape/admin/dirserv/dirserv.properties
index 3c045c1..14e9eca 100644
--- a/src/com/netscape/admin/dirserv/dirserv.properties
+++ b/src/com/netscape/admin/dirserv/dirserv.properties
@@ -1467,7 +1467,11 @@ CreateVLVIndex-deleteIndex-title=Delete Browsing Index
#
pldbmsetting-title=LDBM Plug-in Settings
pldbmsetting-maxCacheSize-label=Maximum cache size:
-pldbmsetting-maxCacheSize-unit-label=bytes
+pldbmsetting-maxCacheSizeUnits-default=bytes
+pldbmsetting-maxCacheSizeUnits-1=bytes
+pldbmsetting-maxCacheSizeUnits-2=KB
+pldbmsetting-maxCacheSizeUnits-3=MB
+pldbmsetting-maxCacheSizeUnits-4=GB
pldbmsetting-maxCacheSize-ttip=Memory available for all indexes
pldbmsetting-maxCacheSize-default=1000000
pldbmsetting-maxCacheSize-columns=15
@@ -1486,7 +1490,11 @@ pldbmsetting-RootDatabaseLoc-ttip= Full path to the database location on the ser
pldbmsetting-RootDatabaseLoc-columns=15
pldbmsetting-importCacheSize-label=Import cache size:
pldbmsetting-importCacheSize-ttip= Size of cache used for import
-pldbmsetting-importCacheSize-unit-label=bytes
+pldbmsetting-importCacheSizeUnits-default=bytes
+pldbmsetting-importCacheSizeUnits-1=bytes
+pldbmsetting-importCacheSizeUnits-2=KB
+pldbmsetting-importCacheSizeUnits-3=MB
+pldbmsetting-importCacheSizeUnits-4=GB
pldbmsetting-importCacheSize-columns=15
pldbmsetting-autoCacheSize-label=Use Import Cache Auto-Size
pldbmsetting-autoCacheSize-ttip=If import cache auto-size is used, the server will automatically figure out the optimal amount of memory to use
@@ -1525,7 +1533,11 @@ dbsettings-confirm-delete-msg=Delete suffix(es) %0?
dbsettings-suffix-label=Suffix:
dbsettings-suffix-ttip=Suffix maintained by this database.
dbsettings-cachememsize-label=Memory available for cache
-dbsettings-cachememsize-unit-label=bytes
+dbsettings-cachememsizeunits-default=bytes
+dbsettings-cachememsizeunits-1=bytes
+dbsettings-cachememsizeunits-2=KB
+dbsettings-cachememsizeunits-3=MB
+dbsettings-cachememsizeunits-4=GB
dbsettings-cachememsize-ttip=Maximum memory available to the database for storing cached entries
#
# SNMP setting panel
diff --git a/src/com/netscape/admin/dirserv/panel/BlankPanel.java b/src/com/netscape/admin/dirserv/panel/BlankPanel.java
index dc0a67e..e7f3d72 100644
--- a/src/com/netscape/admin/dirserv/panel/BlankPanel.java
+++ b/src/com/netscape/admin/dirserv/panel/BlankPanel.java
@@ -952,6 +952,54 @@ public class BlankPanel extends JPanel
* Add a label and a textfield to a panel, assumed to be using
* GridBagLayout.
*/
+ protected void addEntryField( JPanel panel, JComponent label,
+ JComponent field, JComponent unit ) {
+ Component endGlue = STRETCH_FIELDS ? null : Box.createGlue();
+ Component lastItem =
+ STRETCH_FIELDS ? ((unit != null) ? unit : field) : endGlue;
+ GridBagConstraints gbc = getGBC();
+ gbc.fill = gbc.NONE;
+ gbc.weightx = 0.0;
+ gbc.gridwidth = 1;
+ gbc.gridx = 0;
+ gbc.anchor = gbc.EAST;
+ int space = UIFactory.getComponentSpace();
+ gbc.insets = new Insets( space, space, 0, space/2 );
+ panel.add( label, gbc );
+
+ gbc.gridx++;
+ gbc.anchor = gbc.WEST;
+ gbc.insets = new Insets( space, 0, 0, 0 );
+ if ( STRETCH_FIELDS ) {
+ gbc.fill = gbc.HORIZONTAL;
+ gbc.weightx = 1.0;
+ }
+ gbc.gridwidth = (lastItem == field) ? gbc.REMAINDER : 1;
+ panel.add( field, gbc );
+
+ if ( unit != null ) {
+ gbc.gridx++;
+ gbc.fill = gbc.NONE;
+ gbc.weightx = 0.0;
+ gbc.insets = new Insets( space, space/2, 0, 0 );
+ gbc.gridwidth = (lastItem == unit) ? gbc.REMAINDER : 1;
+ panel.add( unit, gbc );
+ }
+
+ if ( !STRETCH_FIELDS ) {
+ gbc.gridx++;
+ gbc.anchor = gbc.EAST;
+ gbc.fill = gbc.HORIZONTAL;
+ gbc.weightx = 1.0;
+ gbc.gridwidth = gbc.REMAINDER;
+ panel.add( endGlue, gbc );
+ }
+ }
+
+ /**
+ * Add a label and a textfield to a panel, assumed to be using
+ * GridBagLayout.
+ */
protected void addEntryField( JPanel panel, JComponent label,
JComponent field ) {
addEntryField( panel, label, field, null );
diff --git a/src/com/netscape/admin/dirserv/panel/DSEntryLong.java b/src/com/netscape/admin/dirserv/panel/DSEntryLong.java
index d5fa5a9..048e39f 100644
--- a/src/com/netscape/admin/dirserv/panel/DSEntryLong.java
+++ b/src/com/netscape/admin/dirserv/panel/DSEntryLong.java
@@ -322,6 +322,24 @@ public class DSEntryLong extends DSEntry {
return _maxValue;
}
+ /**
+ * Set the scale factor.
+ *
+ * @param scaleFactor scale factor for this field
+ */
+ public void setScaleFactor( long scaleFactor ) {
+ _scaleFactor = scaleFactor;
+ }
+
+ /**
+ * Report the scale factor.
+ *
+ * @returns Scale factor for this field
+ */
+ public long getScaleFactor() {
+ return _scaleFactor;
+ }
+
protected long _minValue;
protected long _maxValue;
protected long _scaleFactor = 1;
diff --git a/src/com/netscape/admin/dirserv/panel/LDBMInstancePanel.java b/src/com/netscape/admin/dirserv/panel/LDBMInstancePanel.java
index aacb24a..48e5004 100644
--- a/src/com/netscape/admin/dirserv/panel/LDBMInstancePanel.java
+++ b/src/com/netscape/admin/dirserv/panel/LDBMInstancePanel.java
@@ -42,7 +42,7 @@ public class LDBMInstancePanel extends DSTabbedPanel {
addTab( _settingsTab = new LDBMSettingsPanel( model, dbEntry ));
- addTab( _attrEnc = new LDBMAttrEncPanel( model, dbEntry.getDN()));
+ addTab( _attrEnc = new LDBMAttrEncPanel( model, dbEntry.getDN()));
_tabbedPane.setSelectedIndex( 0 );
}
@@ -51,5 +51,5 @@ public class LDBMInstancePanel extends DSTabbedPanel {
private BlankPanel _passwordTab;
private BlankPanel _performanceTab;
private BlankPanel _settingsTab;
- private BlankPanel _attrEnc;
+ private BlankPanel _attrEnc;
}
diff --git a/src/com/netscape/admin/dirserv/panel/LDBMPluginSettingPanel.java b/src/com/netscape/admin/dirserv/panel/LDBMPluginSettingPanel.java
index 08b478b..c9972f8 100644
--- a/src/com/netscape/admin/dirserv/panel/LDBMPluginSettingPanel.java
+++ b/src/com/netscape/admin/dirserv/panel/LDBMPluginSettingPanel.java
@@ -46,17 +46,16 @@ public class LDBMPluginSettingPanel extends BlankPanel {
_refreshWhenSelect = false;
}
- public void init() {
-
- if (_isInitialized) {
- return;
- }
- /* Memory available for all indexes */
+ public void init() {
+
+ if (_isInitialized) {
+ return;
+ }
+ /* DB cache memory available for all entries/indexes */
_tfMaxCacheSize = makeNumericalJTextField( _section, "maxCacheSize" );
_lMaxCacheSize = makeJLabel( _section,"maxCacheSize" );
_lMaxCacheSize.setLabelFor(_tfMaxCacheSize);
- JLabel lMaxCacheSizeUnit = makeJLabel( _section,"maxCacheSize-unit" );
- lMaxCacheSizeUnit.setLabelFor(_tfMaxCacheSize);
+ _cbMaxCacheSizeUnit = makeJComboBox(_section, "maxCacheSizeUnits", null);
/* Max entries the server checks in response to a search */
_tfLookLimit = makeNumericalJTextField( _section, "lookLimit" );
@@ -84,21 +83,19 @@ public class LDBMPluginSettingPanel extends BlankPanel {
_tfImportCacheSize = makeJTextField(_section,"importCacheSize");
_lImportCacheSize = makeJLabel( _section,"importCacheSize" );
_lImportCacheSize.setLabelFor(_tfImportCacheSize);
- JLabel lImportCacheSizeUnit = makeJLabel( _section,"importCacheSize-unit" );
- lImportCacheSizeUnit.setLabelFor(_tfImportCacheSize);
+ _cbImportCacheSizeUnit = makeJComboBox(_section,
+ "importCacheSizeUnits", null);
Debug.println("LDBMPluginSettingPanel.init() _dnEntry :" + _dnEntry);
DSEntrySet entries = getDSEntrySet();
-
- DSEntryLong sizeDSEntry = new DSEntryLong(null,
- _tfMaxCacheSize, _lMaxCacheSize,
- CACHE_SIZE_NUM_MIN_VAL, CACHE_SIZE_NUM_MAX_VAL, 1);
- entries.add(_dnEntry, PLUGINDB_CACHE_SIZE_ATTR_NAM,
- sizeDSEntry);
- setComponentTable(_tfMaxCacheSize, sizeDSEntry);
+ // Pull down menu for the dbcache size unit
+ _cacheSizeDSEntry = new DSEntryLong(null, _tfMaxCacheSize, _lMaxCacheSize,
+ CACHE_SIZE_NUM_MIN_VAL, CACHE_SIZE_NUM_MAX_VAL, 1);
+ entries.add(_dnEntry, PLUGINDB_CACHE_SIZE_ATTR_NAM, _cacheSizeDSEntry);
+ setComponentTable(_tfMaxCacheSize, _cacheSizeDSEntry);
DSEntryLong lookDSEntry = new DSEntryLong(null,
_tfLookLimit, _lLookLimit,
@@ -121,24 +118,26 @@ public class LDBMPluginSettingPanel extends BlankPanel {
entries.add(_dnEntry, IMPORT_AUTO_CACHE_SIZE_ATTR_NAME, autoDSEntry);
setComponentTable(_cbAutoCacheSize, autoDSEntry);
- DSEntryLong importsizeDSEntry = new DSEntryLong(null,
- _tfImportCacheSize, _lImportCacheSize,
- CACHE_SIZE_NUM_MIN_VAL, CACHE_SIZE_NUM_MAX_VAL, 1);
- entries.add(_dnEntry, DB_IMPORT__CACHE_SIZE_ATTR_NAM,
- importsizeDSEntry);
- setComponentTable(_tfImportCacheSize, importsizeDSEntry);
-
+ // Pull down menu for the import cache size unit
+ _importCacheSizeDSEntry = new DSEntryLong(null,
+ _tfImportCacheSize, _lImportCacheSize,
+ CACHE_SIZE_NUM_MIN_VAL,
+ CACHE_SIZE_NUM_MAX_VAL, 1);
+ entries.add(_dnEntry, DB_IMPORT_CACHE_SIZE_ATTR_NAM,
+ _importCacheSizeDSEntry);
+ setComponentTable(_tfImportCacheSize, _importCacheSizeDSEntry);
JPanel panel = _myPanel;
panel.setLayout( new GridBagLayout() );
- addEntryField( panel, _lMaxCacheSize, _tfMaxCacheSize, lMaxCacheSizeUnit );
+ addEntryField( panel, _lMaxCacheSize, _tfMaxCacheSize,
+ _cbMaxCacheSizeUnit );
addEntryField( panel, _lLookLimit, _tfLookLimit, lLookLimitUnit );
addEntryField( panel, _lModeFile, _tfModeFile, lModeFileUnit );
addEntryField( panel, new JLabel(""), _cbAutoCacheSize, new JLabel("") );
addEntryField( panel, _lImportCacheSize, _tfImportCacheSize,
- lImportCacheSizeUnit);
- addBottomGlue();
+ _cbImportCacheSizeUnit );
+ addBottomGlue();
_isInitialized = true;
}
@@ -147,6 +146,29 @@ public class LDBMPluginSettingPanel extends BlankPanel {
_tfImportCacheSize.setEnabled(enabled);
_lImportCacheSize.setEnabled(enabled);
}
+
+ private void setCacheSizeUnit(JComboBox unit, DSEntryLong dsentry) {
+ String selectedUnit = (String)unit.getSelectedItem();
+ Debug.println("actionPerformed: selected MaxCacheSizeUnit: " +
+ selectedUnit);
+ if (selectedUnit.equalsIgnoreCase("bytes")) {
+ dsentry.setScaleFactor(1);
+ dsentry.show();
+ } else if (selectedUnit.equalsIgnoreCase("KB")) {
+ dsentry.setScaleFactor(1024);
+ dsentry.show();
+ } else if (selectedUnit.equalsIgnoreCase("MB")) {
+ dsentry.setScaleFactor(1024*1024);
+ dsentry.show();
+ } else if (selectedUnit.equalsIgnoreCase("GB")) {
+ dsentry.setScaleFactor(1024*1024*1024);
+ dsentry.show();
+ } else {
+ Debug.println("actionPerformed: ignore unknown unit: " +
+ selectedUnit);
+ }
+ }
+
/* (non-Javadoc)
* @see com.netscape.admin.dirserv.panel.BlankPanel#refresh()
*/
@@ -163,13 +185,20 @@ public class LDBMPluginSettingPanel extends BlankPanel {
public void actionPerformed(ActionEvent e) {
if (e.getSource().equals(_cbAutoCacheSize)) {
enableCacheSize();
+ } else if (e.getSource().equals(_cbMaxCacheSizeUnit)) {
+ setCacheSizeUnit(_cbMaxCacheSizeUnit, _cacheSizeDSEntry);
+ } else if (e.getSource().equals(_cbImportCacheSizeUnit)) {
+ setCacheSizeUnit(_cbImportCacheSizeUnit, _importCacheSizeDSEntry);
}
super.actionPerformed(e);
}
private JTextField _tfMaxCacheSize;
private JLabel _lMaxCacheSize;
-
+ private JComboBox _cbMaxCacheSizeUnit;
+ private static final String[] UCOMBO_ENTRIES = { "bytes", "KB", "MB", "GB" };
+ private DSEntryLong _cacheSizeDSEntry;
+
private JTextField _tfLookLimit;
private JLabel _lLookLimit;
@@ -183,22 +212,18 @@ public class LDBMPluginSettingPanel extends BlankPanel {
private JTextField _tfImportCacheSize;
private JLabel _lImportCacheSize;
-
- private static final String PLUGINDB_CACHE_SIZE_ATTR_NAM =
- "nsslapd-dbcachesize";
- private static final String LOOK_LIMIT_ATTR_NAM =
- "nsslapd-lookthroughlimit";
- private static final String FILE_MODE_ATTR_NAME =
- "nsslapd-mode";
- private static final String DB_FILE_LOC_ATTR_NAME =
- "nsslapd-directory";
- private static final String DB_IMPORT__CACHE_SIZE_ATTR_NAM =
- "nsslapd-import-cachesize";
- private static final String IMPORT_AUTO_CACHE_SIZE_ATTR_NAME =
- "nsslapd-import-cache-autosize";
+ private JComboBox _cbImportCacheSizeUnit;
+ private DSEntryLong _importCacheSizeDSEntry;
+
+ private static final String PLUGINDB_CACHE_SIZE_ATTR_NAM = "nsslapd-dbcachesize";
+ private static final String LOOK_LIMIT_ATTR_NAM = "nsslapd-lookthroughlimit";
+ private static final String FILE_MODE_ATTR_NAME = "nsslapd-mode";
+ private static final String DB_FILE_LOC_ATTR_NAME = "nsslapd-directory";
+ private static final String DB_IMPORT_CACHE_SIZE_ATTR_NAM = "nsslapd-import-cachesize";
+ private static final String IMPORT_AUTO_CACHE_SIZE_ATTR_NAME = "nsslapd-import-cache-autosize";
private static final long LIMIT_MIN_VAL = -1;
private static final long LIMIT_MAX_VAL = Long.MAX_VALUE;
- private static final long CACHE_SIZE_NUM_MIN_VAL = 500000;
+ private static final long CACHE_SIZE_NUM_MIN_VAL = 1; // e.g., 1MB
private static final long CACHE_SIZE_NUM_MAX_VAL = LIMIT_MAX_VAL;
private static final int MODE_MIN_VAL = 0;
private static final int MODE_MAX_VAL = 777;
diff --git a/src/com/netscape/admin/dirserv/panel/LDBMSettingsPanel.java b/src/com/netscape/admin/dirserv/panel/LDBMSettingsPanel.java
index f52fc63..010f0bf 100644
--- a/src/com/netscape/admin/dirserv/panel/LDBMSettingsPanel.java
+++ b/src/com/netscape/admin/dirserv/panel/LDBMSettingsPanel.java
@@ -20,7 +20,7 @@
package com.netscape.admin.dirserv.panel;
import java.awt.*;
-//import java.awt.event.*;
+import java.awt.event.*;
import java.util.*;
import java.io.File;
import javax.swing.*;
@@ -152,22 +152,21 @@ public class LDBMSettingsPanel extends BlankPanel implements SuiConstants{
DSEntryBoolean roDSEntry = new DSEntryBoolean("off", _cbIsReadOnly);
- entries.add(_dnEntry, READ_ONLY_ATTR_NAM,
- roDSEntry);
+ entries.add(_dnEntry, READ_ONLY_ATTR_NAM, roDSEntry);
setComponentTable(_cbIsReadOnly, roDSEntry);
-
+
/* Cache info */
+ _cbcachememsizeUnits = makeJComboBox(_section, "cachememsizeunits", null);
_tfcachememsize = makeNumericalJTextField( _section, "cachememsize" );
_lcachememsize = makeJLabel(_section, "cachememsize");
_lcachememsize.setLabelFor(_tfcachememsize);
- JLabel lcachememsizeUnit = makeJLabel(_section, "cachememsize-unit");
- lcachememsizeUnit.setLabelFor(_tfcachememsize);
- DSEntryLong cachememsizeDSEntry = new DSEntryLong(null,
- _tfcachememsize, _lcachememsize,
- CACHEMEM_SIZE_NUM_MIN_VAL, CACHEMEM_SIZE_NUM_MAX_VAL, 1);
- entries.add(_dnEntry, DB_CACHEMEMSIZE_ATTR_NAM, cachememsizeDSEntry);
- setComponentTable(_tfcachememsize, cachememsizeDSEntry);
+ _cachememsizeDSEntry = new DSEntryLong(null,
+ _tfcachememsize, _lcachememsize,
+ CACHEMEM_SIZE_NUM_MIN_VAL,
+ CACHEMEM_SIZE_NUM_MAX_VAL, 1);
+ entries.add(_dnEntry, DB_CACHEMEMSIZE_ATTR_NAM, _cachememsizeDSEntry);
+ setComponentTable(_tfcachememsize, _cachememsizeDSEntry);
/* Now let's build this */
GridBagLayout Mabag = new GridBagLayout();
@@ -222,7 +221,7 @@ public class LDBMSettingsPanel extends BlankPanel implements SuiConstants{
gbc.gridx = 2;
gbc.fill = gbc.NONE;
gbc.anchor = gbc.WEST;
- grid.add( lcachememsizeUnit, gbc);
+ grid.add(_cbcachememsizeUnits, gbc);
gbc.gridy++;
gbc.gridx = 0;
@@ -241,21 +240,28 @@ public class LDBMSettingsPanel extends BlankPanel implements SuiConstants{
*
* @param e event
*/
- /*
public void actionPerformed(ActionEvent e) {
- if (e.getSource().equals(_bLDBMLoc)) {
- String file = DSFileDialog.getDirectoryName(
- _tfLDBMLoc.getText(), false, this );
- if (file != null)
- _tfLDBMLoc.setText(file);
- else
- return; // don't set dirty flag if nothing done
-
- super.actionPerformed(e);
- } else
- super.actionPerformed(e);
+ if (e.getSource().equals(_cbcachememsizeUnits)) {
+ String selectedUnit = (String)_cbcachememsizeUnits.getSelectedItem();
+ Debug.println("actionPerformed: selected cachememsizeUnit: " + selectedUnit);
+ if (selectedUnit.equalsIgnoreCase("bytes")) {
+ _cachememsizeDSEntry.setScaleFactor(1);
+ _cachememsizeDSEntry.show();
+ } else if (selectedUnit.equalsIgnoreCase("KB")) {
+ _cachememsizeDSEntry.setScaleFactor(1024);
+ _cachememsizeDSEntry.show();
+ } else if (selectedUnit.equalsIgnoreCase("MB")) {
+ _cachememsizeDSEntry.setScaleFactor(1024*1024);
+ _cachememsizeDSEntry.show();
+ } else if (selectedUnit.equalsIgnoreCase("GB")) {
+ _cachememsizeDSEntry.setScaleFactor(1024*1024*1024);
+ _cachememsizeDSEntry.show();
+ } else {
+ Debug.println("actionPerformed: ignore unknown unit: " + selectedUnit);
+ }
+ }
+ super.actionPerformed(e);
}
- */
private JCheckBox _cbIsReadOnly;
private JLabel _tfLDBMLoc;
@@ -269,8 +275,10 @@ public class LDBMSettingsPanel extends BlankPanel implements SuiConstants{
private JTextField _tfcachememsize;
private JLabel _lcachememsize;
+ private DSEntryLong _cachememsizeDSEntry;
+ private JComboBox _cbcachememsizeUnits;
- private static final long CACHEMEM_SIZE_NUM_MIN_VAL = 200000;
+ private static final long CACHEMEM_SIZE_NUM_MIN_VAL = 1; // e.g., allow 1GB
private static final long CACHEMEM_SIZE_NUM_MAX_VAL = Long.MAX_VALUE;
private static final String DB_CACHEMEMSIZE_ATTR_NAM = "nsslapd-cachememsize";
@@ -286,6 +294,5 @@ public class LDBMSettingsPanel extends BlankPanel implements SuiConstants{
final static int DEFAULT_PADDING = 6;
final static Insets DEFAULT_EMPTY_INSETS = new Insets(0,0,0,0);
final static Insets BOTTOM_INSETS = new Insets(6,6,6,6);
-
}
13 years, 1 month
- 1
- 0
Branch '389-ds-base-1.2.8' - ldap/servers
by Noriko Hosoi
ldap/servers/slapd/back-ldbm/back-ldbm.h | 3
ldap/servers/slapd/back-ldbm/cache.c | 22 --
ldap/servers/slapd/back-ldbm/instance.c | 1
ldap/servers/slapd/back-ldbm/ldbm_config.c | 162 --------------------
ldap/servers/slapd/back-ldbm/ldbm_config.h | 3
ldap/servers/slapd/back-ldbm/ldbm_instance_config.c | 81 ----------
6 files changed, 18 insertions(+), 254 deletions(-)
New commits:
commit 1ff4d974ca66badc3950ee4ce38389299f97061a
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Tue Feb 22 16:59:54 2011 -0800
Cancelling commit 886d2473639f8162c2737cad50fe8029f7b49b19
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Mon Feb 21 17:46:21 2011 -0800
Bug 450016 - RFE- Console display values in KB/MB/GB
diff --git a/ldap/servers/slapd/back-ldbm/back-ldbm.h b/ldap/servers/slapd/back-ldbm/back-ldbm.h
index b2f0b50..adf593e 100644
--- a/ldap/servers/slapd/back-ldbm/back-ldbm.h
+++ b/ldap/servers/slapd/back-ldbm/back-ldbm.h
@@ -634,8 +634,6 @@ struct ldbminfo {
int li_fat_lock; /* 608146 -- make this configurable, first */
int li_legacy_errcode; /* 615428 -- in case legacy err code is expected */
Slapi_Counter *li_global_usn_counter; /* global USN counter */
- char *dbcache_display_unit; /* display unit for db cache */
- char *importcache_display_unit; /* display unit for db import cache */
};
/* li_flags could store these bits defined in ../slapi-plugin.h
@@ -766,7 +764,6 @@ typedef struct ldbm_instance {
int require_index; /* set to 1 to require an index be used
* in search */
struct cache inst_dncache; /* The dn cache for this instance. */
- char *cache_display_unit; /* display unit for client */
} ldbm_instance;
/*
diff --git a/ldap/servers/slapd/back-ldbm/cache.c b/ldap/servers/slapd/back-ldbm/cache.c
index 5406ace..f21cd87 100644
--- a/ldap/servers/slapd/back-ldbm/cache.c
+++ b/ldap/servers/slapd/back-ldbm/cache.c
@@ -667,14 +667,10 @@ static void entrycache_set_max_size(struct cache *cache, size_t bytes)
struct backentry *eflushtemp = NULL;
if (bytes < MINCACHESIZE) {
- LDAPDebug2Args(LDAP_DEBUG_ANY,
- "WARNING -- Max entry cache size %lu is set; "
- "Minimum entry cache size is %lu -- rounding up\n",
- bytes, MINCACHESIZE);
bytes = MINCACHESIZE;
- } else {
- LDAPDebug1Arg(LDAP_DEBUG_BACKLDBM,
- "Max entry cache size is set to %lu\n", bytes);
+ LDAPDebug(LDAP_DEBUG_ANY,
+ "WARNING -- Minimum cache size is %lu -- rounding up\n",
+ MINCACHESIZE, 0, 0);
}
PR_Lock(cache->c_mutex);
cache->c_maxsize = bytes;
@@ -1501,18 +1497,14 @@ dncache_set_max_size(struct cache *cache, size_t bytes)
}
if (bytes < MINCACHESIZE) {
- LDAPDebug2Args(LDAP_DEBUG_ANY,
- "WARNING -- Max dn cache size %lu is set; "
- "Minimum dn cache size is %lu -- rounding up\n",
- bytes, MINCACHESIZE);
bytes = MINCACHESIZE;
- } else {
- LDAPDebug1Arg(LDAP_DEBUG_BACKLDBM,
- "Max dn cache size is set to %lu\n", bytes);
+ LDAPDebug(LDAP_DEBUG_ANY,
+ "WARNING -- Minimum cache size is %lu -- rounding up\n",
+ MINCACHESIZE, 0, 0);
}
PR_Lock(cache->c_mutex);
cache->c_maxsize = bytes;
- LOG("dn cache size set to %lu\n", bytes, 0, 0);
+ LOG("entry cache size set to %lu\n", bytes, 0, 0);
/* check for full cache, and clear out if necessary */
if (CACHE_FULL(cache)) {
dnflush = dncache_flush(cache);
diff --git a/ldap/servers/slapd/back-ldbm/instance.c b/ldap/servers/slapd/back-ldbm/instance.c
index daeec3b..da66565 100644
--- a/ldap/servers/slapd/back-ldbm/instance.c
+++ b/ldap/servers/slapd/back-ldbm/instance.c
@@ -71,7 +71,6 @@ int ldbm_instance_create(backend *be, char *name)
rc = -1;
goto error;
}
- inst->cache_display_unit = slapi_ch_strdup("bytes");
/*
* initialize the dn cache
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_config.c b/ldap/servers/slapd/back-ldbm/ldbm_config.c
index fff84d5..a1b4062 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_config.c
@@ -326,28 +326,19 @@ done:
return retval;
}
-static void *
-ldbm_config_dbcachesize_get(void *arg)
+static void *ldbm_config_dbcachesize_get(void *arg)
{
struct ldbminfo *li = (struct ldbminfo *) arg;
- if (NULL == li) {
- return (void *)NULL;
- }
-
return (void *) (li->li_new_dbcachesize);
}
-static int
-ldbm_config_dbcachesize_set(void *arg, void *value, char *errorbuf, int phase, int apply)
+static int ldbm_config_dbcachesize_set(void *arg, void *value, char *errorbuf, int phase, int apply)
{
struct ldbminfo *li = (struct ldbminfo *) arg;
+ int retval = LDAP_SUCCESS;
size_t val = (size_t) value;
- if (NULL == li) {
- return LDAP_PARAM_ERROR;
- }
-
if (apply) {
/* Stop the user configuring a stupidly small cache */
/* min: 8KB (page size) * def thrd cnts (threadnumber==20). */
@@ -367,69 +358,7 @@ ldbm_config_dbcachesize_set(void *arg, void *value, char *errorbuf, int phase, i
}
- return LDAP_SUCCESS;
-}
-
-static void *
-ldbm_config_dbcachesizeunit_get(void *arg)
-{
- struct ldbminfo *li = (struct ldbminfo *) arg;
-
- if (NULL == li) {
- return (void *)NULL;
- }
- return (void *)slapi_ch_strdup(li->dbcache_display_unit);
-}
-
-static int
-ldbm_config_dbcachesizeunit_set(void *arg, void *value, char *errorbuf, int phase, int apply)
-{
- struct ldbminfo *li = (struct ldbminfo *) arg;
- char *val = (char *)value;
-
- if (NULL == li) {
- return LDAP_PARAM_ERROR;
- }
-
- if (NULL == val) {
- val = "bytes"; /* default unit */
- } else if ((0 == strcasecmp(val, "bytes")) ||
- (0 == strcasecmp(val, "KB")) ||
- (0 == strcasecmp(val, "MB")) ||
- (0 == strcasecmp(val, "GB"))) {
- ;
- } else {
- if ((0 == strncasecmp(val, "KB", 2)) || /* Kbytes */
- (0 == strncasecmp(val, "kilo", 4))) {
- val = "KB";
- } else if ((0 == strncasecmp(val, "MB", 2)) || /* Mbytes */
- (0 == strncasecmp(val, "mega", 4))) {
- val = "MB";
- } else if ((0 == strncasecmp(val, "GB", 2)) || /* Gbytes */
- (0 == strncasecmp(val, "giga", 4))) {
- val = "GB";
- } else {
- LDAPDebug2Args(LDAP_DEBUG_ANY,
- "WARNING: \"%s: %s\" is not a correct unit. "
- "Replacing it with \"bytes\".\n",
- CONFIG_DBCACHESIZEUNIT, val);
- val = "bytes"; /* default unit */
- }
- }
-
- if (apply) {
- if (li->dbcache_display_unit) {
- if (strcasecmp(li->dbcache_display_unit, val)) {
- /* units do not match; replace it */
- slapi_ch_free_string(&li->dbcache_display_unit);
- li->dbcache_display_unit = slapi_ch_strdup(val);
- }
- } else {
- li->dbcache_display_unit = slapi_ch_strdup(val);
- }
- }
-
- return LDAP_SUCCESS;
+ return retval;
}
static void *ldbm_config_maxpassbeforemerge_get(void *arg)
@@ -1044,89 +973,16 @@ static void *ldbm_config_import_cachesize_get(void *arg)
{
struct ldbminfo *li = (struct ldbminfo *)arg;
- if (NULL == li) {
- return (void *)NULL;
- }
-
- return (void *) (li->li_import_cachesize);
+ return (void *)(li->li_import_cachesize);
}
static int ldbm_config_import_cachesize_set(void *arg, void *value, char *errorbuf,
int phase, int apply)
{
struct ldbminfo *li = (struct ldbminfo *)arg;
- size_t val = (size_t) value;
-
- if (NULL == li) {
- return LDAP_PARAM_ERROR;
- }
-
- if (apply) {
- li->li_import_cachesize = val;
- }
- return LDAP_SUCCESS;
-}
-
-static void *
-ldbm_config_import_cachesizeunit_get(void *arg)
-{
- struct ldbminfo *li = (struct ldbminfo *) arg;
-
- if (NULL == li) {
- return (void *)NULL;
- }
-
- return (void *)slapi_ch_strdup(li->importcache_display_unit);
-}
-
-static int
-ldbm_config_import_cachesizeunit_set(void *arg, void *value, char *errorbuf, int phase, int apply)
-{
- struct ldbminfo *li = (struct ldbminfo *) arg;
- char *val = (char *)value;
-
- if (NULL == li) {
- return LDAP_PARAM_ERROR;
- }
-
- if (NULL == val) {
- val = "bytes"; /* default unit */
- } else if ((0 == strcasecmp(val, "bytes")) ||
- (0 == strcasecmp(val, "KB")) ||
- (0 == strcasecmp(val, "MB")) ||
- (0 == strcasecmp(val, "GB"))) {
- ;
- } else {
- if ((0 == strncasecmp(val, "KB", 2)) || /* Kbytes */
- (0 == strncasecmp(val, "kilo", 4))) {
- val = "KB";
- } else if ((0 == strncasecmp(val, "MB", 2)) || /* Mbytes */
- (0 == strncasecmp(val, "mega", 4))) {
- val = "MB";
- } else if ((0 == strncasecmp(val, "GB", 2)) || /* Gbytes */
- (0 == strncasecmp(val, "giga", 4))) {
- val = "GB";
- } else {
- LDAPDebug2Args(LDAP_DEBUG_ANY,
- "WARNING: \"%s: %s\" is not a correct unit. "
- "Replacing it with \"bytes\".\n",
- CONFIG_IMPORT_CACHESIZEUNIT, val);
- val = "bytes"; /* default unit */
- }
- }
-
- if (apply) {
- if (li->importcache_display_unit) {
- if (strcasecmp(li->importcache_display_unit, val)) {
- /* units do not match; replace it */
- slapi_ch_free_string(&li->importcache_display_unit);
- li->importcache_display_unit = slapi_ch_strdup(val);
- }
- } else {
- li->importcache_display_unit = slapi_ch_strdup(val);
- }
- }
+ if (apply)
+ li->li_import_cachesize = (size_t)value;
return LDAP_SUCCESS;
}
@@ -1377,8 +1233,6 @@ static config_info ldbm_config[] = {
{CONFIG_MODE, CONFIG_TYPE_INT_OCTAL, "0600", &ldbm_config_mode_get, &ldbm_config_mode_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_IDLISTSCANLIMIT, CONFIG_TYPE_INT, "4000", &ldbm_config_allidsthreshold_get, &ldbm_config_allidsthreshold_set, CONFIG_FLAG_ALWAYS_SHOW},
{CONFIG_DIRECTORY, CONFIG_TYPE_STRING, "", &ldbm_config_directory_get, &ldbm_config_directory_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE|CONFIG_FLAG_SKIP_DEFAULT_SETTING},
- /* UNIT must be set before CONFIG_DBCACHESIZE is */
- {CONFIG_DBCACHESIZEUNIT, CONFIG_TYPE_STRING, NULL, &ldbm_config_dbcachesizeunit_get, &ldbm_config_dbcachesizeunit_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_DBCACHESIZE, CONFIG_TYPE_SIZE_T, "10000000", &ldbm_config_dbcachesize_get, &ldbm_config_dbcachesize_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_DBNCACHE, CONFIG_TYPE_INT, "0", &ldbm_config_dbncache_get, &ldbm_config_dbncache_set, CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_MAXPASSBEFOREMERGE, CONFIG_TYPE_INT, "100", &ldbm_config_maxpassbeforemerge_get, &ldbm_config_maxpassbeforemerge_set, 0},
@@ -1410,8 +1264,6 @@ static config_info ldbm_config[] = {
{CONFIG_IMPORT_CACHE_AUTOSIZE, CONFIG_TYPE_INT, "-1", &ldbm_config_import_cache_autosize_get, &ldbm_config_import_cache_autosize_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_CACHE_AUTOSIZE, CONFIG_TYPE_INT, "0", &ldbm_config_cache_autosize_get, &ldbm_config_cache_autosize_set, 0},
{CONFIG_CACHE_AUTOSIZE_SPLIT, CONFIG_TYPE_INT, "50", &ldbm_config_cache_autosize_split_get, &ldbm_config_cache_autosize_split_set, 0},
- /* UNIT must be set before CONFIG_IMPORT_CACHESIZE is */
- {CONFIG_IMPORT_CACHESIZEUNIT, CONFIG_TYPE_STRING, NULL, &ldbm_config_import_cachesizeunit_get, &ldbm_config_import_cachesizeunit_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_IMPORT_CACHESIZE, CONFIG_TYPE_SIZE_T, "20000000", &ldbm_config_import_cachesize_get, &ldbm_config_import_cachesize_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_IDL_SWITCH, CONFIG_TYPE_STRING, "new", &ldbm_config_idl_get_idl_new, &ldbm_config_idl_set_tune, CONFIG_FLAG_ALWAYS_SHOW},
{CONFIG_BYPASS_FILTER_TEST, CONFIG_TYPE_STRING, "on", &ldbm_config_get_bypass_filter_test, &ldbm_config_set_bypass_filter_test, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_config.h b/ldap/servers/slapd/back-ldbm/ldbm_config.h
index e5c6113..5ba52a6 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_config.h
+++ b/ldap/servers/slapd/back-ldbm/ldbm_config.h
@@ -89,14 +89,12 @@ struct config_info {
#define CONFIG_DIRECTORY "nsslapd-directory"
#define CONFIG_MODE "nsslapd-mode"
#define CONFIG_DBCACHESIZE "nsslapd-dbcachesize"
-#define CONFIG_DBCACHESIZEUNIT "nsslapd-dbcachesizeunit"
#define CONFIG_DBNCACHE "nsslapd-dbncache"
#define CONFIG_MAXPASSBEFOREMERGE "nsslapd-maxpassbeforemerge"
#define CONFIG_IMPORT_CACHE_AUTOSIZE "nsslapd-import-cache-autosize"
#define CONFIG_CACHE_AUTOSIZE "nsslapd-cache-autosize"
#define CONFIG_CACHE_AUTOSIZE_SPLIT "nsslapd-cache-autosize-split"
#define CONFIG_IMPORT_CACHESIZE "nsslapd-import-cachesize"
-#define CONFIG_IMPORT_CACHESIZEUNIT "nsslapd-import-cachesizeunit"
#define CONFIG_INDEX_BUFFER_SIZE "nsslapd-index-buffer-size"
#define CONFIG_EXCLUDE_FROM_EXPORT "nsslapd-exclude-from-export"
#define CONFIG_EXCLUDE_FROM_EXPORT_DEFAULT_VALUE \
@@ -148,7 +146,6 @@ struct config_info {
/* instance config options */
#define CONFIG_INSTANCE_CACHESIZE "nsslapd-cachesize"
#define CONFIG_INSTANCE_CACHEMEMSIZE "nsslapd-cachememsize"
-#define CONFIG_INSTANCE_CACHEMEMSIZEUNIT "nsslapd-cachememsizeunit"
#define CONFIG_INSTANCE_DNCACHEMEMSIZE "nsslapd-dncachememsize"
#define CONFIG_INSTANCE_SUFFIX "nsslapd-suffix"
#define CONFIG_INSTANCE_READONLY "nsslapd-readonly"
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c b/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c
index 7d104ce..882f10a 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c
@@ -111,11 +111,7 @@ static void *
ldbm_instance_config_cachememsize_get(void *arg)
{
ldbm_instance *inst = (ldbm_instance *) arg;
-
- if (NULL == inst) {
- return (void *)NULL;
- }
-
+
return (void *) cache_get_max_size(&(inst->inst_cache));
}
@@ -123,83 +119,16 @@ static int
ldbm_instance_config_cachememsize_set(void *arg, void *value, char *errorbuf, int phase, int apply)
{
ldbm_instance *inst = (ldbm_instance *) arg;
+ int retval = LDAP_SUCCESS;
size_t val = (size_t) value;
- if (NULL == inst) {
- return LDAP_PARAM_ERROR;
- }
+ /* Do whatever we can to make sure the data is ok. */
if (apply) {
- LDAPDebug2Args(LDAP_DEBUG_ANY, "Instance %s: "
- "Max entry cache size is set to %lu (bytes)\n",
- inst->inst_name, val);
cache_set_max_size(&(inst->inst_cache), val, CACHE_TYPE_ENTRY);
}
- return LDAP_SUCCESS;
-}
-
-static void *
-ldbm_instance_config_cachememsizeunit_get(void *arg)
-{
- ldbm_instance *inst = (ldbm_instance *) arg;
-
- if (NULL == inst) {
- return (void *)NULL;
- }
- return (void *)slapi_ch_strdup(inst->cache_display_unit);
-}
-
-static int
-ldbm_instance_config_cachememsizeunit_set(void *arg, void *value, char *errorbuf, int phase, int apply)
-{
- ldbm_instance *inst = (ldbm_instance *) arg;
- char *val = (char *)value;
- size_t cachememsize;
-
- if (NULL == inst) {
- return LDAP_PARAM_ERROR;
- }
-
- if (NULL == val) {
- val = "bytes"; /* default unit */
- } else if ((0 == strcasecmp(val, "bytes")) ||
- (0 == strcasecmp(val, "KB")) ||
- (0 == strcasecmp(val, "MB")) ||
- (0 == strcasecmp(val, "GB"))) {
- ;
- } else {
- if ((0 == strncasecmp(val, "KB", 2)) || /* Kbytes */
- (0 == strncasecmp(val, "kilo", 4))) {
- val = "KB";
- } else if ((0 == strncasecmp(val, "MB", 2)) || /* Mbytes */
- (0 == strncasecmp(val, "mega", 4))) {
- val = "MB";
- } else if ((0 == strncasecmp(val, "GB", 2)) || /* Gbytes */
- (0 == strncasecmp(val, "giga", 4))) {
- val = "GB";
- } else {
- LDAPDebug2Args(LDAP_DEBUG_ANY,
- "WARNING: \"%s: %s\" is not a correct unit. "
- "Replacing it with \"bytes\".\n",
- CONFIG_INSTANCE_CACHEMEMSIZEUNIT, val);
- val = "bytes"; /* default unit */
- }
- }
-
- if (apply) {
- if (inst->cache_display_unit) {
- if (strcasecmp(inst->cache_display_unit, val)) {
- /* units do not match; replace it */
- slapi_ch_free_string(&inst->cache_display_unit);
- inst->cache_display_unit = slapi_ch_strdup(val);
- }
- } else {
- inst->cache_display_unit = slapi_ch_strdup(val);
- }
- }
-
- return LDAP_SUCCESS;
+ return retval;
}
static void *
@@ -359,8 +288,6 @@ ldbm_instance_config_require_index_set(void *arg, void *value, char *errorbuf, i
*----------------------------------------------------------------------*/
static config_info ldbm_instance_config[] = {
{CONFIG_INSTANCE_CACHESIZE, CONFIG_TYPE_LONG, "-1", &ldbm_instance_config_cachesize_get, &ldbm_instance_config_cachesize_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
- /* UNIT must be set before CACHEMEMSIZE is */
- {CONFIG_INSTANCE_CACHEMEMSIZEUNIT, CONFIG_TYPE_STRING, NULL, &ldbm_instance_config_cachememsizeunit_get, &ldbm_instance_config_cachememsizeunit_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_INSTANCE_CACHEMEMSIZE, CONFIG_TYPE_SIZE_T, "10485760", &ldbm_instance_config_cachememsize_get, &ldbm_instance_config_cachememsize_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_INSTANCE_READONLY, CONFIG_TYPE_ONOFF, "off", &ldbm_instance_config_readonly_get, &ldbm_instance_config_readonly_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_INSTANCE_REQUIRE_INDEX, CONFIG_TYPE_ONOFF, "off", &ldbm_instance_config_require_index_get, &ldbm_instance_config_require_index_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
13 years, 1 month
- 1
- 0
ldap/servers
by Noriko Hosoi
ldap/servers/slapd/back-ldbm/back-ldbm.h | 3
ldap/servers/slapd/back-ldbm/cache.c | 22 --
ldap/servers/slapd/back-ldbm/instance.c | 1
ldap/servers/slapd/back-ldbm/ldbm_config.c | 162 --------------------
ldap/servers/slapd/back-ldbm/ldbm_config.h | 3
ldap/servers/slapd/back-ldbm/ldbm_instance_config.c | 81 ----------
6 files changed, 18 insertions(+), 254 deletions(-)
New commits:
commit 7a7c52755df065d41dd725f68f57c4326113cfc7
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Tue Feb 22 16:55:51 2011 -0800
Cancelling commit aef19508c4f618285116d2068655183658f564d9
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Mon Feb 21 17:46:21 2011 -0800
Bug 450016 - RFE- Console display values in KB/MB/GB
diff --git a/ldap/servers/slapd/back-ldbm/back-ldbm.h b/ldap/servers/slapd/back-ldbm/back-ldbm.h
index b2f0b50..adf593e 100644
--- a/ldap/servers/slapd/back-ldbm/back-ldbm.h
+++ b/ldap/servers/slapd/back-ldbm/back-ldbm.h
@@ -634,8 +634,6 @@ struct ldbminfo {
int li_fat_lock; /* 608146 -- make this configurable, first */
int li_legacy_errcode; /* 615428 -- in case legacy err code is expected */
Slapi_Counter *li_global_usn_counter; /* global USN counter */
- char *dbcache_display_unit; /* display unit for db cache */
- char *importcache_display_unit; /* display unit for db import cache */
};
/* li_flags could store these bits defined in ../slapi-plugin.h
@@ -766,7 +764,6 @@ typedef struct ldbm_instance {
int require_index; /* set to 1 to require an index be used
* in search */
struct cache inst_dncache; /* The dn cache for this instance. */
- char *cache_display_unit; /* display unit for client */
} ldbm_instance;
/*
diff --git a/ldap/servers/slapd/back-ldbm/cache.c b/ldap/servers/slapd/back-ldbm/cache.c
index 5406ace..f21cd87 100644
--- a/ldap/servers/slapd/back-ldbm/cache.c
+++ b/ldap/servers/slapd/back-ldbm/cache.c
@@ -667,14 +667,10 @@ static void entrycache_set_max_size(struct cache *cache, size_t bytes)
struct backentry *eflushtemp = NULL;
if (bytes < MINCACHESIZE) {
- LDAPDebug2Args(LDAP_DEBUG_ANY,
- "WARNING -- Max entry cache size %lu is set; "
- "Minimum entry cache size is %lu -- rounding up\n",
- bytes, MINCACHESIZE);
bytes = MINCACHESIZE;
- } else {
- LDAPDebug1Arg(LDAP_DEBUG_BACKLDBM,
- "Max entry cache size is set to %lu\n", bytes);
+ LDAPDebug(LDAP_DEBUG_ANY,
+ "WARNING -- Minimum cache size is %lu -- rounding up\n",
+ MINCACHESIZE, 0, 0);
}
PR_Lock(cache->c_mutex);
cache->c_maxsize = bytes;
@@ -1501,18 +1497,14 @@ dncache_set_max_size(struct cache *cache, size_t bytes)
}
if (bytes < MINCACHESIZE) {
- LDAPDebug2Args(LDAP_DEBUG_ANY,
- "WARNING -- Max dn cache size %lu is set; "
- "Minimum dn cache size is %lu -- rounding up\n",
- bytes, MINCACHESIZE);
bytes = MINCACHESIZE;
- } else {
- LDAPDebug1Arg(LDAP_DEBUG_BACKLDBM,
- "Max dn cache size is set to %lu\n", bytes);
+ LDAPDebug(LDAP_DEBUG_ANY,
+ "WARNING -- Minimum cache size is %lu -- rounding up\n",
+ MINCACHESIZE, 0, 0);
}
PR_Lock(cache->c_mutex);
cache->c_maxsize = bytes;
- LOG("dn cache size set to %lu\n", bytes, 0, 0);
+ LOG("entry cache size set to %lu\n", bytes, 0, 0);
/* check for full cache, and clear out if necessary */
if (CACHE_FULL(cache)) {
dnflush = dncache_flush(cache);
diff --git a/ldap/servers/slapd/back-ldbm/instance.c b/ldap/servers/slapd/back-ldbm/instance.c
index daeec3b..da66565 100644
--- a/ldap/servers/slapd/back-ldbm/instance.c
+++ b/ldap/servers/slapd/back-ldbm/instance.c
@@ -71,7 +71,6 @@ int ldbm_instance_create(backend *be, char *name)
rc = -1;
goto error;
}
- inst->cache_display_unit = slapi_ch_strdup("bytes");
/*
* initialize the dn cache
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_config.c b/ldap/servers/slapd/back-ldbm/ldbm_config.c
index fff84d5..a1b4062 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_config.c
@@ -326,28 +326,19 @@ done:
return retval;
}
-static void *
-ldbm_config_dbcachesize_get(void *arg)
+static void *ldbm_config_dbcachesize_get(void *arg)
{
struct ldbminfo *li = (struct ldbminfo *) arg;
- if (NULL == li) {
- return (void *)NULL;
- }
-
return (void *) (li->li_new_dbcachesize);
}
-static int
-ldbm_config_dbcachesize_set(void *arg, void *value, char *errorbuf, int phase, int apply)
+static int ldbm_config_dbcachesize_set(void *arg, void *value, char *errorbuf, int phase, int apply)
{
struct ldbminfo *li = (struct ldbminfo *) arg;
+ int retval = LDAP_SUCCESS;
size_t val = (size_t) value;
- if (NULL == li) {
- return LDAP_PARAM_ERROR;
- }
-
if (apply) {
/* Stop the user configuring a stupidly small cache */
/* min: 8KB (page size) * def thrd cnts (threadnumber==20). */
@@ -367,69 +358,7 @@ ldbm_config_dbcachesize_set(void *arg, void *value, char *errorbuf, int phase, i
}
- return LDAP_SUCCESS;
-}
-
-static void *
-ldbm_config_dbcachesizeunit_get(void *arg)
-{
- struct ldbminfo *li = (struct ldbminfo *) arg;
-
- if (NULL == li) {
- return (void *)NULL;
- }
- return (void *)slapi_ch_strdup(li->dbcache_display_unit);
-}
-
-static int
-ldbm_config_dbcachesizeunit_set(void *arg, void *value, char *errorbuf, int phase, int apply)
-{
- struct ldbminfo *li = (struct ldbminfo *) arg;
- char *val = (char *)value;
-
- if (NULL == li) {
- return LDAP_PARAM_ERROR;
- }
-
- if (NULL == val) {
- val = "bytes"; /* default unit */
- } else if ((0 == strcasecmp(val, "bytes")) ||
- (0 == strcasecmp(val, "KB")) ||
- (0 == strcasecmp(val, "MB")) ||
- (0 == strcasecmp(val, "GB"))) {
- ;
- } else {
- if ((0 == strncasecmp(val, "KB", 2)) || /* Kbytes */
- (0 == strncasecmp(val, "kilo", 4))) {
- val = "KB";
- } else if ((0 == strncasecmp(val, "MB", 2)) || /* Mbytes */
- (0 == strncasecmp(val, "mega", 4))) {
- val = "MB";
- } else if ((0 == strncasecmp(val, "GB", 2)) || /* Gbytes */
- (0 == strncasecmp(val, "giga", 4))) {
- val = "GB";
- } else {
- LDAPDebug2Args(LDAP_DEBUG_ANY,
- "WARNING: \"%s: %s\" is not a correct unit. "
- "Replacing it with \"bytes\".\n",
- CONFIG_DBCACHESIZEUNIT, val);
- val = "bytes"; /* default unit */
- }
- }
-
- if (apply) {
- if (li->dbcache_display_unit) {
- if (strcasecmp(li->dbcache_display_unit, val)) {
- /* units do not match; replace it */
- slapi_ch_free_string(&li->dbcache_display_unit);
- li->dbcache_display_unit = slapi_ch_strdup(val);
- }
- } else {
- li->dbcache_display_unit = slapi_ch_strdup(val);
- }
- }
-
- return LDAP_SUCCESS;
+ return retval;
}
static void *ldbm_config_maxpassbeforemerge_get(void *arg)
@@ -1044,89 +973,16 @@ static void *ldbm_config_import_cachesize_get(void *arg)
{
struct ldbminfo *li = (struct ldbminfo *)arg;
- if (NULL == li) {
- return (void *)NULL;
- }
-
- return (void *) (li->li_import_cachesize);
+ return (void *)(li->li_import_cachesize);
}
static int ldbm_config_import_cachesize_set(void *arg, void *value, char *errorbuf,
int phase, int apply)
{
struct ldbminfo *li = (struct ldbminfo *)arg;
- size_t val = (size_t) value;
-
- if (NULL == li) {
- return LDAP_PARAM_ERROR;
- }
-
- if (apply) {
- li->li_import_cachesize = val;
- }
- return LDAP_SUCCESS;
-}
-
-static void *
-ldbm_config_import_cachesizeunit_get(void *arg)
-{
- struct ldbminfo *li = (struct ldbminfo *) arg;
-
- if (NULL == li) {
- return (void *)NULL;
- }
-
- return (void *)slapi_ch_strdup(li->importcache_display_unit);
-}
-
-static int
-ldbm_config_import_cachesizeunit_set(void *arg, void *value, char *errorbuf, int phase, int apply)
-{
- struct ldbminfo *li = (struct ldbminfo *) arg;
- char *val = (char *)value;
-
- if (NULL == li) {
- return LDAP_PARAM_ERROR;
- }
-
- if (NULL == val) {
- val = "bytes"; /* default unit */
- } else if ((0 == strcasecmp(val, "bytes")) ||
- (0 == strcasecmp(val, "KB")) ||
- (0 == strcasecmp(val, "MB")) ||
- (0 == strcasecmp(val, "GB"))) {
- ;
- } else {
- if ((0 == strncasecmp(val, "KB", 2)) || /* Kbytes */
- (0 == strncasecmp(val, "kilo", 4))) {
- val = "KB";
- } else if ((0 == strncasecmp(val, "MB", 2)) || /* Mbytes */
- (0 == strncasecmp(val, "mega", 4))) {
- val = "MB";
- } else if ((0 == strncasecmp(val, "GB", 2)) || /* Gbytes */
- (0 == strncasecmp(val, "giga", 4))) {
- val = "GB";
- } else {
- LDAPDebug2Args(LDAP_DEBUG_ANY,
- "WARNING: \"%s: %s\" is not a correct unit. "
- "Replacing it with \"bytes\".\n",
- CONFIG_IMPORT_CACHESIZEUNIT, val);
- val = "bytes"; /* default unit */
- }
- }
-
- if (apply) {
- if (li->importcache_display_unit) {
- if (strcasecmp(li->importcache_display_unit, val)) {
- /* units do not match; replace it */
- slapi_ch_free_string(&li->importcache_display_unit);
- li->importcache_display_unit = slapi_ch_strdup(val);
- }
- } else {
- li->importcache_display_unit = slapi_ch_strdup(val);
- }
- }
+ if (apply)
+ li->li_import_cachesize = (size_t)value;
return LDAP_SUCCESS;
}
@@ -1377,8 +1233,6 @@ static config_info ldbm_config[] = {
{CONFIG_MODE, CONFIG_TYPE_INT_OCTAL, "0600", &ldbm_config_mode_get, &ldbm_config_mode_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_IDLISTSCANLIMIT, CONFIG_TYPE_INT, "4000", &ldbm_config_allidsthreshold_get, &ldbm_config_allidsthreshold_set, CONFIG_FLAG_ALWAYS_SHOW},
{CONFIG_DIRECTORY, CONFIG_TYPE_STRING, "", &ldbm_config_directory_get, &ldbm_config_directory_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE|CONFIG_FLAG_SKIP_DEFAULT_SETTING},
- /* UNIT must be set before CONFIG_DBCACHESIZE is */
- {CONFIG_DBCACHESIZEUNIT, CONFIG_TYPE_STRING, NULL, &ldbm_config_dbcachesizeunit_get, &ldbm_config_dbcachesizeunit_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_DBCACHESIZE, CONFIG_TYPE_SIZE_T, "10000000", &ldbm_config_dbcachesize_get, &ldbm_config_dbcachesize_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_DBNCACHE, CONFIG_TYPE_INT, "0", &ldbm_config_dbncache_get, &ldbm_config_dbncache_set, CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_MAXPASSBEFOREMERGE, CONFIG_TYPE_INT, "100", &ldbm_config_maxpassbeforemerge_get, &ldbm_config_maxpassbeforemerge_set, 0},
@@ -1410,8 +1264,6 @@ static config_info ldbm_config[] = {
{CONFIG_IMPORT_CACHE_AUTOSIZE, CONFIG_TYPE_INT, "-1", &ldbm_config_import_cache_autosize_get, &ldbm_config_import_cache_autosize_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_CACHE_AUTOSIZE, CONFIG_TYPE_INT, "0", &ldbm_config_cache_autosize_get, &ldbm_config_cache_autosize_set, 0},
{CONFIG_CACHE_AUTOSIZE_SPLIT, CONFIG_TYPE_INT, "50", &ldbm_config_cache_autosize_split_get, &ldbm_config_cache_autosize_split_set, 0},
- /* UNIT must be set before CONFIG_IMPORT_CACHESIZE is */
- {CONFIG_IMPORT_CACHESIZEUNIT, CONFIG_TYPE_STRING, NULL, &ldbm_config_import_cachesizeunit_get, &ldbm_config_import_cachesizeunit_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_IMPORT_CACHESIZE, CONFIG_TYPE_SIZE_T, "20000000", &ldbm_config_import_cachesize_get, &ldbm_config_import_cachesize_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_IDL_SWITCH, CONFIG_TYPE_STRING, "new", &ldbm_config_idl_get_idl_new, &ldbm_config_idl_set_tune, CONFIG_FLAG_ALWAYS_SHOW},
{CONFIG_BYPASS_FILTER_TEST, CONFIG_TYPE_STRING, "on", &ldbm_config_get_bypass_filter_test, &ldbm_config_set_bypass_filter_test, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_config.h b/ldap/servers/slapd/back-ldbm/ldbm_config.h
index e5c6113..5ba52a6 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_config.h
+++ b/ldap/servers/slapd/back-ldbm/ldbm_config.h
@@ -89,14 +89,12 @@ struct config_info {
#define CONFIG_DIRECTORY "nsslapd-directory"
#define CONFIG_MODE "nsslapd-mode"
#define CONFIG_DBCACHESIZE "nsslapd-dbcachesize"
-#define CONFIG_DBCACHESIZEUNIT "nsslapd-dbcachesizeunit"
#define CONFIG_DBNCACHE "nsslapd-dbncache"
#define CONFIG_MAXPASSBEFOREMERGE "nsslapd-maxpassbeforemerge"
#define CONFIG_IMPORT_CACHE_AUTOSIZE "nsslapd-import-cache-autosize"
#define CONFIG_CACHE_AUTOSIZE "nsslapd-cache-autosize"
#define CONFIG_CACHE_AUTOSIZE_SPLIT "nsslapd-cache-autosize-split"
#define CONFIG_IMPORT_CACHESIZE "nsslapd-import-cachesize"
-#define CONFIG_IMPORT_CACHESIZEUNIT "nsslapd-import-cachesizeunit"
#define CONFIG_INDEX_BUFFER_SIZE "nsslapd-index-buffer-size"
#define CONFIG_EXCLUDE_FROM_EXPORT "nsslapd-exclude-from-export"
#define CONFIG_EXCLUDE_FROM_EXPORT_DEFAULT_VALUE \
@@ -148,7 +146,6 @@ struct config_info {
/* instance config options */
#define CONFIG_INSTANCE_CACHESIZE "nsslapd-cachesize"
#define CONFIG_INSTANCE_CACHEMEMSIZE "nsslapd-cachememsize"
-#define CONFIG_INSTANCE_CACHEMEMSIZEUNIT "nsslapd-cachememsizeunit"
#define CONFIG_INSTANCE_DNCACHEMEMSIZE "nsslapd-dncachememsize"
#define CONFIG_INSTANCE_SUFFIX "nsslapd-suffix"
#define CONFIG_INSTANCE_READONLY "nsslapd-readonly"
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c b/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c
index 7d104ce..882f10a 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_instance_config.c
@@ -111,11 +111,7 @@ static void *
ldbm_instance_config_cachememsize_get(void *arg)
{
ldbm_instance *inst = (ldbm_instance *) arg;
-
- if (NULL == inst) {
- return (void *)NULL;
- }
-
+
return (void *) cache_get_max_size(&(inst->inst_cache));
}
@@ -123,83 +119,16 @@ static int
ldbm_instance_config_cachememsize_set(void *arg, void *value, char *errorbuf, int phase, int apply)
{
ldbm_instance *inst = (ldbm_instance *) arg;
+ int retval = LDAP_SUCCESS;
size_t val = (size_t) value;
- if (NULL == inst) {
- return LDAP_PARAM_ERROR;
- }
+ /* Do whatever we can to make sure the data is ok. */
if (apply) {
- LDAPDebug2Args(LDAP_DEBUG_ANY, "Instance %s: "
- "Max entry cache size is set to %lu (bytes)\n",
- inst->inst_name, val);
cache_set_max_size(&(inst->inst_cache), val, CACHE_TYPE_ENTRY);
}
- return LDAP_SUCCESS;
-}
-
-static void *
-ldbm_instance_config_cachememsizeunit_get(void *arg)
-{
- ldbm_instance *inst = (ldbm_instance *) arg;
-
- if (NULL == inst) {
- return (void *)NULL;
- }
- return (void *)slapi_ch_strdup(inst->cache_display_unit);
-}
-
-static int
-ldbm_instance_config_cachememsizeunit_set(void *arg, void *value, char *errorbuf, int phase, int apply)
-{
- ldbm_instance *inst = (ldbm_instance *) arg;
- char *val = (char *)value;
- size_t cachememsize;
-
- if (NULL == inst) {
- return LDAP_PARAM_ERROR;
- }
-
- if (NULL == val) {
- val = "bytes"; /* default unit */
- } else if ((0 == strcasecmp(val, "bytes")) ||
- (0 == strcasecmp(val, "KB")) ||
- (0 == strcasecmp(val, "MB")) ||
- (0 == strcasecmp(val, "GB"))) {
- ;
- } else {
- if ((0 == strncasecmp(val, "KB", 2)) || /* Kbytes */
- (0 == strncasecmp(val, "kilo", 4))) {
- val = "KB";
- } else if ((0 == strncasecmp(val, "MB", 2)) || /* Mbytes */
- (0 == strncasecmp(val, "mega", 4))) {
- val = "MB";
- } else if ((0 == strncasecmp(val, "GB", 2)) || /* Gbytes */
- (0 == strncasecmp(val, "giga", 4))) {
- val = "GB";
- } else {
- LDAPDebug2Args(LDAP_DEBUG_ANY,
- "WARNING: \"%s: %s\" is not a correct unit. "
- "Replacing it with \"bytes\".\n",
- CONFIG_INSTANCE_CACHEMEMSIZEUNIT, val);
- val = "bytes"; /* default unit */
- }
- }
-
- if (apply) {
- if (inst->cache_display_unit) {
- if (strcasecmp(inst->cache_display_unit, val)) {
- /* units do not match; replace it */
- slapi_ch_free_string(&inst->cache_display_unit);
- inst->cache_display_unit = slapi_ch_strdup(val);
- }
- } else {
- inst->cache_display_unit = slapi_ch_strdup(val);
- }
- }
-
- return LDAP_SUCCESS;
+ return retval;
}
static void *
@@ -359,8 +288,6 @@ ldbm_instance_config_require_index_set(void *arg, void *value, char *errorbuf, i
*----------------------------------------------------------------------*/
static config_info ldbm_instance_config[] = {
{CONFIG_INSTANCE_CACHESIZE, CONFIG_TYPE_LONG, "-1", &ldbm_instance_config_cachesize_get, &ldbm_instance_config_cachesize_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
- /* UNIT must be set before CACHEMEMSIZE is */
- {CONFIG_INSTANCE_CACHEMEMSIZEUNIT, CONFIG_TYPE_STRING, NULL, &ldbm_instance_config_cachememsizeunit_get, &ldbm_instance_config_cachememsizeunit_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_INSTANCE_CACHEMEMSIZE, CONFIG_TYPE_SIZE_T, "10485760", &ldbm_instance_config_cachememsize_get, &ldbm_instance_config_cachememsize_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_INSTANCE_READONLY, CONFIG_TYPE_ONOFF, "off", &ldbm_instance_config_readonly_get, &ldbm_instance_config_readonly_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
{CONFIG_INSTANCE_REQUIRE_INDEX, CONFIG_TYPE_ONOFF, "off", &ldbm_instance_config_require_index_get, &ldbm_instance_config_require_index_set, CONFIG_FLAG_ALWAYS_SHOW|CONFIG_FLAG_ALLOW_RUNNING_CHANGE},
13 years, 1 month
- 1
- 0