mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Remove unused imports
This patch removes unused imports, alse pylint has been configured to check unused imports. Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
committed by
Jan Cholasta
parent
774d0eaa8e
commit
e4075b1fe2
@@ -38,7 +38,7 @@ parent = path.dirname(path.dirname(path.abspath(__file__)))
|
|||||||
sys.path.insert(0, parent)
|
sys.path.insert(0, parent)
|
||||||
verbose = True
|
verbose = True
|
||||||
|
|
||||||
from base64 import b64encode, b64decode
|
from base64 import b64decode
|
||||||
from ipalib import api
|
from ipalib import api
|
||||||
|
|
||||||
subject = u'CN=vm-070.idm.lab.bos.redhat.com'
|
subject = u'CN=vm-070.idm.lab.bos.redhat.com'
|
||||||
|
@@ -25,7 +25,6 @@ import sys
|
|||||||
import os
|
import os
|
||||||
import string
|
import string
|
||||||
import shutil
|
import shutil
|
||||||
import socket
|
|
||||||
from ipapython.ipa_log_manager import *
|
from ipapython.ipa_log_manager import *
|
||||||
from optparse import OptionParser
|
from optparse import OptionParser
|
||||||
import ipachangeconf
|
import ipachangeconf
|
||||||
|
@@ -19,8 +19,6 @@
|
|||||||
|
|
||||||
import fcntl
|
import fcntl
|
||||||
import os
|
import os
|
||||||
import string
|
|
||||||
import time
|
|
||||||
import shutil
|
import shutil
|
||||||
|
|
||||||
def openLocked(filename, perms):
|
def openLocked(filename, perms):
|
||||||
|
@@ -25,7 +25,6 @@ DOCLINES = __doc__.split("\n")
|
|||||||
|
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
import distutils.sysconfig
|
|
||||||
|
|
||||||
CLASSIFIERS = """\
|
CLASSIFIERS = """\
|
||||||
Development Status :: 4 - Beta
|
Development Status :: 4 - Beta
|
||||||
|
@@ -9,19 +9,10 @@ This program should be run only on replicas, not on DNSSEC masters.
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
from binascii import hexlify
|
from binascii import hexlify
|
||||||
from datetime import datetime
|
|
||||||
import dns.dnssec
|
|
||||||
import fcntl
|
|
||||||
from gssapi.exceptions import GSSError
|
from gssapi.exceptions import GSSError
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
from pprint import pprint
|
|
||||||
import subprocess
|
|
||||||
import socket
|
|
||||||
import sys
|
import sys
|
||||||
import systemd.daemon
|
|
||||||
import systemd.journal
|
|
||||||
import time
|
|
||||||
|
|
||||||
import ipalib
|
import ipalib
|
||||||
from ipapython.dn import DN
|
from ipapython.dn import DN
|
||||||
@@ -33,7 +24,6 @@ from ipaplatform.paths import paths
|
|||||||
from ipapython.dnssec.abshsm import sync_pkcs11_metadata, ldap2p11helper_api_params, wrappingmech_name2id
|
from ipapython.dnssec.abshsm import sync_pkcs11_metadata, ldap2p11helper_api_params, wrappingmech_name2id
|
||||||
from ipapython.dnssec.ldapkeydb import LdapKeyDB
|
from ipapython.dnssec.ldapkeydb import LdapKeyDB
|
||||||
from ipapython.dnssec.localhsm import LocalHSM
|
from ipapython.dnssec.localhsm import LocalHSM
|
||||||
import _ipap11helper
|
|
||||||
|
|
||||||
DAEMONNAME = 'ipa-dnskeysyncd'
|
DAEMONNAME = 'ipa-dnskeysyncd'
|
||||||
PRINCIPAL = None # not initialized yet
|
PRINCIPAL = None # not initialized yet
|
||||||
|
@@ -6,10 +6,8 @@
|
|||||||
import sys
|
import sys
|
||||||
import ldap
|
import ldap
|
||||||
import ldapurl
|
import ldapurl
|
||||||
import logging
|
|
||||||
import os
|
import os
|
||||||
import signal
|
import signal
|
||||||
import systemd.journal
|
|
||||||
import time
|
import time
|
||||||
|
|
||||||
from ipalib import api
|
from ipalib import api
|
||||||
|
@@ -24,18 +24,15 @@ import fcntl
|
|||||||
from gssapi.exceptions import GSSError
|
from gssapi.exceptions import GSSError
|
||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
import subprocess
|
|
||||||
import socket
|
import socket
|
||||||
import select
|
import select
|
||||||
import sys
|
import sys
|
||||||
import systemd.daemon
|
import systemd.daemon
|
||||||
import systemd.journal
|
import systemd.journal
|
||||||
import sqlite3
|
import sqlite3
|
||||||
import time
|
|
||||||
|
|
||||||
import ipalib
|
import ipalib
|
||||||
from ipapython.dn import DN
|
from ipapython.dn import DN
|
||||||
from ipapython.ipa_log_manager import root_logger, standard_logging_setup
|
|
||||||
from ipapython import ipaldap
|
from ipapython import ipaldap
|
||||||
from ipapython import ipautil
|
from ipapython import ipautil
|
||||||
from ipaplatform.paths import paths
|
from ipaplatform.paths import paths
|
||||||
@@ -43,7 +40,6 @@ from ipaplatform.paths import paths
|
|||||||
from ipapython.dnssec.abshsm import sync_pkcs11_metadata, wrappingmech_name2id
|
from ipapython.dnssec.abshsm import sync_pkcs11_metadata, wrappingmech_name2id
|
||||||
from ipapython.dnssec.ldapkeydb import LdapKeyDB
|
from ipapython.dnssec.ldapkeydb import LdapKeyDB
|
||||||
from ipapython.dnssec.localhsm import LocalHSM
|
from ipapython.dnssec.localhsm import LocalHSM
|
||||||
import _ipap11helper
|
|
||||||
|
|
||||||
DAEMONNAME = 'ipa-ods-exporter'
|
DAEMONNAME = 'ipa-ods-exporter'
|
||||||
PRINCIPAL = None # not initialized yet
|
PRINCIPAL = None # not initialized yet
|
||||||
|
@@ -27,9 +27,8 @@ Example plugins
|
|||||||
|
|
||||||
# First, let's import some stuff.
|
# First, let's import some stuff.
|
||||||
|
|
||||||
# api is an object containing references to all plugins and useful classes.
|
|
||||||
# errors is a module containing all IPA specific exceptions.
|
# errors is a module containing all IPA specific exceptions.
|
||||||
from ipalib import api, errors
|
from ipalib import errors
|
||||||
# Command is the base class for command plugin.
|
# Command is the base class for command plugin.
|
||||||
from ipalib import Command
|
from ipalib import Command
|
||||||
# Str is a subclass of Param, it is used to define string parameters for
|
# Str is a subclass of Param, it is used to define string parameters for
|
||||||
|
@@ -25,11 +25,9 @@ import errno
|
|||||||
from wsgiref.util import request_uri
|
from wsgiref.util import request_uri
|
||||||
|
|
||||||
from ipapython.ipa_log_manager import root_logger
|
from ipapython.ipa_log_manager import root_logger
|
||||||
from ipapython.ipautil import get_ipa_basedn
|
|
||||||
from ipapython.dn import DN
|
from ipapython.dn import DN
|
||||||
from ipapython.ipaldap import IPAdmin
|
from ipapython.ipaldap import IPAdmin
|
||||||
from ipalib import errors, create_api
|
from ipalib import errors, create_api
|
||||||
from ipaplatform.paths import paths
|
|
||||||
|
|
||||||
|
|
||||||
def wsgi_redirect(start_response, loc):
|
def wsgi_redirect(start_response, loc):
|
||||||
|
@@ -19,7 +19,6 @@
|
|||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
import sys
|
|
||||||
import syslog
|
import syslog
|
||||||
import traceback
|
import traceback
|
||||||
from ipalib import api
|
from ipalib import api
|
||||||
|
@@ -17,7 +17,7 @@ import shutil
|
|||||||
|
|
||||||
from hashlib import sha1
|
from hashlib import sha1
|
||||||
|
|
||||||
from ipapython import ipautil, dogtag
|
from ipapython import ipautil
|
||||||
from ipapython.ipa_log_manager import root_logger, standard_logging_setup
|
from ipapython.ipa_log_manager import root_logger, standard_logging_setup
|
||||||
from ipaserver.install.dsinstance import DS_USER, schema_dirname
|
from ipaserver.install.dsinstance import DS_USER, schema_dirname
|
||||||
from ipaserver.install.cainstance import PKI_USER
|
from ipaserver.install.cainstance import PKI_USER
|
||||||
|
@@ -24,7 +24,6 @@
|
|||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
|
|
||||||
import six
|
import six
|
||||||
import gssapi
|
|
||||||
|
|
||||||
from ipaserver.install import adtrustinstance
|
from ipaserver.install import adtrustinstance
|
||||||
from ipaserver.install.installutils import *
|
from ipaserver.install.installutils import *
|
||||||
|
@@ -27,7 +27,7 @@ try:
|
|||||||
from optparse import OptionParser
|
from optparse import OptionParser
|
||||||
from ipapython import ipautil, config
|
from ipapython import ipautil, config
|
||||||
from ipaserver.install import installutils
|
from ipaserver.install import installutils
|
||||||
from ipaserver.install.ldapupdate import LDAPUpdate, BadSyntax
|
from ipaserver.install.ldapupdate import LDAPUpdate
|
||||||
from ipaserver.plugins.ldap2 import ldap2
|
from ipaserver.plugins.ldap2 import ldap2
|
||||||
from ipalib import api, errors
|
from ipalib import api, errors
|
||||||
from ipapython.ipa_log_manager import *
|
from ipapython.ipa_log_manager import *
|
||||||
|
@@ -31,7 +31,7 @@ from ipaserver.install import (replication, installutils, bindinstance,
|
|||||||
from ipalib import api, errors
|
from ipalib import api, errors
|
||||||
from ipalib.constants import CACERT
|
from ipalib.constants import CACERT
|
||||||
from ipalib.util import has_managed_topology
|
from ipalib.util import has_managed_topology
|
||||||
from ipapython import ipautil, ipaldap, version, dogtag
|
from ipapython import ipautil, ipaldap, version
|
||||||
from ipapython.dn import DN
|
from ipapython.dn import DN
|
||||||
|
|
||||||
# dict of command name and tuples of min/max num of args needed
|
# dict of command name and tuples of min/max num of args needed
|
||||||
|
@@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
|
|
||||||
from optparse import OptionGroup, SUPPRESS_HELP
|
from optparse import SUPPRESS_HELP
|
||||||
|
|
||||||
from ipaserver.install import bindinstance, httpinstance
|
from ipaserver.install import bindinstance, httpinstance
|
||||||
from ipaserver.install.installutils import *
|
from ipaserver.install.installutils import *
|
||||||
|
@@ -24,7 +24,7 @@ import re
|
|||||||
import sys
|
import sys
|
||||||
from optparse import OptionParser
|
from optparse import OptionParser
|
||||||
|
|
||||||
from ipapython import ipautil, config, ipaldap
|
from ipapython import config, ipaldap
|
||||||
from ipaserver.install import installutils
|
from ipaserver.install import installutils
|
||||||
from ipalib import api, errors
|
from ipalib import api, errors
|
||||||
from ipalib.constants import CACERT
|
from ipalib.constants import CACERT
|
||||||
|
@@ -28,7 +28,7 @@ try:
|
|||||||
from optparse import OptionParser
|
from optparse import OptionParser
|
||||||
from ipapython import ipautil, config
|
from ipapython import ipautil, config
|
||||||
from ipaserver.install import installutils
|
from ipaserver.install import installutils
|
||||||
from ipaserver.install.ldapupdate import LDAPUpdate, BadSyntax
|
from ipaserver.install.ldapupdate import LDAPUpdate
|
||||||
from ipaserver.plugins.ldap2 import ldap2
|
from ipaserver.plugins.ldap2 import ldap2
|
||||||
from ipalib import api, errors
|
from ipalib import api, errors
|
||||||
from ipapython.ipa_log_manager import *
|
from ipapython.ipa_log_manager import *
|
||||||
|
@@ -19,7 +19,6 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
from ipaserver.install.ipa_otptoken_import import OTPTokenImport
|
from ipaserver.install.ipa_otptoken_import import OTPTokenImport
|
||||||
import nss.nss as nss
|
|
||||||
|
|
||||||
OTPTokenImport.run_cli()
|
OTPTokenImport.run_cli()
|
||||||
|
|
||||||
|
@@ -23,7 +23,6 @@ from __future__ import print_function
|
|||||||
from ipapython.config import IPAOptionParser
|
from ipapython.config import IPAOptionParser
|
||||||
from ipapython import version
|
from ipapython import version
|
||||||
from ipapython import ipautil, certdb
|
from ipapython import ipautil, certdb
|
||||||
from ipapython.ipautil import CalledProcessError
|
|
||||||
from ipalib import api, errors, x509
|
from ipalib import api, errors, x509
|
||||||
from ipaserver.install import installutils
|
from ipaserver.install import installutils
|
||||||
import ipaclient.ipachangeconf
|
import ipaclient.ipachangeconf
|
||||||
|
@@ -24,7 +24,6 @@ import sys
|
|||||||
import os
|
import os
|
||||||
|
|
||||||
import re
|
import re
|
||||||
import traceback
|
|
||||||
import ldap
|
import ldap
|
||||||
import socket
|
import socket
|
||||||
import time
|
import time
|
||||||
@@ -36,10 +35,9 @@ from ipaserver.install import replication, dsinstance, installutils
|
|||||||
from ipaserver.install import bindinstance, cainstance, certs
|
from ipaserver.install import bindinstance, cainstance, certs
|
||||||
from ipaserver.install import opendnssecinstance, dnskeysyncinstance
|
from ipaserver.install import opendnssecinstance, dnskeysyncinstance
|
||||||
from ipapython import version, ipaldap
|
from ipapython import version, ipaldap
|
||||||
from ipalib import api, errors, util
|
from ipalib import api, errors
|
||||||
from ipalib.constants import CACERT
|
from ipalib.constants import CACERT
|
||||||
from ipalib.util import (create_topology_graph,
|
from ipalib.util import has_managed_topology
|
||||||
get_topology_connection_errors, has_managed_topology)
|
|
||||||
from ipapython.ipa_log_manager import *
|
from ipapython.ipa_log_manager import *
|
||||||
from ipapython.dn import DN
|
from ipapython.dn import DN
|
||||||
from ipapython.config import IPAOptionParser
|
from ipapython.config import IPAOptionParser
|
||||||
|
@@ -32,7 +32,7 @@ from ipaserver.install.installutils import is_ipa_configured, ScriptError
|
|||||||
from ipalib import api, errors
|
from ipalib import api, errors
|
||||||
from ipapython.ipaldap import IPAdmin
|
from ipapython.ipaldap import IPAdmin
|
||||||
from ipapython.ipautil import wait_for_open_ports, wait_for_open_socket
|
from ipapython.ipautil import wait_for_open_ports, wait_for_open_socket
|
||||||
from ipapython import config, dogtag
|
from ipapython import config
|
||||||
from ipaplatform.tasks import tasks
|
from ipaplatform.tasks import tasks
|
||||||
from ipapython.dn import DN
|
from ipapython.dn import DN
|
||||||
from ipaplatform import services
|
from ipaplatform import services
|
||||||
|
1
ipa
1
ipa
@@ -25,7 +25,6 @@ Command Line Interface for IPA administration.
|
|||||||
The CLI functionality is implemented in ipalib/cli.py
|
The CLI functionality is implemented in ipalib/cli.py
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import sys
|
|
||||||
from ipalib import api, cli
|
from ipalib import api, cli
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
@@ -31,7 +31,6 @@ try:
|
|||||||
import getpass
|
import getpass
|
||||||
from six.moves.configparser import RawConfigParser
|
from six.moves.configparser import RawConfigParser
|
||||||
from optparse import SUPPRESS_HELP, OptionGroup, OptionValueError
|
from optparse import SUPPRESS_HELP, OptionGroup, OptionValueError
|
||||||
import shutil
|
|
||||||
import dns
|
import dns
|
||||||
import gssapi
|
import gssapi
|
||||||
|
|
||||||
|
@@ -20,8 +20,6 @@
|
|||||||
|
|
||||||
import fcntl
|
import fcntl
|
||||||
import os
|
import os
|
||||||
import string
|
|
||||||
import time
|
|
||||||
import shutil
|
import shutil
|
||||||
|
|
||||||
import six
|
import six
|
||||||
|
@@ -18,8 +18,6 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
import socket
|
import socket
|
||||||
import os
|
|
||||||
import tempfile
|
|
||||||
|
|
||||||
from ipapython.ipa_log_manager import root_logger
|
from ipapython.ipa_log_manager import root_logger
|
||||||
from dns import resolver, rdatatype
|
from dns import resolver, rdatatype
|
||||||
|
@@ -41,7 +41,7 @@ if six.PY3:
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
#pylint: disable=F0401
|
#pylint: disable=F0401
|
||||||
import default_encoding_utf8
|
import default_encoding_utf8 # pylint: disable=unused-import
|
||||||
except ImportError:
|
except ImportError:
|
||||||
# This is a chicken-and-egg problem. The api can't be imported unless
|
# This is a chicken-and-egg problem. The api can't be imported unless
|
||||||
# this is already installed and since it is installed with IPA therein
|
# this is already installed and since it is installed with IPA therein
|
||||||
@@ -59,8 +59,7 @@ from ipalib.errors import (PublicError, CommandError, HelpError, InternalError,
|
|||||||
from ipalib.constants import CLI_TAB, LDAP_GENERALIZED_TIME_FORMAT
|
from ipalib.constants import CLI_TAB, LDAP_GENERALIZED_TIME_FORMAT
|
||||||
from ipalib.parameters import File, Str, Enum, Any, Flag
|
from ipalib.parameters import File, Str, Enum, Any, Flag
|
||||||
from ipalib.text import _
|
from ipalib.text import _
|
||||||
from ipalib import api
|
from ipalib import api # pylint: disable=unused-import
|
||||||
from ipapython.version import API_VERSION
|
|
||||||
from ipapython.dnsutil import DNSName
|
from ipapython.dnsutil import DNSName
|
||||||
|
|
||||||
import datetime
|
import datetime
|
||||||
|
@@ -119,7 +119,7 @@ For example, compare ``user.params`` with ``user_add.output_params`` and
|
|||||||
Note that the above are all equal.
|
Note that the above are all equal.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from ipalib.frontend import Method, Object
|
from ipalib.frontend import Method
|
||||||
from ipalib import backend
|
from ipalib import backend
|
||||||
from ipalib import parameters
|
from ipalib import parameters
|
||||||
from ipalib import output
|
from ipalib import output
|
||||||
|
@@ -106,7 +106,7 @@ import six
|
|||||||
|
|
||||||
from ipalib.text import ngettext as ungettext
|
from ipalib.text import ngettext as ungettext
|
||||||
from ipalib import messages
|
from ipalib import messages
|
||||||
from ipaplatform.paths import paths
|
from ipaplatform.paths import paths # pylint: disable=unused-import
|
||||||
|
|
||||||
|
|
||||||
class PrivateError(Exception):
|
class PrivateError(Exception):
|
||||||
|
@@ -23,7 +23,6 @@ Base classes for all front-end plugins.
|
|||||||
|
|
||||||
import re
|
import re
|
||||||
from distutils import version
|
from distutils import version
|
||||||
from textwrap import wrap
|
|
||||||
|
|
||||||
import six
|
import six
|
||||||
|
|
||||||
@@ -32,7 +31,8 @@ from ipapython.ipa_log_manager import root_logger
|
|||||||
from ipalib.capabilities import VERSION_WITHOUT_CAPABILITIES
|
from ipalib.capabilities import VERSION_WITHOUT_CAPABILITIES
|
||||||
from ipalib.base import NameSpace
|
from ipalib.base import NameSpace
|
||||||
from ipalib.plugable import Plugin
|
from ipalib.plugable import Plugin
|
||||||
from ipalib.parameters import create_param, Param, Str, Flag, Password
|
from ipalib.parameters import create_param, Param, Str, Flag
|
||||||
|
from ipalib.parameters import Password # pylint: disable=unused-import
|
||||||
from ipalib.output import Output, Entry, ListOfEntries
|
from ipalib.output import Output, Entry, ListOfEntries
|
||||||
from ipalib.text import _
|
from ipalib.text import _
|
||||||
from ipalib.errors import (ZeroArgumentError, MaxArgumentError, OverlapError,
|
from ipalib.errors import (ZeroArgumentError, MaxArgumentError, OverlapError,
|
||||||
|
@@ -20,9 +20,6 @@
|
|||||||
"""
|
"""
|
||||||
Simple description of return values.
|
Simple description of return values.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from inspect import getdoc
|
|
||||||
|
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from ipalib.plugable import ReadOnly, lock
|
from ipalib.plugable import ReadOnly, lock
|
||||||
|
@@ -104,13 +104,12 @@ import decimal
|
|||||||
import base64
|
import base64
|
||||||
import datetime
|
import datetime
|
||||||
from six.moves.xmlrpc_client import MAXINT, MININT
|
from six.moves.xmlrpc_client import MAXINT, MININT
|
||||||
import encodings.idna
|
|
||||||
|
|
||||||
import dns.name
|
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from ipalib.text import _ as ugettext
|
from ipalib.text import _ as ugettext
|
||||||
from ipalib.plugable import ReadOnly, lock, check_name
|
from ipalib.base import check_name
|
||||||
|
from ipalib.plugable import ReadOnly, lock
|
||||||
from ipalib.errors import ConversionError, RequirementError, ValidationError
|
from ipalib.errors import ConversionError, RequirementError, ValidationError
|
||||||
from ipalib.errors import PasswordMismatch, Base64DecodeError
|
from ipalib.errors import PasswordMismatch, Base64DecodeError
|
||||||
from ipalib.constants import TYPE_ERROR, CALLABLE_ERROR, LDAP_GENERALIZED_TIME_FORMAT
|
from ipalib.constants import TYPE_ERROR, CALLABLE_ERROR, LDAP_GENERALIZED_TIME_FORMAT
|
||||||
|
@@ -19,7 +19,6 @@
|
|||||||
|
|
||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
|
|
||||||
import os
|
|
||||||
import sys
|
import sys
|
||||||
import base64
|
import base64
|
||||||
import nss.nss as nss
|
import nss.nss as nss
|
||||||
@@ -27,9 +26,6 @@ from pyasn1.type import univ, char, namedtype, tag
|
|||||||
from pyasn1.codec.der import decoder
|
from pyasn1.codec.der import decoder
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from ipapython import ipautil
|
|
||||||
from ipalib import api
|
|
||||||
|
|
||||||
if six.PY3:
|
if six.PY3:
|
||||||
unicode = str
|
unicode = str
|
||||||
|
|
||||||
|
@@ -25,7 +25,6 @@ you are unfamiliar with this Python feature, see
|
|||||||
http://docs.python.org/ref/sequence-types.html
|
http://docs.python.org/ref/sequence-types.html
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import re
|
|
||||||
import sys
|
import sys
|
||||||
import inspect
|
import inspect
|
||||||
import threading
|
import threading
|
||||||
@@ -42,7 +41,7 @@ from ipalib import errors
|
|||||||
from ipalib.config import Env
|
from ipalib.config import Env
|
||||||
from ipalib import text
|
from ipalib import text
|
||||||
from ipalib.text import _
|
from ipalib.text import _
|
||||||
from ipalib.base import ReadOnly, NameSpace, lock, islocked, check_name
|
from ipalib.base import ReadOnly, NameSpace, lock, islocked
|
||||||
from ipalib.constants import DEFAULT_CONFIG
|
from ipalib.constants import DEFAULT_CONFIG
|
||||||
from ipapython.ipa_log_manager import *
|
from ipapython.ipa_log_manager import *
|
||||||
from ipapython.version import VERSION, API_VERSION
|
from ipapython.version import VERSION, API_VERSION
|
||||||
|
@@ -23,7 +23,6 @@ import os
|
|||||||
import six
|
import six
|
||||||
|
|
||||||
from ipalib import api, errors
|
from ipalib import api, errors
|
||||||
from ipalib import Object, Command
|
|
||||||
from ipalib import Flag, Str, IA5Str
|
from ipalib import Flag, Str, IA5Str
|
||||||
from ipalib.plugable import Registry
|
from ipalib.plugable import Registry
|
||||||
from ipalib.plugins.baseldap import *
|
from ipalib.plugins.baseldap import *
|
||||||
|
@@ -35,7 +35,7 @@ from ipalib import output
|
|||||||
from ipalib.text import _
|
from ipalib.text import _
|
||||||
from ipalib.util import json_serialize, validate_hostname
|
from ipalib.util import json_serialize, validate_hostname
|
||||||
from ipalib.capabilities import client_has_capability
|
from ipalib.capabilities import client_has_capability
|
||||||
from ipapython.dn import DN, RDN
|
from ipapython.dn import DN
|
||||||
from ipapython.version import API_VERSION
|
from ipapython.version import API_VERSION
|
||||||
|
|
||||||
if six.PY3:
|
if six.PY3:
|
||||||
|
@@ -17,10 +17,7 @@
|
|||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
from time import gmtime, strftime
|
|
||||||
import string
|
import string
|
||||||
import posixpath
|
|
||||||
import os
|
|
||||||
|
|
||||||
import six
|
import six
|
||||||
|
|
||||||
@@ -31,14 +28,10 @@ from ipalib.plugins.baseldap import (
|
|||||||
DN, LDAPObject, LDAPCreate, LDAPUpdate, LDAPSearch, LDAPDelete,
|
DN, LDAPObject, LDAPCreate, LDAPUpdate, LDAPSearch, LDAPDelete,
|
||||||
LDAPRetrieve, LDAPAddMember, LDAPRemoveMember)
|
LDAPRetrieve, LDAPAddMember, LDAPRemoveMember)
|
||||||
from ipalib.plugins.service import validate_certificate
|
from ipalib.plugins.service import validate_certificate
|
||||||
from ipalib.plugins import baseldap
|
|
||||||
from ipalib.request import context
|
from ipalib.request import context
|
||||||
from ipalib import _, ngettext
|
from ipalib import _
|
||||||
from ipalib import output
|
|
||||||
from ipaplatform.paths import paths
|
|
||||||
from ipapython.ipautil import ipa_generate_password
|
from ipapython.ipautil import ipa_generate_password
|
||||||
from ipapython.ipavalidate import Email
|
from ipapython.ipavalidate import Email
|
||||||
from ipalib.capabilities import client_has_capability
|
|
||||||
from ipalib.util import (normalize_sshpubkey, validate_sshpubkey,
|
from ipalib.util import (normalize_sshpubkey, validate_sshpubkey,
|
||||||
convert_sshpubkey_post)
|
convert_sshpubkey_post)
|
||||||
|
|
||||||
|
@@ -51,7 +51,6 @@ from ipalib import api, errors
|
|||||||
from ipalib import Command
|
from ipalib import Command
|
||||||
from ipalib.parameters import Str, Any
|
from ipalib.parameters import Str, Any
|
||||||
from ipalib.output import Output
|
from ipalib.output import Output
|
||||||
from ipalib import output
|
|
||||||
from ipalib.text import _
|
from ipalib.text import _
|
||||||
from ipalib.request import context
|
from ipalib.request import context
|
||||||
from ipalib.plugable import Registry
|
from ipalib.plugable import Registry
|
||||||
|
@@ -23,7 +23,7 @@ import os
|
|||||||
import time
|
import time
|
||||||
import binascii
|
import binascii
|
||||||
|
|
||||||
from ipalib import Command, Str, Int, Bytes, Flag, File
|
from ipalib import Command, Str, Int, Flag, File
|
||||||
from ipalib import api
|
from ipalib import api
|
||||||
from ipalib import errors
|
from ipalib import errors
|
||||||
from ipalib import pkcs10
|
from ipalib import pkcs10
|
||||||
@@ -36,8 +36,6 @@ from ipalib.plugins.baseldap import pkey_to_value
|
|||||||
from ipalib.plugins.service import split_any_principal
|
from ipalib.plugins.service import split_any_principal
|
||||||
from ipalib.plugins.certprofile import validate_profile_id
|
from ipalib.plugins.certprofile import validate_profile_id
|
||||||
import ipalib.plugins.caacl
|
import ipalib.plugins.caacl
|
||||||
import base64
|
|
||||||
import traceback
|
|
||||||
from ipalib.text import _
|
from ipalib.text import _
|
||||||
from ipalib.request import context
|
from ipalib.request import context
|
||||||
from ipalib import output
|
from ipalib import output
|
||||||
|
@@ -3,12 +3,10 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
import re
|
import re
|
||||||
from operator import attrgetter
|
|
||||||
|
|
||||||
from ipalib import api, Bool, File, Str
|
from ipalib import api, Bool, File, Str
|
||||||
from ipalib import output, util
|
from ipalib import util
|
||||||
from ipalib.plugable import Registry
|
from ipalib.plugable import Registry
|
||||||
from ipalib.plugins.virtual import VirtualCommand
|
|
||||||
from ipalib.plugins.baseldap import (
|
from ipalib.plugins.baseldap import (
|
||||||
LDAPObject, LDAPSearch, LDAPCreate,
|
LDAPObject, LDAPSearch, LDAPCreate,
|
||||||
LDAPDelete, LDAPUpdate, LDAPRetrieve)
|
LDAPDelete, LDAPUpdate, LDAPRetrieve)
|
||||||
|
@@ -24,7 +24,6 @@ from ipalib.plugable import Registry
|
|||||||
from ipalib.plugins.baseldap import *
|
from ipalib.plugins.baseldap import *
|
||||||
from ipalib.plugins.selinuxusermap import validate_selinuxuser
|
from ipalib.plugins.selinuxusermap import validate_selinuxuser
|
||||||
from ipalib import _
|
from ipalib import _
|
||||||
from ipalib.errors import ValidationError
|
|
||||||
|
|
||||||
# 389-ds attributes that should be skipped in attribute checks
|
# 389-ds attributes that should be skipped in attribute checks
|
||||||
OPERATIONAL_ATTRIBUTES = ('nsaccountlock', 'member', 'memberof',
|
OPERATIONAL_ATTRIBUTES = ('nsaccountlock', 'member', 'memberof',
|
||||||
|
@@ -18,12 +18,11 @@
|
|||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
from ipalib import api, _, ngettext
|
from ipalib import _, ngettext
|
||||||
from ipalib import Flag, Str
|
from ipalib import Str
|
||||||
from ipalib.request import context
|
from ipalib import api, crud
|
||||||
from ipalib import api, crud, errors
|
|
||||||
from ipalib import output
|
from ipalib import output
|
||||||
from ipalib import Object, Command
|
from ipalib import Object
|
||||||
from ipalib.plugable import Registry
|
from ipalib.plugable import Registry
|
||||||
from ipalib.plugins.baseldap import gen_pkey_only_option, pkey_to_value
|
from ipalib.plugins.baseldap import gen_pkey_only_option, pkey_to_value
|
||||||
|
|
||||||
|
@@ -10,7 +10,6 @@ from ipalib import errors
|
|||||||
from ipalib import output
|
from ipalib import output
|
||||||
from ipalib.parameters import Int
|
from ipalib.parameters import Int
|
||||||
from ipalib.plugable import Registry
|
from ipalib.plugable import Registry
|
||||||
from ipalib.plugins.baseldap import LDAPObject, LDAPUpdate, LDAPRetrieve
|
|
||||||
|
|
||||||
from ipapython.dn import DN
|
from ipapython.dn import DN
|
||||||
|
|
||||||
|
@@ -18,7 +18,7 @@
|
|||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
from ipalib import api, errors
|
from ipalib import api, errors
|
||||||
from ipalib import AccessTime, Password, Str, StrEnum, Bool, DeprecatedParam
|
from ipalib import AccessTime, Str, StrEnum, Bool, DeprecatedParam
|
||||||
from ipalib.plugable import Registry
|
from ipalib.plugable import Registry
|
||||||
from ipalib.plugins.baseldap import *
|
from ipalib.plugins.baseldap import *
|
||||||
from ipalib import _, ngettext
|
from ipalib import _, ngettext
|
||||||
|
@@ -17,7 +17,7 @@
|
|||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
from ipalib import api, errors
|
from ipalib import api
|
||||||
from ipalib.plugable import Registry
|
from ipalib.plugable import Registry
|
||||||
from ipalib.plugins.baseldap import *
|
from ipalib.plugins.baseldap import *
|
||||||
from ipalib import _, ngettext
|
from ipalib import _, ngettext
|
||||||
|
@@ -19,8 +19,7 @@
|
|||||||
|
|
||||||
from ipalib import api, errors, output, util
|
from ipalib import api, errors, output, util
|
||||||
from ipalib import Command, Str, Flag, Int, DeprecatedParam
|
from ipalib import Command, Str, Flag, Int, DeprecatedParam
|
||||||
from ipalib.cli import to_cli
|
from ipalib import _
|
||||||
from ipalib import _, ngettext
|
|
||||||
from ipapython.dn import DN
|
from ipapython.dn import DN
|
||||||
from ipalib.plugable import Registry
|
from ipalib.plugable import Registry
|
||||||
if api.env.in_server and api.env.context in ['lite', 'server']:
|
if api.env.in_server and api.env.context in ['lite', 'server']:
|
||||||
|
@@ -18,7 +18,6 @@
|
|||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
from nss.error import NSPRError
|
|
||||||
import string
|
import string
|
||||||
|
|
||||||
import six
|
import six
|
||||||
|
@@ -26,7 +26,6 @@ from __future__ import print_function
|
|||||||
|
|
||||||
import json
|
import json
|
||||||
|
|
||||||
from ipalib import api
|
|
||||||
from ipalib import Command
|
from ipalib import Command
|
||||||
from ipalib import Str
|
from ipalib import Str
|
||||||
from ipalib.output import Output
|
from ipalib.output import Output
|
||||||
|
@@ -18,7 +18,7 @@
|
|||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
import re
|
import re
|
||||||
from ipalib import api, LocalOrRemote, _, ngettext
|
from ipalib import LocalOrRemote, _, ngettext
|
||||||
from ipalib.output import Output, summary
|
from ipalib.output import Output, summary
|
||||||
from ipalib import Flag
|
from ipalib import Flag
|
||||||
from ipalib.plugable import Registry
|
from ipalib.plugable import Registry
|
||||||
|
@@ -23,7 +23,11 @@ from ipalib.plugins.baseldap import DN, LDAPObject, LDAPAddMember, LDAPRemoveMem
|
|||||||
from ipalib.plugins.baseldap import LDAPCreate, LDAPDelete, LDAPUpdate, LDAPSearch, LDAPRetrieve
|
from ipalib.plugins.baseldap import LDAPCreate, LDAPDelete, LDAPUpdate, LDAPSearch, LDAPRetrieve
|
||||||
from ipalib import api, Int, Str, Bool, DateTime, Flag, Bytes, IntEnum, StrEnum, Password, _, ngettext
|
from ipalib import api, Int, Str, Bool, DateTime, Flag, Bytes, IntEnum, StrEnum, Password, _, ngettext
|
||||||
from ipalib.plugable import Registry
|
from ipalib.plugable import Registry
|
||||||
from ipalib.errors import PasswordMismatch, ConversionError, LastMemberError, NotFound, ValidationError
|
from ipalib.errors import (
|
||||||
|
PasswordMismatch,
|
||||||
|
ConversionError,
|
||||||
|
NotFound,
|
||||||
|
ValidationError)
|
||||||
from ipalib.request import context
|
from ipalib.request import context
|
||||||
from ipalib.frontend import Local
|
from ipalib.frontend import Local
|
||||||
from ipaplatform.paths import paths
|
from ipaplatform.paths import paths
|
||||||
|
@@ -23,7 +23,7 @@ from ipalib import Str, Password
|
|||||||
from ipalib import _
|
from ipalib import _
|
||||||
from ipalib import output
|
from ipalib import output
|
||||||
from ipalib.plugable import Registry
|
from ipalib.plugable import Registry
|
||||||
from ipalib.plugins.user import split_principal, validate_principal, normalize_principal
|
from ipalib.plugins.baseuser import validate_principal, normalize_principal
|
||||||
from ipalib.request import context
|
from ipalib.request import context
|
||||||
from ipapython.dn import DN
|
from ipapython.dn import DN
|
||||||
|
|
||||||
|
@@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
from ipalib import Command
|
from ipalib import Command
|
||||||
from ipalib import output
|
from ipalib import output
|
||||||
from ipalib import _, ngettext
|
from ipalib import _
|
||||||
from ipalib.plugable import Registry
|
from ipalib.plugable import Registry
|
||||||
from ipapython.version import VERSION, API_VERSION
|
from ipapython.version import VERSION, API_VERSION
|
||||||
|
|
||||||
|
@@ -18,7 +18,7 @@
|
|||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
from ipalib import api, errors
|
from ipalib import api, errors
|
||||||
from ipalib import Int, Str
|
from ipalib import Str
|
||||||
from ipalib import Object, Command
|
from ipalib import Object, Command
|
||||||
from ipalib import _
|
from ipalib import _
|
||||||
from ipalib.plugable import Registry
|
from ipalib.plugable import Registry
|
||||||
|
@@ -21,8 +21,6 @@
|
|||||||
from ipalib.plugable import Registry
|
from ipalib.plugable import Registry
|
||||||
from ipalib.plugins.baseldap import *
|
from ipalib.plugins.baseldap import *
|
||||||
from ipalib import api, Str, _, ngettext
|
from ipalib import api, Str, _, ngettext
|
||||||
from ipalib import Command
|
|
||||||
from ipalib.plugins import privilege
|
|
||||||
|
|
||||||
__doc__ = _("""
|
__doc__ = _("""
|
||||||
Roles
|
Roles
|
||||||
|
@@ -17,12 +17,11 @@
|
|||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
from ipalib import api, _, ngettext
|
from ipalib import _, ngettext
|
||||||
from ipalib import Flag, Str
|
from ipalib import Str
|
||||||
from ipalib.request import context
|
|
||||||
from ipalib import api, crud, errors
|
from ipalib import api, crud, errors
|
||||||
from ipalib import output
|
from ipalib import output
|
||||||
from ipalib import Object, Command
|
from ipalib import Object
|
||||||
from ipalib.plugable import Registry
|
from ipalib.plugable import Registry
|
||||||
from ipalib.plugins.baseldap import gen_pkey_only_option, pkey_to_value
|
from ipalib.plugins.baseldap import gen_pkey_only_option, pkey_to_value
|
||||||
|
|
||||||
|
@@ -2,9 +2,6 @@
|
|||||||
# Copyright (C) 2015 FreeIPA Contributors see COPYING for license
|
# Copyright (C) 2015 FreeIPA Contributors see COPYING for license
|
||||||
#
|
#
|
||||||
|
|
||||||
import string
|
|
||||||
import os
|
|
||||||
|
|
||||||
import dbus
|
import dbus
|
||||||
import dbus.mainloop.glib
|
import dbus.mainloop.glib
|
||||||
|
|
||||||
@@ -12,7 +9,6 @@ from ipalib import api, crud, errors, messages
|
|||||||
from ipalib import Int, Str
|
from ipalib import Int, Str
|
||||||
from ipalib.plugable import Registry
|
from ipalib.plugable import Registry
|
||||||
from ipalib.plugins.baseldap import *
|
from ipalib.plugins.baseldap import *
|
||||||
from ipalib.plugins import baseldap
|
|
||||||
from ipalib.request import context
|
from ipalib.request import context
|
||||||
from ipalib import _, ngettext
|
from ipalib import _, ngettext
|
||||||
|
|
||||||
|
@@ -19,21 +19,17 @@
|
|||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
import base64
|
|
||||||
import os
|
|
||||||
|
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from ipalib import api, errors, util
|
from ipalib import api, errors
|
||||||
from ipalib import Str, Flag, Bytes, StrEnum, Bool
|
from ipalib import Bytes, StrEnum, Bool
|
||||||
from ipalib.plugable import Registry
|
from ipalib.plugable import Registry
|
||||||
from ipalib.plugins.baseldap import *
|
from ipalib.plugins.baseldap import *
|
||||||
from ipalib import x509
|
from ipalib import x509
|
||||||
from ipalib import _, ngettext
|
from ipalib import _, ngettext
|
||||||
from ipalib import util
|
from ipalib import util
|
||||||
import nss.nss as nss
|
import nss.nss as nss
|
||||||
from nss.error import NSPRError
|
|
||||||
from ipapython.ipautil import file_exists
|
|
||||||
|
|
||||||
if six.PY3:
|
if six.PY3:
|
||||||
unicode = str
|
unicode = str
|
||||||
|
@@ -17,35 +17,40 @@
|
|||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
from time import gmtime, strftime
|
|
||||||
import string
|
|
||||||
import posixpath
|
import posixpath
|
||||||
import os
|
|
||||||
from copy import deepcopy
|
from copy import deepcopy
|
||||||
|
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from ipalib import api, errors
|
from ipalib import api, errors
|
||||||
from ipalib import (Flag, Int, Password, Str, Bool, StrEnum, DateTime,
|
from ipalib import DeprecatedParam
|
||||||
DeprecatedParam)
|
|
||||||
from ipalib.plugable import Registry
|
from ipalib.plugable import Registry
|
||||||
from ipalib.plugins.baseldap import LDAPCreate, LDAPQuery, LDAPSearch, DN, entry_to_dict, pkey_to_value
|
from ipalib.plugins.baseldap import (
|
||||||
|
LDAPCreate,
|
||||||
|
LDAPQuery,
|
||||||
|
DN,
|
||||||
|
entry_to_dict,
|
||||||
|
pkey_to_value)
|
||||||
from ipalib.plugins import baseldap
|
from ipalib.plugins import baseldap
|
||||||
from ipalib.plugins.baseuser import (
|
from ipalib.plugins.baseuser import (
|
||||||
baseuser, baseuser_add, baseuser_del, baseuser_mod, baseuser_find,
|
baseuser,
|
||||||
baseuser_show, NO_UPG_MAGIC, radius_dn2pk, baseuser_pwdchars,
|
baseuser_add,
|
||||||
fix_addressbook_permission_bindrule, normalize_principal,
|
baseuser_del,
|
||||||
validate_principal, baseuser_output_params, status_baseuser_output_params,
|
baseuser_mod,
|
||||||
baseuser_add_manager, baseuser_remove_manager)
|
baseuser_find,
|
||||||
|
baseuser_show,
|
||||||
|
NO_UPG_MAGIC,
|
||||||
|
baseuser_pwdchars,
|
||||||
|
baseuser_output_params,
|
||||||
|
status_baseuser_output_params,
|
||||||
|
baseuser_add_manager,
|
||||||
|
baseuser_remove_manager)
|
||||||
from ipalib.request import context
|
from ipalib.request import context
|
||||||
from ipalib import _, ngettext
|
from ipalib import _, ngettext
|
||||||
from ipalib import output
|
from ipalib import output
|
||||||
from ipaplatform.paths import paths
|
from ipaplatform.paths import paths
|
||||||
from ipapython.ipautil import ipa_generate_password
|
from ipapython.ipautil import ipa_generate_password
|
||||||
from ipapython.ipavalidate import Email
|
|
||||||
from ipalib.capabilities import client_has_capability
|
from ipalib.capabilities import client_has_capability
|
||||||
from ipalib.util import (normalize_sshpubkey, validate_sshpubkey,
|
|
||||||
convert_sshpubkey_post)
|
|
||||||
|
|
||||||
if six.PY3:
|
if six.PY3:
|
||||||
unicode = str
|
unicode = str
|
||||||
|
@@ -17,11 +17,7 @@
|
|||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
import platform
|
from ipalib import api, errors
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
|
|
||||||
from ipalib import api, errors, util
|
|
||||||
from ipalib import Str
|
from ipalib import Str
|
||||||
from ipalib.plugable import Registry
|
from ipalib.plugable import Registry
|
||||||
from ipalib.plugins.baseldap import *
|
from ipalib.plugins.baseldap import *
|
||||||
|
@@ -5,7 +5,7 @@
|
|||||||
import six
|
import six
|
||||||
|
|
||||||
from ipalib import api, errors
|
from ipalib import api, errors
|
||||||
from ipalib import Int, Str, Bool, StrEnum, Flag, DNParam
|
from ipalib import Int, Str, StrEnum, Flag, DNParam
|
||||||
from ipalib.plugable import Registry
|
from ipalib.plugable import Registry
|
||||||
from ipalib.plugins.baseldap import (
|
from ipalib.plugins.baseldap import (
|
||||||
LDAPObject, LDAPSearch, LDAPCreate, LDAPDelete, LDAPUpdate, LDAPQuery,
|
LDAPObject, LDAPSearch, LDAPCreate, LDAPDelete, LDAPUpdate, LDAPQuery,
|
||||||
|
@@ -19,21 +19,30 @@
|
|||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
from time import gmtime, strftime
|
from time import gmtime, strftime
|
||||||
import string
|
|
||||||
import posixpath
|
import posixpath
|
||||||
import os
|
import os
|
||||||
|
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from ipalib import api, errors, util
|
from ipalib import util
|
||||||
from ipalib import Flag, Int, Password, Str, Bool, StrEnum, DateTime
|
from ipalib import Bool
|
||||||
from ipalib.plugins.baseuser import (
|
from ipalib.plugins.baseuser import (
|
||||||
baseuser, baseuser_add, baseuser_del, baseuser_mod, baseuser_find,
|
baseuser,
|
||||||
baseuser_show, NO_UPG_MAGIC, UPG_DEFINITION_DN, baseuser_output_params,
|
baseuser_add,
|
||||||
status_baseuser_output_params, baseuser_pwdchars, validate_nsaccountlock,
|
baseuser_del,
|
||||||
radius_dn2pk, convert_nsaccountlock, split_principal, validate_principal,
|
baseuser_mod,
|
||||||
normalize_principal, fix_addressbook_permission_bindrule,
|
baseuser_find,
|
||||||
baseuser_add_manager, baseuser_remove_manager)
|
baseuser_show,
|
||||||
|
NO_UPG_MAGIC,
|
||||||
|
UPG_DEFINITION_DN,
|
||||||
|
baseuser_output_params,
|
||||||
|
status_baseuser_output_params,
|
||||||
|
baseuser_pwdchars,
|
||||||
|
validate_nsaccountlock,
|
||||||
|
convert_nsaccountlock,
|
||||||
|
fix_addressbook_permission_bindrule,
|
||||||
|
baseuser_add_manager,
|
||||||
|
baseuser_remove_manager)
|
||||||
from ipalib.plugins.idviews import remove_ipaobject_overrides
|
from ipalib.plugins.idviews import remove_ipaobject_overrides
|
||||||
from ipalib.plugable import Registry
|
from ipalib.plugable import Registry
|
||||||
from ipalib.plugins.baseldap import *
|
from ipalib.plugins.baseldap import *
|
||||||
@@ -44,10 +53,8 @@ from ipalib import output
|
|||||||
from ipalib import x509
|
from ipalib import x509
|
||||||
from ipaplatform.paths import paths
|
from ipaplatform.paths import paths
|
||||||
from ipapython.ipautil import ipa_generate_password
|
from ipapython.ipautil import ipa_generate_password
|
||||||
from ipapython.ipavalidate import Email
|
|
||||||
from ipalib.capabilities import client_has_capability
|
from ipalib.capabilities import client_has_capability
|
||||||
from ipalib.util import (normalize_sshpubkey, validate_sshpubkey,
|
|
||||||
convert_sshpubkey_post)
|
|
||||||
if api.env.in_server:
|
if api.env.in_server:
|
||||||
from ipaserver.plugins.ldap2 import ldap2
|
from ipaserver.plugins.ldap2 import ldap2
|
||||||
|
|
||||||
|
@@ -25,7 +25,6 @@ import io
|
|||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
import tempfile
|
|
||||||
|
|
||||||
from cryptography.fernet import Fernet, InvalidToken
|
from cryptography.fernet import Fernet, InvalidToken
|
||||||
from cryptography.hazmat.backends import default_backend
|
from cryptography.hazmat.backends import default_backend
|
||||||
@@ -41,18 +40,17 @@ from ipalib.frontend import Command, Object, Local
|
|||||||
from ipalib import api, errors
|
from ipalib import api, errors
|
||||||
from ipalib import Bytes, Flag, Str, StrEnum
|
from ipalib import Bytes, Flag, Str, StrEnum
|
||||||
from ipalib import output
|
from ipalib import output
|
||||||
from ipalib.crud import PKQuery, Retrieve, Update
|
from ipalib.crud import PKQuery, Retrieve
|
||||||
from ipalib.plugable import Registry
|
from ipalib.plugable import Registry
|
||||||
from ipalib.plugins.baseldap import LDAPObject, LDAPCreate, LDAPDelete,\
|
from ipalib.plugins.baseldap import LDAPObject, LDAPCreate, LDAPDelete,\
|
||||||
LDAPSearch, LDAPUpdate, LDAPRetrieve, LDAPAddMember, LDAPRemoveMember,\
|
LDAPSearch, LDAPUpdate, LDAPRetrieve, LDAPAddMember, LDAPRemoveMember,\
|
||||||
LDAPModMember, pkey_to_value
|
LDAPModMember, pkey_to_value
|
||||||
from ipalib.request import context
|
from ipalib.request import context
|
||||||
from ipalib.plugins.user import split_principal
|
from ipalib.plugins.baseuser import split_principal
|
||||||
from ipalib.plugins.service import normalize_principal
|
from ipalib.plugins.service import normalize_principal
|
||||||
from ipalib import _, ngettext
|
from ipalib import _, ngettext
|
||||||
from ipaplatform.paths import paths
|
from ipaplatform.paths import paths
|
||||||
from ipapython.dn import DN
|
from ipapython.dn import DN
|
||||||
from ipapython.nsslib import current_dbdir
|
|
||||||
|
|
||||||
if api.env.in_server:
|
if api.env.in_server:
|
||||||
import pki.account
|
import pki.account
|
||||||
|
@@ -20,7 +20,6 @@
|
|||||||
"""
|
"""
|
||||||
Base classes for non-LDAP backend plugins.
|
Base classes for non-LDAP backend plugins.
|
||||||
"""
|
"""
|
||||||
from ipalib import api
|
|
||||||
from ipalib import Command
|
from ipalib import Command
|
||||||
from ipalib import errors
|
from ipalib import errors
|
||||||
from ipapython.dn import DN
|
from ipapython.dn import DN
|
||||||
|
@@ -25,7 +25,7 @@ Per-request thread-local data.
|
|||||||
import threading
|
import threading
|
||||||
|
|
||||||
from ipalib.base import ReadOnly, lock
|
from ipalib.base import ReadOnly, lock
|
||||||
from ipalib.constants import OVERRIDE_ERROR, CALLABLE_ERROR
|
from ipalib.constants import CALLABLE_ERROR
|
||||||
|
|
||||||
|
|
||||||
# Thread-local storage of most per-request information
|
# Thread-local storage of most per-request information
|
||||||
|
@@ -31,7 +31,6 @@ Also see the `ipaserver.rpcserver` module.
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
from decimal import Decimal
|
from decimal import Decimal
|
||||||
import sys
|
|
||||||
import datetime
|
import datetime
|
||||||
import os
|
import os
|
||||||
import locale
|
import locale
|
||||||
|
@@ -25,7 +25,6 @@ DOCLINES = __doc__.split("\n")
|
|||||||
|
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
import distutils.sysconfig
|
|
||||||
|
|
||||||
CLASSIFIERS = """\
|
CLASSIFIERS = """\
|
||||||
Intended Audience :: System Environment/Base
|
Intended Audience :: System Environment/Base
|
||||||
|
@@ -112,8 +112,6 @@ For additional details, see `GettextFactory` and `Gettext`, and for plural
|
|||||||
forms, see `NGettextFactory` and `NGettext`.
|
forms, see `NGettextFactory` and `NGettext`.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import threading
|
|
||||||
import locale
|
|
||||||
import gettext
|
import gettext
|
||||||
|
|
||||||
import six
|
import six
|
||||||
|
@@ -22,8 +22,6 @@ Various utility functions.
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import imp
|
|
||||||
import time
|
|
||||||
import socket
|
import socket
|
||||||
import re
|
import re
|
||||||
import decimal
|
import decimal
|
||||||
|
@@ -44,8 +44,6 @@ from pyasn1.type import univ, namedtype, tag
|
|||||||
from pyasn1.codec.der import decoder, encoder
|
from pyasn1.codec.der import decoder, encoder
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from ipapython import ipautil
|
|
||||||
from ipalib import api
|
|
||||||
from ipalib import _
|
from ipalib import _
|
||||||
from ipalib import util
|
from ipalib import util
|
||||||
from ipalib import errors
|
from ipalib import errors
|
||||||
|
@@ -24,7 +24,6 @@ Contains Red Hat OS family-specific service class implementations.
|
|||||||
|
|
||||||
import os
|
import os
|
||||||
import time
|
import time
|
||||||
import xml.dom.minidom
|
|
||||||
import contextlib
|
import contextlib
|
||||||
|
|
||||||
from ipaplatform.tasks import tasks
|
from ipaplatform.tasks import tasks
|
||||||
|
@@ -25,7 +25,6 @@ DOCLINES = __doc__.split("\n")
|
|||||||
|
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
import distutils.sysconfig
|
|
||||||
|
|
||||||
CLASSIFIERS = """\
|
CLASSIFIERS = """\
|
||||||
Development Status :: 4 - Beta
|
Development Status :: 4 - Beta
|
||||||
|
@@ -31,7 +31,6 @@ import dbus
|
|||||||
import shlex
|
import shlex
|
||||||
import subprocess
|
import subprocess
|
||||||
import tempfile
|
import tempfile
|
||||||
from ipapython import ipautil
|
|
||||||
from ipapython.ipa_log_manager import *
|
from ipapython.ipa_log_manager import *
|
||||||
from ipaplatform.paths import paths
|
from ipaplatform.paths import paths
|
||||||
from ipaplatform import services
|
from ipaplatform import services
|
||||||
|
@@ -30,7 +30,7 @@ import dns.name
|
|||||||
from six.moves.urllib.parse import urlsplit
|
from six.moves.urllib.parse import urlsplit
|
||||||
|
|
||||||
import socket
|
import socket
|
||||||
import re
|
|
||||||
|
|
||||||
class IPAConfigError(Exception):
|
class IPAConfigError(Exception):
|
||||||
def __init__(self, msg=''):
|
def __init__(self, msg=''):
|
||||||
|
@@ -18,7 +18,6 @@
|
|||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
import re
|
import re
|
||||||
import time
|
|
||||||
import datetime
|
import datetime
|
||||||
import email.utils
|
import email.utils
|
||||||
from calendar import timegm
|
from calendar import timegm
|
||||||
|
@@ -6,12 +6,9 @@ from datetime import datetime
|
|||||||
import dns.name
|
import dns.name
|
||||||
import errno
|
import errno
|
||||||
import os
|
import os
|
||||||
import logging
|
|
||||||
import shutil
|
import shutil
|
||||||
import stat
|
import stat
|
||||||
import subprocess
|
|
||||||
|
|
||||||
from ipalib import api
|
|
||||||
import ipalib.constants
|
import ipalib.constants
|
||||||
from ipapython.dn import DN
|
from ipapython.dn import DN
|
||||||
from ipapython import ipa_log_manager, ipautil
|
from ipapython import ipa_log_manager, ipautil
|
||||||
|
@@ -2,7 +2,6 @@
|
|||||||
# Copyright (C) 2014 FreeIPA Contributors see COPYING for license
|
# Copyright (C) 2014 FreeIPA Contributors see COPYING for license
|
||||||
#
|
#
|
||||||
|
|
||||||
import logging
|
|
||||||
import ldap.dn
|
import ldap.dn
|
||||||
import os
|
import os
|
||||||
|
|
||||||
|
@@ -4,17 +4,15 @@
|
|||||||
|
|
||||||
from binascii import hexlify
|
from binascii import hexlify
|
||||||
import collections
|
import collections
|
||||||
import sys
|
|
||||||
import time
|
|
||||||
|
|
||||||
import ipalib
|
import ipalib
|
||||||
from ipapython.dn import DN
|
from ipapython.dn import DN
|
||||||
from ipapython import ipaldap
|
|
||||||
from ipapython import ipautil
|
|
||||||
from ipaplatform.paths import paths
|
|
||||||
|
|
||||||
from ipapython.dnssec.abshsm import (attrs_name2id, attrs_id2name, AbstractHSM,
|
from ipapython.dnssec.abshsm import (
|
||||||
bool_attr_names, populate_pkcs11_metadata)
|
attrs_name2id,
|
||||||
|
AbstractHSM,
|
||||||
|
bool_attr_names,
|
||||||
|
populate_pkcs11_metadata)
|
||||||
import _ipap11helper
|
import _ipap11helper
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
|
@@ -10,8 +10,6 @@ import collections
|
|||||||
import logging
|
import logging
|
||||||
import os
|
import os
|
||||||
from pprint import pprint
|
from pprint import pprint
|
||||||
import sys
|
|
||||||
import time
|
|
||||||
|
|
||||||
from ipaplatform.paths import paths
|
from ipaplatform.paths import paths
|
||||||
|
|
||||||
|
@@ -3,10 +3,8 @@
|
|||||||
# Copyright (C) 2014 FreeIPA Contributors see COPYING for license
|
# Copyright (C) 2014 FreeIPA Contributors see COPYING for license
|
||||||
#
|
#
|
||||||
|
|
||||||
import logging
|
|
||||||
from lxml import etree
|
from lxml import etree
|
||||||
import dns.name
|
import dns.name
|
||||||
import subprocess
|
|
||||||
|
|
||||||
from ipapython import ipa_log_manager, ipautil
|
from ipapython import ipa_log_manager, ipautil
|
||||||
|
|
||||||
|
@@ -9,18 +9,11 @@ to a local dict.
|
|||||||
|
|
||||||
# Import the python-ldap modules
|
# Import the python-ldap modules
|
||||||
import ldap
|
import ldap
|
||||||
import ldapurl
|
|
||||||
# Import specific classes from python-ldap
|
# Import specific classes from python-ldap
|
||||||
from ldap.cidict import cidict
|
from ldap.cidict import cidict
|
||||||
from ldap.ldapobject import ReconnectLDAPObject
|
from ldap.ldapobject import ReconnectLDAPObject
|
||||||
from ldap.syncrepl import SyncreplConsumer
|
from ldap.syncrepl import SyncreplConsumer
|
||||||
|
|
||||||
# Import modules from Python standard lib
|
|
||||||
import signal
|
|
||||||
import time
|
|
||||||
import sys
|
|
||||||
import logging
|
|
||||||
|
|
||||||
from ipapython import ipa_log_manager
|
from ipapython import ipa_log_manager
|
||||||
|
|
||||||
|
|
||||||
|
@@ -19,7 +19,6 @@
|
|||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
|
|
||||||
import string
|
|
||||||
import time
|
import time
|
||||||
import datetime
|
import datetime
|
||||||
import shutil
|
import shutil
|
||||||
@@ -33,18 +32,16 @@ import pwd
|
|||||||
import ldap
|
import ldap
|
||||||
import ldap.sasl
|
import ldap.sasl
|
||||||
import ldap.filter
|
import ldap.filter
|
||||||
from ldap.ldapobject import SimpleLDAPObject
|
|
||||||
from ldap.controls import SimplePagedResultsControl
|
from ldap.controls import SimplePagedResultsControl
|
||||||
import ldapurl
|
import ldapurl
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from ipalib import errors, _
|
from ipalib import errors, _
|
||||||
from ipalib.constants import LDAP_GENERALIZED_TIME_FORMAT
|
from ipalib.constants import LDAP_GENERALIZED_TIME_FORMAT
|
||||||
from ipapython import ipautil
|
|
||||||
from ipapython.ipautil import (
|
from ipapython.ipautil import (
|
||||||
format_netloc, wait_for_open_socket, wait_for_open_ports, CIDict)
|
format_netloc, wait_for_open_socket, wait_for_open_ports, CIDict)
|
||||||
from ipapython.ipa_log_manager import log_mgr
|
from ipapython.ipa_log_manager import log_mgr
|
||||||
from ipapython.dn import DN, RDN
|
from ipapython.dn import DN
|
||||||
from ipapython.dnsutil import DNSName
|
from ipapython.dnsutil import DNSName
|
||||||
|
|
||||||
if six.PY3:
|
if six.PY3:
|
||||||
|
@@ -23,12 +23,11 @@ import string
|
|||||||
import tempfile
|
import tempfile
|
||||||
import subprocess
|
import subprocess
|
||||||
import random
|
import random
|
||||||
import os, sys, traceback
|
import os, sys
|
||||||
import copy
|
import copy
|
||||||
import stat
|
import stat
|
||||||
import shutil
|
import shutil
|
||||||
import socket
|
import socket
|
||||||
import struct
|
|
||||||
import re
|
import re
|
||||||
import datetime
|
import datetime
|
||||||
import netaddr
|
import netaddr
|
||||||
@@ -40,14 +39,14 @@ from contextlib import contextmanager
|
|||||||
import locale
|
import locale
|
||||||
import collections
|
import collections
|
||||||
|
|
||||||
from dns import resolver, rdatatype, reversename
|
from dns import resolver, reversename
|
||||||
from dns.exception import DNSException
|
from dns.exception import DNSException
|
||||||
|
|
||||||
import six
|
import six
|
||||||
from six.moves import input
|
from six.moves import input
|
||||||
from six.moves import urllib
|
from six.moves import urllib
|
||||||
|
|
||||||
from ipapython.ipa_log_manager import *
|
from ipapython.ipa_log_manager import *
|
||||||
from ipapython import ipavalidate
|
|
||||||
from ipapython import config
|
from ipapython import config
|
||||||
from ipaplatform.paths import paths
|
from ipaplatform.paths import paths
|
||||||
from ipapython.dn import DN
|
from ipapython.dn import DN
|
||||||
|
@@ -20,7 +20,6 @@
|
|||||||
|
|
||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
|
|
||||||
import sys
|
|
||||||
import getpass
|
import getpass
|
||||||
import socket
|
import socket
|
||||||
from ipapython.ipa_log_manager import *
|
from ipapython.ipa_log_manager import *
|
||||||
@@ -38,8 +37,6 @@ try:
|
|||||||
except ImportError:
|
except ImportError:
|
||||||
import http.client as httplib
|
import http.client as httplib
|
||||||
|
|
||||||
from ipaplatform.paths import paths
|
|
||||||
|
|
||||||
# NSS database currently open
|
# NSS database currently open
|
||||||
current_dbdir = None
|
current_dbdir = None
|
||||||
|
|
||||||
|
@@ -25,7 +25,6 @@ DOCLINES = __doc__.split("\n")
|
|||||||
|
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
import distutils.sysconfig
|
|
||||||
|
|
||||||
CLASSIFIERS = """\
|
CLASSIFIERS = """\
|
||||||
Development Status :: 4 - Beta
|
Development Status :: 4 - Beta
|
||||||
|
@@ -25,7 +25,6 @@ SSH utilities.
|
|||||||
import base64
|
import base64
|
||||||
import re
|
import re
|
||||||
import struct
|
import struct
|
||||||
import binascii
|
|
||||||
from hashlib import md5, sha1
|
from hashlib import md5, sha1
|
||||||
from hashlib import sha256 #pylint: disable=E0611
|
from hashlib import sha256 #pylint: disable=E0611
|
||||||
|
|
||||||
|
@@ -33,7 +33,6 @@ import string
|
|||||||
import six
|
import six
|
||||||
from six.moves.configparser import SafeConfigParser
|
from six.moves.configparser import SafeConfigParser
|
||||||
|
|
||||||
from ipapython import ipautil
|
|
||||||
from ipaplatform.tasks import tasks
|
from ipaplatform.tasks import tasks
|
||||||
from ipaplatform.paths import paths
|
from ipaplatform.paths import paths
|
||||||
|
|
||||||
|
@@ -23,9 +23,7 @@
|
|||||||
# package is installed to avoid issues with unavailable modules
|
# package is installed to avoid issues with unavailable modules
|
||||||
|
|
||||||
from ipalib.plugins.baseldap import *
|
from ipalib.plugins.baseldap import *
|
||||||
from ipalib import api, Str, Password, DefaultFrom, _, ngettext, Object
|
from ipalib import api, _
|
||||||
from ipalib.parameters import Enum
|
|
||||||
from ipalib import Command
|
|
||||||
from ipalib import errors
|
from ipalib import errors
|
||||||
from ipapython import ipautil
|
from ipapython import ipautil
|
||||||
from ipapython.ipa_log_manager import *
|
from ipapython.ipa_log_manager import *
|
||||||
@@ -33,8 +31,7 @@ from ipapython.dn import DN
|
|||||||
from ipaserver.install import installutils
|
from ipaserver.install import installutils
|
||||||
from ipalib.util import normalize_name
|
from ipalib.util import normalize_name
|
||||||
|
|
||||||
import os, string, struct, copy
|
import os, struct
|
||||||
import uuid
|
|
||||||
from samba import param
|
from samba import param
|
||||||
from samba import credentials
|
from samba import credentials
|
||||||
from samba.dcerpc import security, lsa, drsblobs, nbt, netlogon
|
from samba.dcerpc import security, lsa, drsblobs, nbt, netlogon
|
||||||
|
@@ -41,7 +41,6 @@ from ipalib import api, errors
|
|||||||
from ipaplatform import services
|
from ipaplatform import services
|
||||||
from ipaplatform.constants import constants
|
from ipaplatform.constants import constants
|
||||||
from ipaplatform.paths import paths
|
from ipaplatform.paths import paths
|
||||||
from ipaplatform.tasks import tasks
|
|
||||||
from ipalib.util import (validate_zonemgr_str, normalize_zonemgr,
|
from ipalib.util import (validate_zonemgr_str, normalize_zonemgr,
|
||||||
get_dns_forward_zone_update_policy,
|
get_dns_forward_zone_update_policy,
|
||||||
get_dns_reverse_zone_update_policy,
|
get_dns_reverse_zone_update_policy,
|
||||||
|
@@ -5,7 +5,6 @@
|
|||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
import os.path
|
|
||||||
|
|
||||||
from ipaserver.install import cainstance, dsinstance, bindinstance
|
from ipaserver.install import cainstance, dsinstance, bindinstance
|
||||||
from ipapython import ipautil, certdb
|
from ipapython import ipautil, certdb
|
||||||
|
@@ -31,7 +31,6 @@ import pwd
|
|||||||
import re
|
import re
|
||||||
import shutil
|
import shutil
|
||||||
import stat
|
import stat
|
||||||
import subprocess
|
|
||||||
import sys
|
import sys
|
||||||
import syslog
|
import syslog
|
||||||
import time
|
import time
|
||||||
|
@@ -42,7 +42,6 @@ from ipapython.dn import DN
|
|||||||
from ipalib import pkcs10, x509, api
|
from ipalib import pkcs10, x509, api
|
||||||
from ipalib.errors import CertificateOperationError
|
from ipalib.errors import CertificateOperationError
|
||||||
from ipalib.text import _
|
from ipalib.text import _
|
||||||
from ipaplatform import services
|
|
||||||
from ipaplatform.constants import constants
|
from ipaplatform.constants import constants
|
||||||
from ipaplatform.paths import paths
|
from ipaplatform.paths import paths
|
||||||
|
|
||||||
|
@@ -39,7 +39,6 @@ from dns import resolver, rdatatype
|
|||||||
from dns.exception import DNSException
|
from dns.exception import DNSException
|
||||||
import ldap
|
import ldap
|
||||||
import ldapurl
|
import ldapurl
|
||||||
from nss.error import NSPRError
|
|
||||||
import six
|
import six
|
||||||
from six.moves.configparser import SafeConfigParser, NoOptionError
|
from six.moves.configparser import SafeConfigParser, NoOptionError
|
||||||
|
|
||||||
@@ -47,7 +46,7 @@ import ipaplatform
|
|||||||
|
|
||||||
from ipapython import ipautil, sysrestore, admintool, version
|
from ipapython import ipautil, sysrestore, admintool, version
|
||||||
from ipapython.admintool import ScriptError
|
from ipapython.admintool import ScriptError
|
||||||
from ipapython.ipa_log_manager import root_logger, log_mgr
|
from ipapython.ipa_log_manager import root_logger
|
||||||
from ipalib.util import validate_hostname
|
from ipalib.util import validate_hostname
|
||||||
from ipapython import config
|
from ipapython import config
|
||||||
from ipalib import api, errors, x509
|
from ipalib import api, errors, x509
|
||||||
@@ -56,8 +55,6 @@ from ipaserver.install import certs, service, sysupgrade
|
|||||||
from ipaplatform import services
|
from ipaplatform import services
|
||||||
from ipaplatform.paths import paths
|
from ipaplatform.paths import paths
|
||||||
from ipaplatform.tasks import tasks
|
from ipaplatform.tasks import tasks
|
||||||
from ipapython import certmonger
|
|
||||||
|
|
||||||
|
|
||||||
if six.PY3:
|
if six.PY3:
|
||||||
unicode = str
|
unicode = str
|
||||||
|
@@ -18,12 +18,10 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import sys
|
|
||||||
import shutil
|
import shutil
|
||||||
import tempfile
|
import tempfile
|
||||||
import time
|
import time
|
||||||
import pwd
|
import pwd
|
||||||
from optparse import OptionGroup
|
|
||||||
from ipaplatform.paths import paths
|
from ipaplatform.paths import paths
|
||||||
from ipaplatform import services
|
from ipaplatform import services
|
||||||
|
|
||||||
@@ -33,7 +31,6 @@ from ipalib import api, errors
|
|||||||
from ipapython import version
|
from ipapython import version
|
||||||
from ipapython.ipautil import run, write_tmp_file
|
from ipapython.ipautil import run, write_tmp_file
|
||||||
from ipapython import admintool
|
from ipapython import admintool
|
||||||
from ipapython.config import IPAOptionParser
|
|
||||||
from ipapython.dn import DN
|
from ipapython.dn import DN
|
||||||
from ipaserver.install.dsinstance import DS_USER
|
from ipaserver.install.dsinstance import DS_USER
|
||||||
from ipaserver.install.replication import wait_for_task
|
from ipaserver.install.replication import wait_for_task
|
||||||
|
@@ -20,9 +20,7 @@
|
|||||||
from __future__ import print_function
|
from __future__ import print_function
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import time
|
|
||||||
from optparse import OptionGroup
|
from optparse import OptionGroup
|
||||||
import base64
|
|
||||||
from nss import nss
|
from nss import nss
|
||||||
from nss.error import NSPRError
|
from nss.error import NSPRError
|
||||||
import gssapi
|
import gssapi
|
||||||
@@ -32,7 +30,6 @@ from ipapython.dn import DN
|
|||||||
from ipaplatform.paths import paths
|
from ipaplatform.paths import paths
|
||||||
from ipalib import api, errors, x509, certstore
|
from ipalib import api, errors, x509, certstore
|
||||||
from ipaserver.install import certs, cainstance, installutils
|
from ipaserver.install import certs, cainstance, installutils
|
||||||
from ipaserver.plugins.ldap2 import ldap2
|
|
||||||
|
|
||||||
|
|
||||||
class CACertManage(admintool.AdminTool):
|
class CACertManage(admintool.AdminTool):
|
||||||
|
@@ -25,7 +25,6 @@ import tempfile
|
|||||||
from textwrap import dedent
|
from textwrap import dedent
|
||||||
from ipalib import api
|
from ipalib import api
|
||||||
from ipalib.constants import DOMAIN_LEVEL_0
|
from ipalib.constants import DOMAIN_LEVEL_0
|
||||||
from ipaplatform import services
|
|
||||||
from ipaplatform.paths import paths
|
from ipaplatform.paths import paths
|
||||||
from ipapython import admintool
|
from ipapython import admintool
|
||||||
from ipapython import ipautil
|
from ipapython import ipautil
|
||||||
|
@@ -31,9 +31,9 @@ import sys
|
|||||||
import six
|
import six
|
||||||
|
|
||||||
from ipalib import api
|
from ipalib import api
|
||||||
from ipapython import ipautil, admintool
|
from ipapython import admintool
|
||||||
from ipaplatform.paths import paths
|
from ipaplatform.paths import paths
|
||||||
from ipaserver.install import installutils, dsinstance, schemaupdate
|
from ipaserver.install import installutils, schemaupdate
|
||||||
from ipaserver.install.ldapupdate import LDAPUpdate, UPDATES_DIR, BadSyntax
|
from ipaserver.install.ldapupdate import LDAPUpdate, UPDATES_DIR, BadSyntax
|
||||||
from ipaserver.install.upgradeinstance import IPAUpgrade
|
from ipaserver.install.upgradeinstance import IPAUpgrade
|
||||||
|
|
||||||
|
@@ -36,7 +36,7 @@ from six.moves import xrange
|
|||||||
|
|
||||||
from ipapython import admintool
|
from ipapython import admintool
|
||||||
from ipalib import api, errors
|
from ipalib import api, errors
|
||||||
from ipaserver.plugins.ldap2 import ldap2, AUTOBIND_DISABLED
|
from ipaserver.plugins.ldap2 import AUTOBIND_DISABLED
|
||||||
|
|
||||||
if six.PY3:
|
if six.PY3:
|
||||||
unicode = str
|
unicode = str
|
||||||
|
@@ -18,17 +18,14 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import sys
|
|
||||||
import shutil
|
import shutil
|
||||||
import tempfile
|
import tempfile
|
||||||
import time
|
import time
|
||||||
import pwd
|
import pwd
|
||||||
import ldif
|
import ldif
|
||||||
import itertools
|
import itertools
|
||||||
import locale
|
|
||||||
|
|
||||||
from six.moves.configparser import SafeConfigParser
|
from six.moves.configparser import SafeConfigParser
|
||||||
import six
|
|
||||||
|
|
||||||
from ipalib import api, errors, constants
|
from ipalib import api, errors, constants
|
||||||
from ipapython import version, ipautil, certdb
|
from ipapython import version, ipautil, certdb
|
||||||
|
@@ -18,7 +18,6 @@
|
|||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
|
|
||||||
import sys
|
|
||||||
import os
|
import os
|
||||||
import os.path
|
import os.path
|
||||||
import pwd
|
import pwd
|
||||||
@@ -28,10 +27,9 @@ from ipaplatform.constants import constants
|
|||||||
from ipaplatform.paths import paths
|
from ipaplatform.paths import paths
|
||||||
from ipapython import admintool
|
from ipapython import admintool
|
||||||
from ipapython.dn import DN
|
from ipapython.dn import DN
|
||||||
from ipapython.ipautil import user_input, write_tmp_file
|
|
||||||
from ipalib import api, errors
|
from ipalib import api, errors
|
||||||
from ipalib.constants import CACERT
|
from ipalib.constants import CACERT
|
||||||
from ipaserver.install import certs, dsinstance, httpinstance, installutils
|
from ipaserver.install import certs, dsinstance, installutils
|
||||||
|
|
||||||
|
|
||||||
class ServerCertInstall(admintool.AdminTool):
|
class ServerCertInstall(admintool.AdminTool):
|
||||||
|
@@ -2,8 +2,6 @@
|
|||||||
# Copyright (C) 2015 FreeIPA Contributors see COPYING for license
|
# Copyright (C) 2015 FreeIPA Contributors see COPYING for license
|
||||||
#
|
#
|
||||||
|
|
||||||
import os
|
|
||||||
|
|
||||||
from ipalib import api
|
from ipalib import api
|
||||||
from ipaplatform.paths import paths
|
from ipaplatform.paths import paths
|
||||||
from ipapython import admintool
|
from ipapython import admintool
|
||||||
|
@@ -27,8 +27,6 @@ from ipalib import errors
|
|||||||
from ipapython import admintool
|
from ipapython import admintool
|
||||||
from ipapython.dn import DN
|
from ipapython.dn import DN
|
||||||
from ipapython.ipautil import realm_to_suffix, posixify
|
from ipapython.ipautil import realm_to_suffix, posixify
|
||||||
from ipapython.ipa_log_manager import log_mgr
|
|
||||||
from ipaserver.plugins.ldap2 import ldap2
|
|
||||||
from ipaserver.install import replication, installutils
|
from ipaserver.install import replication, installutils
|
||||||
|
|
||||||
if six.PY3:
|
if six.PY3:
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user