summaryrefslogtreecommitdiffstats
path: root/ipa_server
diff options
context:
space:
mode:
authorJason Gerard DeRose <jderose@redhat.com>2009-01-04 18:39:39 -0700
committerJason Gerard DeRose <jderose@redhat.com>2009-01-04 18:39:39 -0700
commit6fe78a4944f11d430b724103f7d8d49c92af9b63 (patch)
treee4a771b15ab5be4a838183e059c74482d92db007 /ipa_server
parentff66c7ece65a042b645b2cdaef700f143727cc2f (diff)
downloadfreeipa-6fe78a4944f11d430b724103f7d8d49c92af9b63.tar.gz
freeipa-6fe78a4944f11d430b724103f7d8d49c92af9b63.tar.xz
freeipa-6fe78a4944f11d430b724103f7d8d49c92af9b63.zip
Renamed all references to 'ipa_server' to 'ipaserver'
Diffstat (limited to 'ipa_server')
-rw-r--r--ipa_server/context.py2
-rw-r--r--ipa_server/ipaldap.py2
-rw-r--r--ipa_server/mod_python_xmlrpc.py6
-rw-r--r--ipa_server/plugins/b_ldap.py4
-rw-r--r--ipa_server/plugins/b_ra.py10
-rw-r--r--ipa_server/servercore.py4
6 files changed, 14 insertions, 14 deletions
diff --git a/ipa_server/context.py b/ipa_server/context.py
index 2929fc957..15dd7d908 100644
--- a/ipa_server/context.py
+++ b/ipa_server/context.py
@@ -21,7 +21,7 @@
# a new instance to be created in the same thread
# To use:
-# from ipa_server.context import context
+# from ipaserver.context import context
# context.foo = "bar"
# FIXME: This module is depreciated and code should switch to using
diff --git a/ipa_server/ipaldap.py b/ipa_server/ipaldap.py
index f520475e5..19fd40efd 100644
--- a/ipa_server/ipaldap.py
+++ b/ipa_server/ipaldap.py
@@ -31,7 +31,7 @@ import struct
import ldap.sasl
from ldap.controls import LDAPControl,DecodeControlTuples,EncodeControlTuples
from ldap.ldapobject import SimpleLDAPObject
-from ipa_server import ipautil
+from ipaserver import ipautil
from ipalib import errors
# Global variable to define SASL auth
diff --git a/ipa_server/mod_python_xmlrpc.py b/ipa_server/mod_python_xmlrpc.py
index 450f4a514..9a2960f93 100644
--- a/ipa_server/mod_python_xmlrpc.py
+++ b/ipa_server/mod_python_xmlrpc.py
@@ -43,9 +43,9 @@ import logging
import ldap
from ipalib import api
from ipalib import config
-from ipa_server import conn
-from ipa_server.servercore import context
-from ipa_server.servercore import ipautil
+from ipaserver import conn
+from ipaserver.servercore import context
+from ipaserver.servercore import ipautil
from ipalib.util import xmlrpc_unmarshal
import string
diff --git a/ipa_server/plugins/b_ldap.py b/ipa_server/plugins/b_ldap.py
index 8042474f1..071bf52eb 100644
--- a/ipa_server/plugins/b_ldap.py
+++ b/ipa_server/plugins/b_ldap.py
@@ -28,8 +28,8 @@ import ldap as _ldap
from ipalib import api, Context
from ipalib import errors
from ipalib.crud import CrudBackend
-from ipa_server import servercore
-from ipa_server import ipaldap
+from ipaserver import servercore
+from ipaserver import ipaldap
class conn(Context):
diff --git a/ipa_server/plugins/b_ra.py b/ipa_server/plugins/b_ra.py
index b60983102..bf119b810 100644
--- a/ipa_server/plugins/b_ra.py
+++ b/ipa_server/plugins/b_ra.py
@@ -39,8 +39,8 @@ from socket import gethostname
from ipalib import api, Backend
from ipalib import errors
-from ipa_server import servercore
-from ipa_server import ipaldap
+from ipaserver import servercore
+from ipaserver import ipaldap
class ra(Backend):
@@ -195,13 +195,13 @@ class ra(Backend):
revocationr reasons: 0 - unspecified
1 - key compromise
2 - ca compromise
- 3 - affiliation changed
+ 3 - affiliation changed
4 - superseded
5 - cessation of operation
- 6 - certificate hold
+ 6 - certificate hold
7 - value 7 is not used
8 - remove from CRL
- 9 - privilege withdrawn
+ 9 - privilege withdrawn
10 - aa compromise
see RFC 5280 for more details
"""
diff --git a/ipa_server/servercore.py b/ipa_server/servercore.py
index 1f7603f19..6991989e5 100644
--- a/ipa_server/servercore.py
+++ b/ipa_server/servercore.py
@@ -20,8 +20,8 @@
import ldap
import string
import re
-from ipa_server.context import context
-from ipa_server import ipaldap
+from ipaserver.context import context
+from ipaserver import ipaldap
import ipautil
from ipalib import errors
from ipalib import api