[389-ds-base] branch 389-ds-base-1.4.0 updated: Ticket 50165 - Fix issues with dscreate
by pagure@pagure.io
This is an automated email from the git hooks/post-receive script.
mreynolds pushed a commit to branch 389-ds-base-1.4.0
in repository 389-ds-base.
The following commit(s) were added to refs/heads/389-ds-base-1.4.0 by this push:
new 0036226 Ticket 50165 - Fix issues with dscreate
0036226 is described below
commit 0036226b2880b41d1ba9768cb0db21243a6f4e5d
Author: Mark Reynolds <mreynolds(a)redhat.com>
AuthorDate: Fri Feb 1 10:21:31 2019 -0500
Ticket 50165 - Fix issues with dscreate
Bug Description: The install would fail under these two conditions:
[1] You do not specfiy a secure port, even if not using TLS
[2] The suffix has a space after a comma.
Fix Description: If the secure port is not specified set it to the default,
and normalize the suffix DN
https://pagure.io/389-ds-base/issue/50165
Reviewed by: ?
---
src/lib389/lib389/instance/setup.py | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/lib389/lib389/instance/setup.py b/src/lib389/lib389/instance/setup.py
index 1e3e891..1437a47 100644
--- a/src/lib389/lib389/instance/setup.py
+++ b/src/lib389/lib389/instance/setup.py
@@ -32,6 +32,7 @@ from lib389.utils import (
assert_c,
is_a_dn,
ensure_str,
+ normalizeDN,
socket_check_open,
selinux_label_port,
selinux_restorecon)
@@ -738,7 +739,7 @@ class SetupDs(object):
# Create ds_suffix here else it won't be in scope ....
ds_suffix = ''
if len(backends) > 0:
- ds_suffix = backends[0]['nsslapd-suffix']
+ ds_suffix = normalizeDN(backends[0]['nsslapd-suffix'])
# Create certdb in sysconfidir
self.log.debug("ACTION: Creating certificate database is %s", slapd['cert_dir'])
@@ -850,6 +851,11 @@ class SetupDs(object):
# We *ALWAYS* set secure port, even if security is off, because it breaks
# tests with standalone.enable_tls if we do not. It's only when security; on
# that we actually start listening on it.
+ if not slapd['secure_port']:
+ if self.containerised:
+ slapd['secure_port'] = "3636"
+ else:
+ slapd['secure_port'] = "636"
ds_instance.config.set('nsslapd-secureport', '%s' % slapd['secure_port'])
if slapd['self_sign_cert']:
ds_instance.config.set('nsslapd-security', 'on')
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
5 years, 2 months