From 9408b94dd5ba3218547c4debf0bf5d962a7a19cb Mon Sep 17 00:00:00 2001
From: Mark Reynolds <mreynolds@redhat.com>
Date: Feb 01 2019 15:37:23 +0000
Subject: 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: ?

---

diff --git a/src/lib389/lib389/instance/setup.py b/src/lib389/lib389/instance/setup.py
index 6f3317f..2ff6476 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)
@@ -744,7 +745,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'])
@@ -856,6 +857,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')