IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove ipaserver/ipaldap.py

Browse Source 
In addition to removing the module, fix all places where it was imported.

Preparation for: https://fedorahosted.org/freeipa/ticket/3446
This commit is contained in:
Petr Viktorin
2013-01-31 06:59:35 -05:00
committed by Martin Kosek
parent 4e6a2a916d
commit 91a63cce62
15 changed files with 22 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/migration/migration.py
View File

@@ -29,8 +29,8 @@ import wsgiref
from ipapython.ipa_log_manager import root_logger
from ipapython.ipautil import get_ipa_basedn
from ipapython.dn import DN
from ipapython.ipaldap import IPAdmin
from ipalib import errors
from ipaserver.ipaldap import IPAdmin
def convert_exception(error):

5
install/tools/ipa-csreplica-manage
View File

@@ -25,12 +25,9 @@ import os
import krbV
from ipapython.ipa_log_manager import *
from ipapython import ipautil
from ipaserver.install import replication, installutils
from ipaserver import ipaldap
from ipapython import version
from ipapython import dogtag
from ipalib import api, errors, util
from ipapython import ipautil, ipaldap, version, dogtag
from ipapython.dn import DN
CACERT = "/etc/ipa/ca.crt"

3
install/tools/ipa-managed-entries
View File

@@ -22,9 +22,8 @@ import re
import sys
from optparse import OptionParser
from ipapython import ipautil, config
from ipapython import ipautil, config, ipaldap
from ipaserver.install import installutils
from ipaserver import ipaldap
from ipalib import api, errors
from ipapython.ipa_log_manager import *
from ipapython.dn import DN

4
install/tools/ipa-replica-manage
View File

@@ -27,8 +27,8 @@ from urllib2 import urlparse
from ipapython import ipautil
from ipaserver.install import replication, dsinstance, installutils
from ipaserver.install import bindinstance
from ipaserver import ipaldap
from ipapython import version
from ipaserver.plugins import ldap2
from ipapython import version, ipaldap
from ipalib import api, errors, util
from ipapython.ipa_log_manager import *
from ipapython.dn import DN

2
install/tools/ipactl
View File

@@ -27,8 +27,8 @@ import ldapurl
from ipaserver.install import service, installutils
from ipaserver.install.dsinstance import config_dirname, realm_to_serverid
from ipaserver.install.installutils import is_ipa_configured, ScriptError
from ipaserver.ipaldap import IPAdmin
from ipalib import api, errors
from ipapython.ipaldap import IPAdmin
from ipapython.ipautil import wait_for_open_ports, wait_for_open_socket
from ipapython import services as ipaservices
from ipapython import config, dogtag

3
ipaserver/dcerpc.py
View File

@@ -31,6 +31,7 @@ from ipapython import ipautil
from ipapython.ipa_log_manager import *
from ipapython.dn import DN
from ipaserver.install import installutils
from ipaserver.plugins import ldap2
from ipalib.util import normalize_name
import os, string, struct, copy
@@ -48,7 +49,7 @@ try:
except ImportError:
from ldap.controls import LDAPControl as LDAPControl #pylint: disable=F0401
import ldap as _ldap
from ipaserver.ipaldap import IPAdmin
from ipapython.ipaldap import IPAdmin
from ipalib.session import krbccache_dir, krbccache_prefix
from dns import resolver, rdatatype
from dns.exception import DNSException

5
ipaserver/install/bindinstance.py
View File

@@ -27,11 +27,10 @@ import ldap
import installutils
import service
from ipaserver import ipaldap
from ipaserver.plugins import ldap2
from ipaserver.install.dsinstance import realm_to_serverid
from ipaserver.install.cainstance import IPA_CA_CNAME
from ipapython import sysrestore
from ipapython import ipautil
from ipapython import sysrestore, ipautil, ipaldap
from ipapython.ipa_log_manager import *
from ipapython.dn import DN
import ipalib

3
ipaserver/install/cainstance.py
View File

@@ -48,8 +48,7 @@ import traceback
from ipapython import ipautil
from ipapython import services as ipaservices
from ipaserver import ipaldap
from ipapython import ipaldap
from ipaserver.install import service
from ipaserver.install import installutils
from ipaserver.install import dsinstance

10
ipaserver/install/dsinstance.py
View File

@@ -19,29 +19,25 @@
#
import shutil
from ipapython.ipa_log_manager import *
import pwd
import sys
import os
import re
import time
import tempfile
import base64
from ipapython import ipautil
from ipapython import sysrestore
from ipapython.ipa_log_manager import *
from ipapython import ipautil, sysrestore, dogtag, ipaldap
from ipapython import services as ipaservices
from ipapython import dogtag
import service
import installutils
import certs
import ldap
from ipaserver import ipaldap
from ipaserver.install import ldapupdate
from ipaserver.install import replication
from ipalib import errors
from ipapython.dn import DN
import base64
SERVER_ROOT_64 = "/usr/lib64/dirsrv"
SERVER_ROOT_32 = "/usr/lib/dirsrv"

4
ipaserver/install/ldapupdate.py
View File

@@ -39,13 +39,13 @@ import ldap
from ldap.schema.models import ObjectClass, AttributeType
from ipaserver.install import installutils
from ipaserver import ipaldap
from ipapython import ipautil
from ipapython import ipautil, ipaldap
from ipalib import errors
from ipalib import api
from ipapython.dn import DN
from ipapython.ipa_log_manager import *
from ipaserver.install.plugins import PRE_UPDATE, POST_UPDATE
from ipaserver.plugins import ldap2
class BadSyntax(installutils.ScriptError):

2
ipaserver/install/plugins/fix_replica_agreements.py
View File

@@ -19,9 +19,9 @@
import os
import pwd
from ipapython import ipaldap
from ipaserver.install.plugins import MIDDLE
from ipaserver.install.plugins.baseupdate import PreUpdate
from ipaserver import ipaldap
from ipaserver.install import replication
from ipalib import api

3
ipaserver/install/replication.py
View File

@@ -23,11 +23,10 @@ import os
import ldap
from ipaserver import ipaldap
from ipalib import api, errors
from ipapython import services as ipaservices
from ipapython.ipa_log_manager import *
from ipapython import ipautil, dogtag
from ipapython import ipautil, dogtag, ipaldap
from ipapython.dn import DN
CACERT = "/etc/ipa/ca.crt"

5
ipaserver/install/service.py
View File

@@ -24,14 +24,11 @@ import pwd
import time
import datetime
from ipapython import sysrestore
from ipapython import ipautil
from ipapython import dogtag
from ipapython import sysrestore, ipautil, dogtag, ipaldap
from ipapython import services as ipaservices
from ipapython.dn import DN
from ipapython.ipa_log_manager import *
from ipalib import errors
from ipaserver import ipaldap
CACERT = "/etc/ipa/ca.crt"

24
ipaserver/ipaldap.py
View File

@@ -1,24 +0,0 @@
# Author: Petr Viktorin <pviktori@redhat.com>
#
# Copyright (C) 2013 Red Hat
# see file 'COPYING' for use and warranty information
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# 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 ipapython.ipaldap import IPAdmin
# FIXME: Some installer tools depend on ipaldap importing plugins.ldap2.
# The proper plugins should rather be imported explicitly.
import ipaserver.plugins.ldap2

7
tests/test_install/test_updates.py
View File

@@ -22,15 +22,14 @@ Test the `ipaserver/install/ldapupdate.py` module.
import unittest
import os
import sys
import ldap
import nose
from ipalib import api
from ipalib import errors
from ipaserver.install.ldapupdate import LDAPUpdate, BadSyntax, UPDATES_DIR
from ipaserver.install.ldapupdate import LDAPUpdate, BadSyntax
from ipaserver.install import installutils
from ipaserver import ipaldap
from ipapython import ipautil
from ipapython import ipautil, ipaldap
from ipapython.dn import DN
"""