Remove wildcard imports

Wildcard imports should not be used.

Check for wildcard imports has been enabled in pylint.
Pylint note: options 'wildcard-import' causes too much false positive
results, so instead it I used 'unused-wildcard-import' option which has almost
the same effect.

Reviewed-By: Jan Cholasta <jcholast@redhat.com>

61 files changed, 295 insertions, 71 deletions

diff --git a/contrib/RHEL4/ipa-client-setup b/contrib/RHEL4/ipa-client-setup
index 3accd9d25..2a6fc6776 100644
--- a/contrib/RHEL4/ipa-client-setup
+++ b/contrib/RHEL4/ipa-client-setup
@@ -25,7 +25,7 @@ import sys
 import os
 import string
 import shutil
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger, standard_logging_setup
 from optparse import OptionParser
 import ipachangeconf
 import ldap
diff --git a/install/tools/ipa-adtrust-install b/install/tools/ipa-adtrust-install
index b1197822c..8b3fce2db 100755
--- a/install/tools/ipa-adtrust-install
+++ b/install/tools/ipa-adtrust-install
@@ -23,17 +23,24 @@
 
 from __future__ import print_function
 
+import os
+import sys
+import ldap
+
 import six
 
 from ipaserver.install import adtrustinstance
-from ipaserver.install.installutils import *
+from ipaserver.install.installutils import (
+    read_password,
+    check_server_configuration,
+    run_script)
 from ipaserver.install import service
 from ipapython import version
 from ipapython import ipautil, sysrestore, ipaldap
 from ipalib import api, errors, krb_utils
 from ipapython.config import IPAOptionParser
 from ipaplatform.paths import paths
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger, standard_logging_setup
 from ipapython.dn import DN
 
 if six.PY3:
diff --git a/install/tools/ipa-ca-install b/install/tools/ipa-ca-install
index f2f32bd8e..f39847b90 100755
--- a/install/tools/ipa-ca-install
+++ b/install/tools/ipa-ca-install
@@ -35,7 +35,7 @@ from ipalib import api
 from ipalib.constants import DOMAIN_LEVEL_0
 from ipapython.dn import DN
 from ipapython.config import IPAOptionParser
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger, standard_logging_setup
 from ipaplatform.paths import paths
 
 log_file_name = paths.IPAREPLICA_CA_INSTALL_LOG
diff --git a/install/tools/ipa-compat-manage b/install/tools/ipa-compat-manage
index 1d0279b7d..29d1295f9 100755
--- a/install/tools/ipa-compat-manage
+++ b/install/tools/ipa-compat-manage
@@ -30,7 +30,7 @@ try:
     from ipaserver.install.ldapupdate import LDAPUpdate
     from ipaserver.plugins.ldap2 import ldap2
     from ipalib import api, errors
-    from ipapython.ipa_log_manager import *
+    from ipapython.ipa_log_manager import standard_logging_setup
     from ipapython.dn import DN
 except ImportError as e:
     print("""\
diff --git a/install/tools/ipa-csreplica-manage b/install/tools/ipa-csreplica-manage
index 5adfb799b..96f565839 100755
--- a/install/tools/ipa-csreplica-manage
+++ b/install/tools/ipa-csreplica-manage
@@ -25,7 +25,7 @@ from __future__ import print_function
 import sys
 import os
 
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger
 from ipaserver.install import (replication, installutils, bindinstance,
     cainstance, certs)
 from ipalib import api, errors
diff --git a/install/tools/ipa-dns-install b/install/tools/ipa-dns-install
index 720e08265..91f608941 100755
--- a/install/tools/ipa-dns-install
+++ b/install/tools/ipa-dns-install
@@ -21,14 +21,19 @@
 
 from __future__ import print_function
 
+import os
+import sys
+
 from optparse import SUPPRESS_HELP
 
 from ipaserver.install import bindinstance, httpinstance
-from ipaserver.install.installutils import *
 from ipaserver.install import installutils
+from ipaserver.install import service
 from ipapython import version
 from ipalib import api
 from ipaplatform.paths import paths
+from ipapython import ipautil
+from ipapython import sysrestore
 from ipapython.config import IPAOptionParser
 from ipapython.ipa_log_manager import standard_logging_setup, root_logger
 
diff --git a/install/tools/ipa-managed-entries b/install/tools/ipa-managed-entries
index 9b22d2c70..c786e883a 100755
--- a/install/tools/ipa-managed-entries
+++ b/install/tools/ipa-managed-entries
@@ -28,7 +28,7 @@ from ipapython import config, ipaldap
 from ipaserver.install import installutils
 from ipalib import api, errors
 from ipalib.constants import CACERT
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger, standard_logging_setup
 from ipapython.dn import DN
 
 def parse_options():
diff --git a/install/tools/ipa-nis-manage b/install/tools/ipa-nis-manage
index 6136f4436..3aa1507b2 100755
--- a/install/tools/ipa-nis-manage
+++ b/install/tools/ipa-nis-manage
@@ -31,7 +31,7 @@ try:
     from ipaserver.install.ldapupdate import LDAPUpdate
     from ipaserver.plugins.ldap2 import ldap2
     from ipalib import api, errors
-    from ipapython.ipa_log_manager import *
+    from ipapython.ipa_log_manager import standard_logging_setup
     from ipapython.dn import DN
     from ipaplatform import services
 except ImportError as e:
diff --git a/install/tools/ipa-replica-conncheck b/install/tools/ipa-replica-conncheck
index d36732351..52734c3c8 100755
--- a/install/tools/ipa-replica-conncheck
+++ b/install/tools/ipa-replica-conncheck
@@ -27,7 +27,7 @@ from ipalib import api, errors, x509
 from ipaserver.install import installutils
 import ipaclient.ipachangeconf
 from optparse import OptionGroup, OptionValueError
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger, standard_logging_setup
 import sys
 import os
 import signal
diff --git a/install/tools/ipa-replica-manage b/install/tools/ipa-replica-manage
index 654ea59a2..e4af7b2fd 100755
--- a/install/tools/ipa-replica-manage
+++ b/install/tools/ipa-replica-manage
@@ -38,7 +38,7 @@ from ipapython import version, ipaldap
 from ipalib import api, errors
 from ipalib.constants import CACERT
 from ipalib.util import has_managed_topology
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger, standard_logging_setup
 from ipapython.dn import DN
 from ipapython.config import IPAOptionParser
 from ipaclient import ipadiscovery
diff --git a/ipa-client/ipa-install/ipa-client-automount b/ipa-client/ipa-install/ipa-client-automount
index 1d0428772..f06aa7f8d 100755
--- a/ipa-client/ipa-install/ipa-client-automount
+++ b/ipa-client/ipa-install/ipa-client-automount
@@ -38,7 +38,7 @@ from ipapython import sysrestore
 from ipapython import ipautil
 from ipaclient import ipadiscovery
 from ipaclient import ipachangeconf
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger, standard_logging_setup
 from ipapython.dn import DN
 from ipaplatform.constants import constants
 from ipaplatform.tasks import tasks
diff --git a/ipalib/plugable.py b/ipalib/plugable.py
index 552234327..76b933c30 100644
--- a/ipalib/plugable.py
+++ b/ipalib/plugable.py
@@ -43,7 +43,10 @@ from ipalib import text
 from ipalib.text import _
 from ipalib.base import ReadOnly, NameSpace, lock, islocked
 from ipalib.constants import DEFAULT_CONFIG
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import (
+    log_mgr,
+    LOGGING_FORMAT_FILE,
+    LOGGING_FORMAT_STDERR)
 from ipapython.version import VERSION, API_VERSION
 
 if six.PY3:
diff --git a/ipalib/plugins/aci.py b/ipalib/plugins/aci.py
index 8fe382f38..60dbcee7f 100644
--- a/ipalib/plugins/aci.py
+++ b/ipalib/plugins/aci.py
@@ -129,7 +129,7 @@ from ipalib import output
 from ipalib import _, ngettext
 from ipalib.plugable import Registry
 from ipalib.plugins.baseldap import gen_pkey_only_option, pkey_to_value
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger
 from ipapython.dn import DN
 
 if six.PY3:
diff --git a/ipalib/plugins/automember.py b/ipalib/plugins/automember.py
index a45fab07b..3135e3e95 100644
--- a/ipalib/plugins/automember.py
+++ b/ipalib/plugins/automember.py
@@ -22,9 +22,18 @@ import time
 import ldap as _ldap
 import six
 
-from ipalib import api, errors, Str, StrEnum, DNParam, _, ngettext
+from ipalib import api, errors, Str, StrEnum, DNParam, Flag, _, ngettext
+from ipalib import output, Command
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import *
+from ipalib.plugins.baseldap import (
+    pkey_to_value,
+    entry_to_dict,
+    LDAPObject,
+    LDAPCreate,
+    LDAPUpdate,
+    LDAPDelete,
+    LDAPSearch,
+    LDAPRetrieve)
 from ipalib.request import context
 from ipapython.dn import DN
 
diff --git a/ipalib/plugins/automount.py b/ipalib/plugins/automount.py
index 5e04a6b93..91a0613bb 100644
--- a/ipalib/plugins/automount.py
+++ b/ipalib/plugins/automount.py
@@ -25,8 +25,17 @@ import six
 from ipalib import api, errors
 from ipalib import Flag, Str, IA5Str
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import *
+from ipalib.plugins.baseldap import (
+    pkey_to_value,
+    LDAPObject,
+    LDAPCreate,
+    LDAPDelete,
+    LDAPQuery,
+    LDAPUpdate,
+    LDAPSearch,
+    LDAPRetrieve)
 from ipalib import _, ngettext
+from ipapython.dn import DN
 
 if six.PY3:
     unicode = str
diff --git a/ipalib/plugins/cert.py b/ipalib/plugins/cert.py
index 615f7ac25..dd27bfb63 100644
--- a/ipalib/plugins/cert.py
+++ b/ipalib/plugins/cert.py
@@ -31,7 +31,7 @@ from ipalib import x509
 from ipalib import util
 from ipalib import ngettext
 from ipalib.plugable import Registry
-from ipalib.plugins.virtual import *
+from ipalib.plugins.virtual import VirtualCommand
 from ipalib.plugins.baseldap import pkey_to_value
 from ipalib.plugins.service import split_any_principal
 from ipalib.plugins.certprofile import validate_profile_id
@@ -40,6 +40,7 @@ from ipalib.text import _
 from ipalib.request import context
 from ipalib import output
 from ipalib.plugins.service import validate_principal
+from ipapython.dn import DN
 
 import six
 import nss.nss as nss
diff --git a/ipalib/plugins/config.py b/ipalib/plugins/config.py
index 055a8211b..4c8c2dd44 100644
--- a/ipalib/plugins/config.py
+++ b/ipalib/plugins/config.py
@@ -20,10 +20,15 @@
 
 from ipalib import api
 from ipalib import Bool, Int, Str, IA5Str, StrEnum, DNParam
+from ipalib import errors
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import *
+from ipalib.plugins.baseldap import (
+    LDAPObject,
+    LDAPUpdate,
+    LDAPRetrieve)
 from ipalib.plugins.selinuxusermap import validate_selinuxuser
 from ipalib import _
+from ipapython.dn import DN
 
 # 389-ds attributes that should be skipped in attribute checks
 OPERATIONAL_ATTRIBUTES = ('nsaccountlock', 'member', 'memberof',
diff --git a/ipalib/plugins/dns.py b/ipalib/plugins/dns.py
index 60c992026..d5448c879 100644
--- a/ipalib/plugins/dns.py
+++ b/ipalib/plugins/dns.py
@@ -36,11 +36,21 @@ import six
 from ipalib.request import context
 from ipalib import api, errors, output
 from ipalib import Command
-from ipalib.capabilities import VERSION_WITHOUT_CAPABILITIES
+from ipalib.capabilities import (
+    VERSION_WITHOUT_CAPABILITIES,
+    client_has_capability)
 from ipalib.parameters import (Flag, Bool, Int, Decimal, Str, StrEnum, Any,
                                DeprecatedParam, DNSNameParam)
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import *
+from ipalib.plugins.baseldap import (
+    pkey_to_value,
+    LDAPObject,
+    LDAPCreate,
+    LDAPUpdate,
+    LDAPSearch,
+    LDAPQuery,
+    LDAPDelete,
+    LDAPRetrieve)
 from ipalib import _, ngettext
 from ipalib import messages
 from ipalib.util import (normalize_zonemgr,
@@ -53,6 +63,7 @@ from ipalib.util import (normalize_zonemgr,
                          validate_dnssec_zone_forwarder_step1,
                          validate_dnssec_zone_forwarder_step2,
                          verify_host_resolvable)
+from ipapython.dn import DN
 from ipapython.ipautil import CheckedIPAddress, check_zone_overlap
 from ipapython.dnsutil import DNSName
 
diff --git a/ipalib/plugins/group.py b/ipalib/plugins/group.py
index 64a135e01..85ed1d2b0 100644
--- a/ipalib/plugins/group.py
+++ b/ipalib/plugins/group.py
@@ -21,12 +21,28 @@
 import six
 
 from ipalib import api
-from ipalib import Int, Str
+from ipalib import Int, Str, Flag
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import *
+from ipalib.plugins.baseldap import (
+    add_external_post_callback,
+    pkey_to_value,
+    remove_external_post_callback,
+    LDAPObject,
+    LDAPCreate,
+    LDAPUpdate,
+    LDAPDelete,
+    LDAPSearch,
+    LDAPRetrieve,
+    LDAPAddMember,
+    LDAPRemoveMember,
+    LDAPQuery,
+)
 from ipalib.plugins.idviews import remove_ipaobject_overrides
 from ipalib.plugins import baseldap
 from ipalib import _, ngettext
+from ipalib import errors
+from ipalib import output
+from ipapython.dn import DN
 
 if six.PY3:
     unicode = str
diff --git a/ipalib/plugins/hbacrule.py b/ipalib/plugins/hbacrule.py
index aa0e79c17..54487eded 100644
--- a/ipalib/plugins/hbacrule.py
+++ b/ipalib/plugins/hbacrule.py
@@ -20,8 +20,21 @@
 from ipalib import api, errors
 from ipalib import AccessTime, Str, StrEnum, Bool, DeprecatedParam
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import *
+from ipalib.plugins.baseldap import (
+    pkey_to_value,
+    external_host_param,
+    LDAPObject,
+    LDAPCreate,
+    LDAPDelete,
+    LDAPRetrieve,
+    LDAPUpdate,
+    LDAPSearch,
+    LDAPQuery,
+    LDAPAddMember,
+    LDAPRemoveMember)
 from ipalib import _, ngettext
+from ipalib import output
+from ipapython.dn import DN
 
 __doc__ = _("""
 Host-based access control
diff --git a/ipalib/plugins/hbacsvcgroup.py b/ipalib/plugins/hbacsvcgroup.py
index 71df7fdbc..e7feb1496 100644
--- a/ipalib/plugins/hbacsvcgroup.py
+++ b/ipalib/plugins/hbacsvcgroup.py
@@ -17,9 +17,17 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from ipalib import api
+from ipalib import api, Str
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import *
+from ipalib.plugins.baseldap import (
+    LDAPObject,
+    LDAPCreate,
+    LDAPUpdate,
+    LDAPRetrieve,
+    LDAPSearch,
+    LDAPDelete,
+    LDAPAddMember,
+    LDAPRemoveMember)
 from ipalib import _, ngettext
 
 __doc__ = _("""
diff --git a/ipalib/plugins/netgroup.py b/ipalib/plugins/netgroup.py
index fe85889de..b56889203 100644
--- a/ipalib/plugins/netgroup.py
+++ b/ipalib/plugins/netgroup.py
@@ -21,11 +21,24 @@
 import six
 
 from ipalib import api, errors
-from ipalib import Str, StrEnum
+from ipalib import Str, StrEnum, Flag
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import *
+from ipalib.plugins.baseldap import (
+    external_host_param,
+    add_external_pre_callback,
+    add_external_post_callback,
+    remove_external_post_callback,
+    LDAPObject,
+    LDAPCreate,
+    LDAPDelete,
+    LDAPUpdate,
+    LDAPSearch,
+    LDAPRetrieve,
+    LDAPAddMember,
+    LDAPRemoveMember)
 from ipalib import _, ngettext
 from ipalib.plugins.hbacrule import is_all
+from ipapython.dn import DN
 
 if six.PY3:
     unicode = str
diff --git a/ipalib/plugins/privilege.py b/ipalib/plugins/privilege.py
index ffb903e03..b455b2641 100644
--- a/ipalib/plugins/privilege.py
+++ b/ipalib/plugins/privilege.py
@@ -17,9 +17,22 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from ipalib.plugins.baseldap import *
+from ipalib.plugins.baseldap import (
+    LDAPObject,
+    LDAPCreate,
+    LDAPDelete,
+    LDAPUpdate,
+    LDAPSearch,
+    LDAPRetrieve,
+    LDAPAddMember,
+    LDAPRemoveMember,
+    LDAPAddReverseMember,
+    LDAPRemoveReverseMember)
 from ipalib import api, _, ngettext, errors
 from ipalib.plugable import Registry
+from ipalib import Str
+from ipalib import output
+from ipapython.dn import DN
 
 __doc__ = _("""
 Privileges
diff --git a/ipalib/plugins/pwpolicy.py b/ipalib/plugins/pwpolicy.py
index 7bd3c0984..e99ea852e 100644
--- a/ipalib/plugins/pwpolicy.py
+++ b/ipalib/plugins/pwpolicy.py
@@ -20,7 +20,14 @@
 
 from ipalib import api
 from ipalib import Int, Str, DNParam
-from ipalib.plugins.baseldap import *
+from ipalib import errors
+from ipalib.plugins.baseldap import (
+    LDAPObject,
+    LDAPCreate,
+    LDAPDelete,
+    LDAPUpdate,
+    LDAPRetrieve,
+    LDAPSearch)
 from ipalib import _
 from ipalib.plugable import Registry
 from ipalib.request import context
diff --git a/ipalib/plugins/radiusproxy.py b/ipalib/plugins/radiusproxy.py
index e30f35f9d..2a66436f5 100644
--- a/ipalib/plugins/radiusproxy.py
+++ b/ipalib/plugins/radiusproxy.py
@@ -17,8 +17,15 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from ipalib.plugins.baseldap import *
+from ipalib.plugins.baseldap import (
+    LDAPObject,
+    LDAPCreate,
+    LDAPDelete,
+    LDAPUpdate,
+    LDAPSearch,
+    LDAPRetrieve)
 from ipalib import api, Str, Int, Password, _, ngettext
+from ipalib import errors
 from ipalib.plugable import Registry
 from ipalib.util import validate_hostname, validate_ipaddr
 from ipalib.errors import ValidationError
diff --git a/ipalib/plugins/role.py b/ipalib/plugins/role.py
index 82e2a5571..b959e0e40 100644
--- a/ipalib/plugins/role.py
+++ b/ipalib/plugins/role.py
@@ -19,8 +19,19 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import *
+from ipalib.plugins.baseldap import (
+    LDAPObject,
+    LDAPCreate,
+    LDAPDelete,
+    LDAPUpdate,
+    LDAPSearch,
+    LDAPRetrieve,
+    LDAPAddMember,
+    LDAPRemoveMember,
+    LDAPAddReverseMember,
+    LDAPRemoveReverseMember)
 from ipalib import api, Str, _, ngettext
+from ipalib import output
 
 __doc__ = _("""
 Roles
diff --git a/ipalib/plugins/selinuxusermap.py b/ipalib/plugins/selinuxusermap.py
index e1a16af50..e5c2caa77 100644
--- a/ipalib/plugins/selinuxusermap.py
+++ b/ipalib/plugins/selinuxusermap.py
@@ -17,12 +17,26 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import re
+
 from ipalib import api, errors
 from ipalib import Str, StrEnum, Bool
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import *
+from ipalib.plugins.baseldap import (
+    pkey_to_value,
+    LDAPObject,
+    LDAPCreate,
+    LDAPDelete,
+    LDAPUpdate,
+    LDAPSearch,
+    LDAPRetrieve,
+    LDAPQuery,
+    LDAPAddMember,
+    LDAPRemoveMember)
 from ipalib import _, ngettext
+from ipalib import output
 from ipalib.plugins.hbacrule import is_all
+from ipapython.dn import DN
 
 __doc__ = _("""
 SELinux User Mapping
diff --git a/ipalib/plugins/server.py b/ipalib/plugins/server.py
index 4f1959a25..e31def77c 100644
--- a/ipalib/plugins/server.py
+++ b/ipalib/plugins/server.py
@@ -8,9 +8,14 @@ import dbus.mainloop.glib
 from ipalib import api, crud, errors, messages
 from ipalib import Int, Str
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import *
+from ipalib.plugins.baseldap import (
+    LDAPSearch,
+    LDAPRetrieve,
+    LDAPDelete,
+    LDAPObject)
 from ipalib.request import context
 from ipalib import _, ngettext
+from ipalib import output
 
 __doc__ = _("""
 IPA servers
diff --git a/ipalib/plugins/service.py b/ipalib/plugins/service.py
index 4ef4d4362..5daede14f 100644
--- a/ipalib/plugins/service.py
+++ b/ipalib/plugins/service.py
@@ -22,12 +22,29 @@
 import six
 
 from ipalib import api, errors
-from ipalib import Bytes, StrEnum, Bool
+from ipalib import Bytes, StrEnum, Bool, Str, Flag
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import *
+from ipalib.plugins.baseldap import (
+    host_is_master,
+    add_missing_object_class,
+    pkey_to_value,
+    LDAPObject,
+    LDAPCreate,
+    LDAPDelete,
+    LDAPUpdate,
+    LDAPSearch,
+    LDAPRetrieve,
+    LDAPAddMember,
+    LDAPRemoveMember,
+    LDAPQuery,
+    LDAPAddAttribute,
+    LDAPRemoveAttribute)
 from ipalib import x509
 from ipalib import _, ngettext
 from ipalib import util
+from ipalib import output
+from ipapython.dn import DN
+
 import nss.nss as nss
 
 
diff --git a/ipalib/plugins/servicedelegation.py b/ipalib/plugins/servicedelegation.py
index 2ce11191b..3637b9180 100644
--- a/ipalib/plugins/servicedelegation.py
+++ b/ipalib/plugins/servicedelegation.py
@@ -7,9 +7,18 @@ import six
 from ipalib import api
 from ipalib import Str
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import *
+from ipalib.plugins.baseldap import (
+    LDAPObject,
+    LDAPAddMember,
+    LDAPRemoveMember,
+    LDAPCreate,
+    LDAPDelete,
+    LDAPSearch,
+    LDAPRetrieve)
 from ipalib.plugins.service import normalize_principal
 from ipalib import _, ngettext
+from ipalib import errors
+from ipapython.dn import DN
 
 if six.PY3:
     unicode = str
diff --git a/ipalib/plugins/sudocmd.py b/ipalib/plugins/sudocmd.py
index 37776adc0..179b43fcd 100644
--- a/ipalib/plugins/sudocmd.py
+++ b/ipalib/plugins/sudocmd.py
@@ -20,8 +20,15 @@
 from ipalib import api, errors
 from ipalib import Str
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import *
+from ipalib.plugins.baseldap import (
+    LDAPObject,
+    LDAPCreate,
+    LDAPDelete,
+    LDAPUpdate,
+    LDAPSearch,
+    LDAPRetrieve)
 from ipalib import _, ngettext
+from ipapython.dn import DN
 
 __doc__ = _("""
 Sudo Commands
diff --git a/ipalib/plugins/sudocmdgroup.py b/ipalib/plugins/sudocmdgroup.py
index 74bbaf095..f35bc8d26 100644
--- a/ipalib/plugins/sudocmdgroup.py
+++ b/ipalib/plugins/sudocmdgroup.py
@@ -20,7 +20,15 @@
 from ipalib import api
 from ipalib import Str
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import *
+from ipalib.plugins.baseldap import (
+    LDAPObject,
+    LDAPCreate,
+    LDAPDelete,
+    LDAPUpdate,
+    LDAPSearch,
+    LDAPRetrieve,
+    LDAPAddMember,
+    LDAPRemoveMember)
 from ipalib import _, ngettext
 
 __doc__ = _("""
diff --git a/ipalib/plugins/trust.py b/ipalib/plugins/trust.py
index 61846dc11..bc347675a 100644
--- a/ipalib/plugins/trust.py
+++ b/ipalib/plugins/trust.py
@@ -21,13 +21,24 @@
 import six
 
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import *
+from ipalib.plugins.baseldap import (
+    pkey_to_value,
+    entry_to_dict,
+    LDAPCreate,
+    LDAPDelete,
+    LDAPUpdate,
+    LDAPSearch,
+    LDAPRetrieve,
+    LDAPObject,
+    LDAPQuery)
 from ipalib.plugins.dns import dns_container_exists
+from ipapython.dn import DN
 from ipapython.ipautil import realm_to_suffix
 from ipapython.ipa_log_manager import root_logger
-from ipalib import api, Str, StrEnum, Password, Bool, _, ngettext
+from ipalib import api, Str, StrEnum, Password, Bool, _, ngettext, Int, Flag
 from ipalib import Command
 from ipalib import errors
+from ipalib import output
 from ldap import SCOPE_SUBTREE
 from time import sleep
 
diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py
index 0017c09d7..97ba4d321 100644
--- a/ipalib/plugins/user.py
+++ b/ipalib/plugins/user.py
@@ -18,14 +18,17 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import time
 from time import gmtime, strftime
 import posixpath
 import os
 
 import six
 
+from ipalib import api
+from ipalib import errors
 from ipalib import util
-from ipalib import Bool
+from ipalib import Bool, Flag, Str
 from ipalib.plugins.baseuser import (
     baseuser,
     baseuser_add,
@@ -45,13 +48,21 @@ from ipalib.plugins.baseuser import (
     baseuser_remove_manager)
 from ipalib.plugins.idviews import remove_ipaobject_overrides
 from ipalib.plugable import Registry
-from ipalib.plugins.baseldap import *
+from ipalib.plugins.baseldap import (
+    pkey_to_value,
+    LDAPCreate,
+    LDAPSearch,
+    LDAPQuery,
+    LDAPMultiQuery,
+    LDAPAddAttribute,
+    LDAPRemoveAttribute)
 from ipalib.plugins import baseldap
 from ipalib.request import context
 from ipalib import _, ngettext
 from ipalib import output
 from ipalib import x509
 from ipaplatform.paths import paths
+from ipapython.dn import DN
 from ipapython.ipautil import ipa_generate_password
 from ipalib.capabilities import client_has_capability
 
diff --git a/ipalib/session.py b/ipalib/session.py
index 8815268c5..d04b660bd 100644
--- a/ipalib/session.py
+++ b/ipalib/session.py
@@ -26,10 +26,12 @@ from six.moves.urllib.parse import urlparse
 
 from ipalib import errors
 from ipalib.text import _
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger, log_mgr
 from ipalib import api, errors
 from ipaplatform.paths import paths
-from ipalib.krb_utils import *
+from ipalib.krb_utils import (
+    krb5_parse_ccache,
+    krb5_unparse_ccache)
 from ipapython.cookie import Cookie
 
 __doc__ = '''
diff --git a/ipapython/certmonger.py b/ipapython/certmonger.py
index 17c20f9f0..f89ca0b7a 100644
--- a/ipapython/certmonger.py
+++ b/ipapython/certmonger.py
@@ -31,7 +31,7 @@ import dbus
 import shlex
 import subprocess
 import tempfile
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger
 from ipaplatform.paths import paths
 from ipaplatform import services
 
diff --git a/ipapython/dogtag.py b/ipapython/dogtag.py
index 9c8779ead..010e49652 100644
--- a/ipapython/dogtag.py
+++ b/ipapython/dogtag.py
@@ -28,7 +28,7 @@ from ipalib import api, errors
 from ipalib.errors import NetworkError
 from ipalib.text import _
 from ipapython import nsslib, ipautil
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger
 
 # Python 3 rename. The package is available in "six.moves.http_client", but
 # pylint cannot handle classes from that alias
diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py
index a0e34e298..7949bdf05 100644
--- a/ipapython/ipautil.py
+++ b/ipapython/ipautil.py
@@ -46,7 +46,7 @@ import six
 from six.moves import input
 from six.moves import urllib
 
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger
 from ipapython import config
 from ipaplatform.paths import paths
 from ipapython.dn import DN
diff --git a/ipapython/nsslib.py b/ipapython/nsslib.py
index 3c776ae0e..ff4c02328 100644
--- a/ipapython/nsslib.py
+++ b/ipapython/nsslib.py
@@ -22,7 +22,7 @@ from __future__ import print_function
 
 import getpass
 import socket
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger
 
 from nss.error import NSPRError
 import nss.io as io
diff --git a/ipapython/sysrestore.py b/ipapython/sysrestore.py
index 93f39fa85..65ef5da89 100644
--- a/ipapython/sysrestore.py
+++ b/ipapython/sysrestore.py
@@ -26,7 +26,7 @@
 import os
 import os.path
 import shutil
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger
 import random
 import string
 
diff --git a/ipaserver/dcerpc.py b/ipaserver/dcerpc.py
index 1f84e6e8e..32e1ab5a8 100644
--- a/ipaserver/dcerpc.py
+++ b/ipaserver/dcerpc.py
@@ -22,11 +22,13 @@
 # Make sure we only run this module at the server where samba4-python
 # package is installed to avoid issues with unavailable modules
 
-from ipalib.plugins.baseldap import *
+import re
+import time
+
 from ipalib import api, _
 from ipalib import errors
 from ipapython import ipautil
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger
 from ipapython.dn import DN
 from ipaserver.install import installutils
 from ipalib.util import normalize_name
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py
index d679bbc89..6c0d73015 100644
--- a/ipaserver/install/bindinstance.py
+++ b/ipaserver/install/bindinstance.py
@@ -34,7 +34,7 @@ from ipaserver.install import installutils
 from ipaserver.install import service
 from ipaserver.install.cainstance import IPA_CA_RECORD
 from ipapython import sysrestore, ipautil, ipaldap
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger
 from ipapython.dn import DN
 import ipalib
 from ipalib import api, errors
diff --git a/ipaserver/install/dnskeysyncinstance.py b/ipaserver/install/dnskeysyncinstance.py
index f2a976eec..ecf513e2d 100644
--- a/ipaserver/install/dnskeysyncinstance.py
+++ b/ipaserver/install/dnskeysyncinstance.py
@@ -17,7 +17,7 @@ import _ipap11helper
 from ipapython.dnsutil import DNSName
 from ipaserver.install import service
 from ipaserver.install import installutils
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger
 from ipapython.dn import DN
 from ipapython import ipaldap
 from ipapython import sysrestore, ipautil
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index a58b0f7c2..98ad24f73 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -31,7 +31,7 @@ import stat
 
 import ldap
 
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger
 from ipapython import ipautil, sysrestore, ipaldap
 from ipaserver.install import service
 from ipaserver.install import installutils
diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py
index 1118ddafb..c0a78cb15 100644
--- a/ipaserver/install/krbinstance.py
+++ b/ipaserver/install/krbinstance.py
@@ -32,7 +32,7 @@ from ipapython import sysrestore
 from ipapython import ipautil
 from ipapython import kernel_keyring
 from ipalib.constants import CACERT
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger
 from ipapython.dn import DN
 
 from ipaserver.install import replication
diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py
index 528e52bbd..285251363 100644
--- a/ipaserver/install/ldapupdate.py
+++ b/ipaserver/install/ldapupdate.py
@@ -41,7 +41,7 @@ from ipalib import constants
 from ipaplatform.paths import paths
 from ipaplatform import services
 from ipapython.dn import DN
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import log_mgr
 from ipapython.ipautil import wait_for_open_socket
 
 UPDATES_DIR=paths.UPDATES_DIR
diff --git a/ipaserver/install/ntpinstance.py b/ipaserver/install/ntpinstance.py
index 567dec6e9..239fdf5c0 100644
--- a/ipaserver/install/ntpinstance.py
+++ b/ipaserver/install/ntpinstance.py
@@ -23,7 +23,7 @@ from ipapython import sysrestore
 from ipapython import ipautil
 from ipaplatform.constants import constants
 from ipaplatform.paths import paths
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger
 
 NTPD_OPTS_VAR = constants.NTPD_OPTS_VAR
 NTPD_OPTS_QUOTE = constants.NTPD_OPTS_QUOTE
diff --git a/ipaserver/install/odsexporterinstance.py b/ipaserver/install/odsexporterinstance.py
index 2d072cc93..f50c21452 100644
--- a/ipaserver/install/odsexporterinstance.py
+++ b/ipaserver/install/odsexporterinstance.py
@@ -10,7 +10,7 @@ import ldap
 
 from ipaserver.install import service
 from ipaserver.install import installutils
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger
 from ipapython.dn import DN
 from ipapython import sysrestore, ipautil, ipaldap
 from ipaplatform.paths import paths
diff --git a/ipaserver/install/opendnssecinstance.py b/ipaserver/install/opendnssecinstance.py
index 357908fb4..eebaeccb3 100644
--- a/ipaserver/install/opendnssecinstance.py
+++ b/ipaserver/install/opendnssecinstance.py
@@ -12,7 +12,7 @@ from subprocess import CalledProcessError
 import _ipap11helper
 from ipaserver.install import service
 from ipaserver.install import installutils
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger
 from ipapython.dn import DN
 from ipapython import sysrestore, ipautil, ipaldap, p11helper
 from ipaplatform import services
diff --git a/ipaserver/install/plugins/adtrust.py b/ipaserver/install/plugins/adtrust.py
index d96bfe83e..df9412adb 100644
--- a/ipaserver/install/plugins/adtrust.py
+++ b/ipaserver/install/plugins/adtrust.py
@@ -20,7 +20,7 @@
 from ipalib import api, errors
 from ipalib import Updater
 from ipapython.dn import DN
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger
 
 DEFAULT_ID_RANGE_SIZE = 200000
 
diff --git a/ipaserver/install/plugins/dns.py b/ipaserver/install/plugins/dns.py
index 646ed23f3..79ff9c9ac 100644
--- a/ipaserver/install/plugins/dns.py
+++ b/ipaserver/install/plugins/dns.py
@@ -27,7 +27,7 @@ from ipalib import api, errors, util
 from ipalib import Updater
 from ipapython.dn import DN
 from ipalib.plugins.dns import dns_container_exists
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger
 
 
 class update_dnszones(Updater):
diff --git a/ipaserver/install/plugins/update_idranges.py b/ipaserver/install/plugins/update_idranges.py
index 9a005b8a4..167617271 100644
--- a/ipaserver/install/plugins/update_idranges.py
+++ b/ipaserver/install/plugins/update_idranges.py
@@ -20,7 +20,7 @@
 from ipalib import api, errors
 from ipalib import Updater
 from ipapython.dn import DN
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger
 
 
 class update_idrange_type(Updater):
diff --git a/ipaserver/install/plugins/update_services.py b/ipaserver/install/plugins/update_services.py
index c52d3c45c..853797363 100644
--- a/ipaserver/install/plugins/update_services.py
+++ b/ipaserver/install/plugins/update_services.py
@@ -20,7 +20,7 @@
 from ipalib import api, errors
 from ipalib import Updater
 from ipapython.dn import DN
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger
 
 
 class update_service_principalalias(Updater):
diff --git a/ipaserver/install/plugins/update_uniqueness.py b/ipaserver/install/plugins/update_uniqueness.py
index c162ad3f8..b4c0c81a0 100644
--- a/ipaserver/install/plugins/update_uniqueness.py
+++ b/ipaserver/install/plugins/update_uniqueness.py
@@ -20,7 +20,7 @@
 from ipalib import api, errors
 from ipalib import Updater
 from ipapython.dn import DN
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger
 
 
 class update_uniqueness_plugins_to_new_syntax(Updater):
diff --git a/ipaserver/install/replication.py b/ipaserver/install/replication.py
index 761287d70..03965a278 100644
--- a/ipaserver/install/replication.py
+++ b/ipaserver/install/replication.py
@@ -30,7 +30,7 @@ import ldap
 from ipalib import api, errors
 from ipalib.constants import CACERT
 from ipalib.util import create_topology_graph, get_topology_connection_errors
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger
 from ipapython import ipautil, ipaldap
 from ipapython.dn import DN
 from ipaplatform import services
diff --git a/ipaserver/install/server/upgrade.py b/ipaserver/install/server/upgrade.py
index 8ac235593..f37a8fea5 100644
--- a/ipaserver/install/server/upgrade.py
+++ b/ipaserver/install/server/upgrade.py
@@ -22,7 +22,7 @@ from ipaplatform import services
 from ipaplatform.tasks import tasks
 from ipapython import ipautil, sysrestore, version, certdb
 from ipapython import ipaldap
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger
 from ipapython import certmonger
 from ipapython.dn import DN
 from ipaplatform.paths import paths
diff --git a/ipaserver/install/service.py b/ipaserver/install/service.py
index 2f2e29ee8..c77a4cc46 100644
--- a/ipaserver/install/service.py
+++ b/ipaserver/install/service.py
@@ -25,7 +25,7 @@ import traceback
 
 from ipapython import sysrestore, ipautil, ipaldap
 from ipapython.dn import DN
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger
 from ipalib import api, errors, certstore
 from ipaplatform import services
 from ipaplatform.paths import paths
diff --git a/ipaserver/install/sysupgrade.py b/ipaserver/install/sysupgrade.py
index 7d1b929a2..1eba38cd0 100644
--- a/ipaserver/install/sysupgrade.py
+++ b/ipaserver/install/sysupgrade.py
@@ -22,7 +22,7 @@ import os.path
 
 from ipapython import sysrestore
 from ipaplatform.paths import paths
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger
 
 STATEFILE_FILE = 'sysupgrade.state'
 
diff --git a/ipaserver/install/upgradeinstance.py b/ipaserver/install/upgradeinstance.py
index 12737ed11..81e3beb8e 100644
--- a/ipaserver/install/upgradeinstance.py
+++ b/ipaserver/install/upgradeinstance.py
@@ -23,7 +23,7 @@ import random
 import traceback
 from ipaplatform.paths import paths
 from ipaplatform import services
-from ipapython.ipa_log_manager import *
+from ipapython.ipa_log_manager import root_logger
 
 from ipaserver.install import installutils
 from ipaserver.install import schemaupdate
diff --git a/ipatests/test_ipapython/test_dn.py b/ipatests/test_ipapython/test_dn.py
index eb763b3a6..e1784bce8 100644
--- a/ipatests/test_ipapython/test_dn.py
+++ b/ipatests/test_ipapython/test_dn.py
@@ -1,7 +1,6 @@
 import contextlib
 import unittest
 import pytest
-from ipapython.dn import *  # FIXME
 
 import six
 
diff --git a/make-lint b/make-lint
index 04e985d52..3da9a6879 100755
--- a/make-lint
+++ b/make-lint
@@ -243,6 +243,7 @@ def main():
         linter.set_option('enable', 'F')
         linter.set_option('enable', 'E')
         linter.set_option('enable', 'unused-import')
+        linter.set_option('enable', 'unused-wildcard-import')
 
     linter.set_reporter(TextReporter())
     linter.set_option('msg-template',