Changes to 'refs/tags/389-admin-1.1.32'
by Noriko Hosoi
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
Mark Reynolds (3):
Ticket #286 - compilation fixes for 'format-security'
Ticket 401 - Console login fails with anonymous access disabled
Ticket 400 - BIND operation result not checked properly in admin server
Nathan Kinder (43):
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
Bug 614690 - Don't use exec to call genrb
Bug 699815 - (cov#10859) Add missing braces in mod_admserv code
Bug 699815 - (cov#10858) getenv() called twice in viewlog cgi
Bug 699815 - (cov#10849,10851) Remove unused variables
Bug 699907 - (cov#10844) Uninitialized time struct
Bug 699907 - (cov#10843) Use of uninitialized variable in logging code
Bug 699907 - (cov#10840) Use of uninitialized buffer in security cgi
Bug 699907 - (cov#10836) Use of uninitialized var in http conn code
Bug 699907 - (cov#10833) Use of uninitialized vars in SNMP code
Bug 700532 - (cov#10832) Incorrect if condition in dsalib
Bug 700875 - (cov#10778) Cleanup ds_bring_up_server_install() in dsalib
Bug 700890 - (cov#10812) Check return value of open() properly in libadmin
Bug 700948 - (cov#10846) - Use of uninitialized variable in mod_admserv
Bug 700948 - (cov#10845) Use of uninitialized variable in mod_admserv
Bug 700948 - (cov#10839) Use of uninitialized variable in security cgi
Bug 700948 - (cov#10837) Use of uninitialized variable in monreplication
Bug 700948 - (cov#10835) Use of unitialized pointer in config cgi
Bug 700948 - (cov#10813) dynamic overrun possibility in ds_listdb cgi
Bug 700948 - (cov#10842) Use of unintialized variable in statusping
Bug 700948 - (cov#10842) Use of unintialized variable in statusping
Bug 702150 - (cov#10823) File descriptors leaked in help cgi
Bug 702150 - (cov#10822,10821) file descriptor leaks in config cgi
Bug 702150 - (cov#10820,10819) file descriptor leaks in readlog cgi
Bug 702150 - leak of config array in dsalib
Bug 702150 - (cov#10816) file descriptor leak in dsalib
Bug 702150 - (cov#10817) Leak of string in libdsa
Bug 702150 - Resouce leaks in htmladmin.c
Bug 702705 - (cov#10830) NULL pointer dereference in htmladmin
Bug 702705 - NULL pointer dereferences in viewlog cgi
Bug 702705 - (cov#10803) NULL pointer dereference in security cgi
Bug 702705 - (cov#10785) NULL pointer dereference in ds_snmpctrl
Bug 702705 - (cov#10784,10783) NULL pointer dereferences in dsalib
Bug 719056 - migrate-ds-admin.pl needs to update SELinux policy
Bug 724808 - startup CGIs write temp file to /
Bug 730079 - Update SELinux policy during upgrades
Ticket #329 - Port modules to httpd 2.4
Noriko Hosoi (19):
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
Bug 211296 - Clean up all HTML pages (Admin Express, Repl Monitor, etc)
Bug 158926 - Unable to install CA certificate when using
Bug 476925 - Admin Server: Do not allow 8-bit passwords for the admin user
Bug 476925 - Admin Server: Do not allow 8-bit passwords for
Trac Ticket #307 - htmladmin keeps segfaulting
If htmladmin fails to connect to the server, the cgi could crash.
Ticket #293 - remove-ds-admin.pl does not remove everything
Ticket #476 - 389 ds do not start on F18 due to missing modules
bump version to 1.1.31
Ticket #567 - Restart of Admin server from console fails on segfault
bump version to 1.1.32
Rich Megginson (52):
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
bump version to 1.1.16
Bug 703990 - Support upgrade from Red Hat Directory Server
bump version to 1.1.17
add support for different skins
skip rebranding current brand
bump version to 1.1.18
look for separate openldap ldif library
bump version to 1.1.19
Bug 710372 - Not able to open the Manage Certificate from DS-console
better NSS error handling - reduce memory leaks
fix typo in NSS_Shutdown warning message
added tests for the security cgi
Bug 713000 - Migration stops if old admin server cannot be stopped
Bug 718079 - Perl errors when running migrate-ds-admin.pl
Bug 718285 - AdminServer should use "service" command instead of start/stop/restart scripts
bump version to 1.1.20
bump version to 1.1.21
handle binary upgrade
add man pages for ds_removal and ds_unregister
bump version to 1.1.22
fix binary paths
bump version to 1.1.23
bump version to 1.1.24
Bug 695741 - Providing native systemd file for upcoming F16 Feature Systemd
Bug 740959 - 389-console put CA certificates into wrong database
bump version to 1.1.25
Bug 767823 - selinux: need to allow admin server to connect to ldap port
bump version to 1.1.26
Ticket #161 - Review and address latest Coverity issues
Ticket #281 - TLS not working with latest openldap
bump version to 1.1.27
bump version to 1.1.28
bump version to 1.1.29
bump version to 1.1.30
---
Makefile.am | 109
Makefile.in | 1767 -
VERSION.sh | 4
aclocal.m4 | 7258 ----
admserv/cfgstuff/httpd-2.2.conf.in | 13
admserv/cfgstuff/httpd-2.4.conf.in | 742
admserv/cfgstuff/httpd.conf.in | 2
admserv/cfgstuff/initconfig.in | 5
admserv/cfgstuff/start-ds-admin.in | 83
admserv/cgi-ds/ds_listdb.c | 26
admserv/cgi-ds/ds_snmpctrl.c | 5
admserv/cgi-src40/ReadLog.c | 18
admserv/cgi-src40/admlib.mk | 119
admserv/cgi-src40/admpw.c | 70
admserv/cgi-src40/cgicommon.h | 1
admserv/cgi-src40/cgicommon.properties | 3
admserv/cgi-src40/config.c | 34
admserv/cgi-src40/dllglue.c | 42
admserv/cgi-src40/ds_create.in | 6
admserv/cgi-src40/dsconfig.c | 9
admserv/cgi-src40/head.html | 1
admserv/cgi-src40/help.c | 15
admserv/cgi-src40/htmladmin.c | 809
admserv/cgi-src40/htmladmin.properties | 42
admserv/cgi-src40/monreplication.c | 6
admserv/cgi-src40/repl-monitor-cgi.pl.in | 37
admserv/cgi-src40/restartsrv.c | 8
admserv/cgi-src40/sec-activate.c | 21
admserv/cgi-src40/security.c | 196
admserv/cgi-src40/statpingserv.c | 81
admserv/cgi-src40/stopsrv.c | 9
admserv/cgi-src40/ugdsconfig.c | 38
admserv/cgi-src40/viewdata.c | 156
admserv/cgi-src40/viewdata.properties | 2
admserv/cgi-src40/viewlog.c | 74
admserv/cgi-src40/viewlog.properties | 6
admserv/genrb_wrapper.sh | 2
admserv/html/admserv.html.in | 11
admserv/html/htmladmin.html.in | 13
admserv/html/monreplication.html | 20
admserv/html/viewdata.html | 6
admserv/html/viewlog.html | 14
admserv/makeUpgradeTar.sh | 30
admserv/newinst/src/25changefedorato389.pl | 250
admserv/newinst/src/25rebrand.pl.in | 413
admserv/newinst/src/30updateglobalpref.pl.in | 9
admserv/newinst/src/AdminMigration.pm.in | 79
admserv/newinst/src/AdminServer.pm.in | 168
admserv/newinst/src/AdminUtil.pm.in | 78
admserv/newinst/src/ConfigDSDialogs.pm | 30
admserv/newinst/src/dirserver.map.in | 1
admserv/newinst/src/remove-ds-admin.pl.in | 8
admserv/newinst/src/setup-ds-admin.res.in | 3
admserv/schema/ldif/02globalpreferences.ldif.tmpl | 49
admserv/schema/ldif/10dsdata.ldif.tmpl | 39
compile | 240
config.guess | 529
config.h.in | 33
config.sub | 379
configure |38468 +++++++++-------------
configure.ac | 111
depcomp | 343
include/base/file.h | 3
include/base/util.h | 3
include/libadmin/libadmin.h | 92
include/libdsa/dsalib.h | 15
install-sh | 538
lib/base/file.cpp | 22
lib/base/nscputil.cpp | 46
lib/libadmin/dllglue.c | 77
lib/libadmin/httpcon.c | 2
lib/libadmin/referer.c | 4
lib/libadmin/template.c | 29
lib/libadmin/util.c | 1014
lib/libdsa/dsalib_conf.c | 37
lib/libdsa/dsalib_confs.c | 79
lib/libdsa/dsalib_location.c | 46
lib/libdsa/dsalib_tailf.c | 1
lib/libdsa/dsalib_updown.c | 78
lib/libdsa/dsalib_util.c | 48
ltmain.sh |14878 +++++---
m4/httpd.m4 | 1
m4/mozldap.m4 | 116
m4/openldap.m4 | 138
m4/selinux.m4 | 3
man/man8/ds_removal.8 | 54
man/man8/ds_unregister.8 | 48
man/man8/restart-ds-admin.8 | 10
man/man8/start-ds-admin.8 | 10
man/man8/stop-ds-admin.8 | 10
missing | 234
mod_admserv/mod_admserv.c | 234
mod_admserv/mod_admserv.h | 15
mod_restartd/mod_restartd-2.2.c | 22
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/security/testpost.1 | 1
tests/security/testpost.10 | 1
tests/security/testpost.11 | 1
tests/security/testpost.12 | 1
tests/security/testpost.13 | 1
tests/security/testpost.14 | 1
tests/security/testpost.15 | 1
tests/security/testpost.16 | 1
tests/security/testpost.17 | 1
tests/security/testpost.18 | 1
tests/security/testpost.19 | 1
tests/security/testpost.2 | 1
tests/security/testpost.20 | 1
tests/security/testpost.21 | 1
tests/security/testpost.3 | 1
tests/security/testpost.4 | 1
tests/security/testpost.5 | 1
tests/security/testpost.6 | 1
tests/security/testpost.7 | 1
tests/security/testpost.8 | 1
tests/security/testpost.9 | 1
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
wrappers/systemd.service.in | 24
133 files changed, 33733 insertions(+), 37647 deletions(-)
---
10 years, 10 months
VERSION.sh
by Noriko Hosoi
VERSION.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 63d869f4ea30512d3d512e5ad863dfb78591f221
Author: Noriko Hosoi <nhosoi(a)totoro.usersys.redhat.com>
Date: Thu Jan 31 15:06:44 2013 -0800
bump version to 1.1.32
diff --git a/VERSION.sh b/VERSION.sh
index da8c09e..4f9a114 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=31
+VERSION_MAINT=32
# if this is a PRERELEASE, set VERSION_PREREL
# otherwise, comment it out
# be sure to include the dot prefix in the prerel
10 years, 10 months
Changes to 'refs/tags/389-adminutil-1.1.17'
by Noriko Hosoi
Changes since the dawn of time:
Mark Reynolds (2):
Ticket 400 - BIND operation result not checked properly in adminutil
Ticket 497 - Console logins fail intermittenly
Nathan Kinder (15):
Fixed parsing of supported emulations in nsarch
Resolves: 213070
Related: 213070
Resolves: 246124
Resolves: 247192
Bug 697106 - (cov#10770) Need to call va_end() after calling va_start()
Bug 697110 - (cov#10757) Remove unused variable in psetRootModAttrList()
Bug 697116 - Need to check if admldapGetISIEDN() returns NULL
Bug 697106 - (cov#10770) Need to call va_end() after calling va_start()
Bug 697641 - Check return value of DER_UTCTimeToAscii()
Bug 697641 - Check if nodeName is NULL before dereferencing
Bug 697641 - Check if pset is NULL before dereferencing
Bug 697641 - Check if valBuf is NULL before dereferencing
Bug 697641 - Check list->name for NULL before dereferencing
Bug 697641 - Check if strchr() returns NULL before dereferencing
Noriko Hosoi (22):
[161407] Fixed the library path for the 64-bit build on Solaris.
libadminutil##.<ext> should not link SSL related ldapsdk libraries.
*** empty log message ***
[172166] Admin Util RPM
[172166] Admin Util build (64-bit)
[172166] Admin Util build (IPF)
[Bug 172166] Admin Util build (IPF)
[Bug 172166] Admin Util build (IPF)
[179394] HP-UX PA-RISC support
[179394] HP-UX IPF/PA-RISC support
upgraded LDAP C SDK: v5.16 -> v5.17
Replaced PL_Free with PR_Free.
[161099] admin passwd in clear text in adm.conf
[172166] Admin Util build (RPM)
[195258] Changes for the internal build
Removed the link arg to link with libCrun.so.1 since there is no C++ code
Resolves: #186280
Resolves: Bug 237356
Fixed a minor bug introduced in the revision 1.6.
Resolves: #191834
bump version to 1.1.16
bump version to 1.1.17
Rich Megginson (55):
change binary directory naming convention to the same one we use with pre-built binary components; remove old crufty Fortezza stuff; general makefile cleanup
Bug(s) fixed: 171799
make PERL5 use perl from PATH on Linux
The correct naming convention for RHEL is
1) Fix moz objdir name for generic linux x86_64
Bug(s) fixed: 186280
Bug: 186280
use new ldapcsdk 6.0.0; upgrade other components
Reviewed by: nhosoi (Thanks!)
Bug(s) fixed: 213788
Bug: 213788
Resolves: bug 234420
Resolves: bug 239475
bump version to 1.1.1
bump version to 1.1.1
add support for -version-number when building shared libs; fix a couple of minor issues brought up in fedora package review
pkgconfig is a requires, not a build requires
final spec fix for fedora
Resolves: bug 235293
Resolves: bug 245208
Resolves: bug 245208
Resolves: bug 245396
bump version to 1.1.2
bump version to 1.1.3
Resolves: bug 250526
Resolves: bug 323381
bump version to 1.1.5
Resolves: bug 245248
bump version to 1.1.6
Resolves: bug 413531
Resolves: bug 454060
the correct function name is admldapSetDirectoryURL
bump version to 1.1.7
Resolves: bug 462411
compiler warning clean up
Resolves: bug 466137
fix compiler warning
bump version to 1.1.8
the 1.1.8 release
Rename adminutil to 389-adminutil
added .gitignore
use icu genrb from path if no icu_bin given or found
Bug 460168 - FedoraDS' adminutil requires non-existent "icu.pc" on non-RH/Fedora OS
remove adminutil.pc.in
bump version to 1.1.10
Bug 614690 - adminutil ICU RB generation can fail
Port adminutil to use openldap
allow building with mozldap again
bump version to 1.1.12
version 1.1.13 - add nss_inc to includes for libadminutil sources
bump version to 1.1.14
Ticket #161 - Review and address latest Coverity issues
Ticket #161 - Review and address latest Coverity issues
Ticket #281 - TLS not working with latest openldap
bump version to 1.1.15
foxworth (1):
Internal Red Hat CVS project for adminutil: core
10 years, 10 months
configure configure.ac
by Noriko Hosoi
configure | 20 ++++++++++----------
configure.ac | 2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 325009ac85f7eaf6b75a6a9e7f4ec8b162b26aa0
Author: Noriko Hosoi <nhosoi(a)totoro.usersys.redhat.com>
Date: Thu Jan 31 14:38:20 2013 -0800
bump version to 1.1.17
diff --git a/configure b/configure
index aaec59e..b9504da 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for 389-adminutil 1.1.16.
+# Generated by GNU Autoconf 2.68 for 389-adminutil 1.1.17.
#
# Report bugs to <http://bugzilla.redhat.com/>.
#
@@ -570,8 +570,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='389-adminutil'
PACKAGE_TARNAME='389-adminutil'
-PACKAGE_VERSION='1.1.16'
-PACKAGE_STRING='389-adminutil 1.1.16'
+PACKAGE_VERSION='1.1.17'
+PACKAGE_STRING='389-adminutil 1.1.17'
PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
PACKAGE_URL=''
@@ -1360,7 +1360,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures 389-adminutil 1.1.16 to adapt to many kinds of systems.
+\`configure' configures 389-adminutil 1.1.17 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1430,7 +1430,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of 389-adminutil 1.1.16:";;
+ short | recursive ) echo "Configuration of 389-adminutil 1.1.17:";;
esac
cat <<\_ACEOF
@@ -1562,7 +1562,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-389-adminutil configure 1.1.16
+389-adminutil configure 1.1.17
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2152,7 +2152,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by 389-adminutil $as_me 1.1.16, which was
+It was created by 389-adminutil $as_me 1.1.17, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2970,7 +2970,7 @@ fi
# Define the identity of the package.
PACKAGE='389-adminutil'
- VERSION='1.1.16'
+ VERSION='1.1.17'
cat >>confdefs.h <<_ACEOF
@@ -19062,7 +19062,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by 389-adminutil $as_me 1.1.16, which was
+This file was extended by 389-adminutil $as_me 1.1.17, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19119,7 +19119,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-389-adminutil config.status 1.1.16
+389-adminutil config.status 1.1.17
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 4732faf..ccf285c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([389-adminutil], [1.1.16], [http://bugzilla.redhat.com/])
+AC_INIT([389-adminutil], [1.1.17], [http://bugzilla.redhat.com/])
AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
AM_MAINTAINER_MODE
AC_CANONICAL_HOST
10 years, 10 months
admserv/cgi-src40
by Noriko Hosoi
admserv/cgi-src40/restartsrv.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit f2a8c2e5e03f288c09325669bc6f5973b1d110c4
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Wed Jan 30 16:27:36 2013 -0800
Ticket #567 - Restart of Admin server from console fails on segfault
Bug description: The order of the argument 2 and 3 for
PL_strncpyz was not correct.
Definition of PL_strncpyz:
char * PL_strncpyz(char *dest, const char *src, PRUint32 max);
Fix description: This patch exchanges the 2nd and 3rd arguments.
Reviewed by Rich (Thank you!!)
diff --git a/admserv/cgi-src40/restartsrv.c b/admserv/cgi-src40/restartsrv.c
index 6e67d9b..87e76bf 100644
--- a/admserv/cgi-src40/restartsrv.c
+++ b/admserv/cgi-src40/restartsrv.c
@@ -184,10 +184,10 @@ int main(int argc, char *argv[])
break;
case 0:
#if defined(WITH_SYSTEMD)
- PL_strncpyz(line, sizeof(line), "/bin/systemctl restart " PACKAGE_NAME ".service");
+ PL_strncpyz(line, "/bin/systemctl restart " PACKAGE_NAME ".service", sizeof(line));
restart(line);
#elif defined(ENABLE_SERVICE)
- PL_strncpyz(line, sizeof(line), "service " PACKAGE_NAME " restart");
+ PL_strncpyz(line, "service " PACKAGE_NAME " restart", sizeof(line));
restart(line);
#else
if (util_find_file_in_paths(line, sizeof(line), "restart-ds-admin", CMDBINDIR, "../..", "")) {
10 years, 10 months
ldap/servers
by Noriko Hosoi
ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c | 39 ++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
New commits:
commit f034f2bda3d4ecfaa2fb2f1dda0207c91064d9b9
Author: Noriko Hosoi <nhosoi(a)totoro.usersys.redhat.com>
Date: Fri Jan 25 17:18:03 2013 -0800
Ticket #533 - only scan for attributes to decrypt if there are encrypted attrs configured
Bug description: When an internal entry is created in id2entry,
all attributes are scanned in attrcrypt_decrypt_entry() and
checked if they need to be decrypted regardless of SSL configured
on the server or not.
Fix description: In attrcrypt_encrypt_* and attrcrypt_decrypt_*
functions, this patch checks the attrcrypt_configured flag.
It goes scanning the attribute list only when the encrypt_
configured flag is set to true.
Reviewed by Mark (Thank you!!)
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c b/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c
index f0ef692..4e02785 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_attrcrypt.c
@@ -818,6 +818,15 @@ attrcrypt_decrypt_entry(backend *be, struct backentry *e)
int rc = 0;
Slapi_Attr *attr = NULL;
char *type = NULL;
+ ldbm_instance *inst = (ldbm_instance *)be->be_instance_info;
+
+ if (!inst->attrcrypt_configured) {
+ /*
+ * No encryption is enabled in this backend at all.
+ * There's no need to scan the attributes to decrypt them.
+ */
+ return ret;
+ }
LDAPDebug(LDAP_DEBUG_TRACE,"-> attrcrypt_decrypt_entry\n", 0, 0, 0);
/* Scan through the entry's attributes, looking to see if any are configured for crypto */
@@ -870,6 +879,15 @@ attrcrypt_encrypt_entry_inplace(backend *be, const struct backentry *inout)
char *type = NULL;
Slapi_Attr *attr = NULL;
Slapi_Value **svals = NULL;
+ ldbm_instance *inst = (ldbm_instance *)be->be_instance_info;
+
+ if (!inst->attrcrypt_configured) {
+ /*
+ * No encryption is enabled in this backend at all.
+ * There's no need to scan the attributes to encrypt them.
+ */
+ return ret;
+ }
LDAPDebug(LDAP_DEBUG_TRACE,"-> attrcrypt_encrypt_entry_inplace\n", 0, 0, 0);
/* Scan the entry's attributes looking for any that are configured for encryption */
@@ -906,6 +924,15 @@ attrcrypt_encrypt_entry(backend *be, const struct backentry *in, struct backentr
struct backentry *new_entry = NULL;
char *type = NULL;
Slapi_Attr *attr = NULL;
+ ldbm_instance *inst = (ldbm_instance *)be->be_instance_info;
+
+ if (!inst->attrcrypt_configured) {
+ /*
+ * No encryption is enabled in this backend at all.
+ * There's no need to scan the attributes to encrypt them.
+ */
+ return ret;
+ }
LDAPDebug(LDAP_DEBUG_TRACE,"-> attrcrypt_encrypt_entry\n", 0, 0, 0);
*out = NULL;
@@ -959,6 +986,12 @@ attrcrypt_encrypt_index_key(backend *be, struct attrinfo *ai, const struct berva
char *out_data = NULL;
size_t out_size = 0;
struct berval *out_berval = NULL;
+ ldbm_instance *inst = (ldbm_instance *)be->be_instance_info;
+
+ if (!inst->attrcrypt_configured) {
+ /* No encryption is enabled in this backend at all. */
+ return ret;
+ }
if (ai->ai_attrcrypt) {
LDAPDebug(LDAP_DEBUG_TRACE,"-> attrcrypt_encrypt_index_key\n", 0, 0, 0);
@@ -990,6 +1023,12 @@ attrcrypt_decrypt_index_key(backend *be,
struct berval **out)
{
int rc = 0; /* success */
+ ldbm_instance *inst = (ldbm_instance *)be->be_instance_info;
+
+ if (!inst->attrcrypt_configured) {
+ /* No encryption is enabled in this backend at all. */
+ return rc;
+ }
if (ai->ai_attrcrypt) {
Slapi_Value *value = NULL;
10 years, 10 months
Branch 'adminutil_8_2_Branch' - 2 commits - adminutil.spec lib/libadmsslutil
by Mark Reynolds
adminutil.spec | 7 ++++++-
lib/libadmsslutil/admsslutil.c | 5 ++---
2 files changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 535e11cb76ea84c29be14ca0417e5dff1f67fd53
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Wed Jan 30 17:07:14 2013 -0500
Bump version to 1.1.8-3
diff --git a/adminutil.spec b/adminutil.spec
index d3b38f6..571d99d 100644
--- a/adminutil.spec
+++ b/adminutil.spec
@@ -7,7 +7,7 @@
Summary: Utility library for directory server administration
Name: adminutil
Version: 1.1.8
-Release: 1%{?dist}
+Release: 3%{?dist}
License: LGPLv2
URL: http://directory.fedoraproject.org/wiki/AdminUtil
Group: Development/Libraries
@@ -84,6 +84,11 @@ that use %{name}.
%{_includedir}/libadmsslutil
%changelog
+* Wed Jan 30 2013 Mark Reynolds <mareynol(a)redhat.com> - 1.1.8-3
+- Errata Candiate 14430
+- Bump version to 1.1.8.3
+- Bug 856089 - Console logins fail intermittently
+
* Tue Mar 31 2009 Rich Megginson <rmeggins(a)redhat.com> - 1.1.8-1
- this is the 1.1.8 release
commit 8f16c4d6aaae69bbc377e056e6e28f41de1caa63
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Wed Jan 30 16:05:45 2013 -0500
Ticket 497 - Console logins fail intermittenly
Bug Description: When there is a connection failure the admin server clears out
the "Users & Groups" data, and tries to rebuild it binding as
the SIE entry from o=netscaperoot. This bind fails with an
error 53, and then we don't update the "Users & Groups" info.
Fix Description: If we geti an autentication failure, don't close the connection but
inext try to bind anonymously. There must be aci's in place to allow
anonymous searches of the "cn=server group" entries.
https://fedorahosted.org/389/ticket/479
Reviewed by: richm(Thanks!)
diff --git a/lib/libadmsslutil/admsslutil.c b/lib/libadmsslutil/admsslutil.c
index 04a3fa8..6fa6c10 100644
--- a/lib/libadmsslutil/admsslutil.c
+++ b/lib/libadmsslutil/admsslutil.c
@@ -113,10 +113,9 @@ admldapBuildInfoSSL(AdmldapInfo info, int *errorcode)
case LDAP_INAPPROPRIATE_AUTH:
case LDAP_INVALID_CREDENTIALS:
case LDAP_INSUFFICIENT_ACCESS:
+ case LDAP_UNWILLING_TO_PERFORM:
/* authenticate failed: Should not continue */
- ldap_unbind(ld);
- *errorcode = ADMUTIL_LDAP_ERR;
- return 0;
+ break;
case LDAP_NO_SUCH_OBJECT:
case LDAP_ALIAS_PROBLEM:
case LDAP_INVALID_DN_SYNTAX:
10 years, 10 months
lib/libadmsslutil
by Mark Reynolds
lib/libadmsslutil/admsslutil.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 29e069f8efeb8b4a3ceb51371939f82c9df104ab
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Wed Jan 30 16:05:45 2013 -0500
Ticket 497 - Console logins fail intermittenly
Bug Description: When there is a connection failure the admin server clears out
the "Users & Groups" data, and tries to rebuild it binding as
the SIE entry from o=netscaperoot. This bind fails with an
error 53, and then we don't update the "Users & Groups" info.
Fix Description: If we geti an autentication failure, don't close the connection but
inext try to bind anonymously. There must be aci's in place to allow
anonymous searches of the "cn=server group" entries.
https://fedorahosted.org/389/ticket/479
Reviewed by: ?
diff --git a/lib/libadmsslutil/admsslutil.c b/lib/libadmsslutil/admsslutil.c
index ae3d1bb..7ea9eb0 100644
--- a/lib/libadmsslutil/admsslutil.c
+++ b/lib/libadmsslutil/admsslutil.c
@@ -115,10 +115,9 @@ admldapBuildInfoSSL(AdmldapInfo info, int *errorcode)
case LDAP_INAPPROPRIATE_AUTH:
case LDAP_INVALID_CREDENTIALS:
case LDAP_INSUFFICIENT_ACCESS:
+ case LDAP_UNWILLING_TO_PERFORM:
/* authenticate failed: Should not continue */
- ldap_unbind_ext(ld, NULL, NULL);
- *errorcode = ADMUTIL_LDAP_ERR;
- return 0;
+ break;
case LDAP_NO_SUCH_OBJECT:
case LDAP_ALIAS_PROBLEM:
case LDAP_INVALID_DN_SYNTAX:
10 years, 10 months
ldap/admin
by Mark Reynolds
ldap/admin/src/scripts/DSCreate.pm.in | 2 +-
ldap/admin/src/scripts/setup-ds.res.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 54112e4c4867bf7b1d9dcf928155dc4160304464
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Wed Jan 30 10:28:14 2013 -0500
Ticket 433 - multiple bugs in start-dirsrv, stop-dirsrv, restart-dirsrv scripts
Description: Need to use error_reserved_serverid in DSCreate.pm, and fix inconsistent
quoting in error_reserved_serverid
Reviewed by: richm(Thanks!)
https://fedorahosted.org/389/ticket/433
diff --git a/ldap/admin/src/scripts/DSCreate.pm.in b/ldap/admin/src/scripts/DSCreate.pm.in
index a3b8fe7..46ca578 100644
--- a/ldap/admin/src/scripts/DSCreate.pm.in
+++ b/ldap/admin/src/scripts/DSCreate.pm.in
@@ -123,7 +123,7 @@ sub sanityCheckParams {
}
if($inf->{slapd}->{ServerIdentifier} eq "admin"){
- return ('error_invalid_serverid - "admin" is reserved for the Admininstration Server, please choose a different server identifier');
+ return ('error_reserved_serverid' ,"admin");
} elsif (!isValidServerID($inf->{slapd}->{ServerIdentifier})) {
return ('error_invalid_serverid', $inf->{slapd}->{ServerIdentifier});
} elsif (-d $inf->{slapd}->{config_dir}) {
diff --git a/ldap/admin/src/scripts/setup-ds.res.in b/ldap/admin/src/scripts/setup-ds.res.in
index 401722e..ddda771 100644
--- a/ldap/admin/src/scripts/setup-ds.res.in
+++ b/ldap/admin/src/scripts/setup-ds.res.in
@@ -105,7 +105,7 @@ program, or low port restriction. Please choose another value for\
ServerPort. Error: $!\n
error_invalid_serverid = The ServerIdentifier '%s' contains invalid characters. It must\
contain only alphanumeric characters and the following: #%:@_-\n\n
-error_reserved_serverid = The ServerIdentifier '%s" is reserved for the Administration Server, please choose a different server identifier.\n
+error_reserved_serverid = The ServerIdentifier '%s' is reserved for the Administration Server, please choose a different server identifier.\n
error_opening_scripttmpl = Could not open the script template file '%s'. Error: %s\n
error_creating_directory = Could not create directory '%s'. Error: %s\n
error_chowning_directory = Could not change ownership of directory '%s' to userid '%s': Error: %s\n
10 years, 10 months