summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Bokovoy <abokovoy@redhat.com>2012-10-17 13:19:51 +0300
committerAlexander Bokovoy <abokovoy@redhat.com>2012-10-31 19:08:31 +0200
commit381f7f583ca02835731aeb2ca8be31ee279504ef (patch)
tree4b604cc464e34a6d5093ff128995b8119c4fd84e
parentd93b01eb4012ffffe78c31bc4307b2ad961ec383 (diff)
downloadfreeipa-381f7f583ca02835731aeb2ca8be31ee279504ef.zip
freeipa-381f7f583ca02835731aeb2ca8be31ee279504ef.tar.gz
freeipa-381f7f583ca02835731aeb2ca8be31ee279504ef.tar.xz
Use single warning message in idrange module and idrange-add
Complements fix to https://fedorahosted.org/freeipa/ticket/3116
-rw-r--r--ipalib/plugins/idrange.py37
1 files changed, 15 insertions, 22 deletions
diff --git a/ipalib/plugins/idrange.py b/ipalib/plugins/idrange.py
index 7547081..ffd8b6b 100644
--- a/ipalib/plugins/idrange.py
+++ b/ipalib/plugins/idrange.py
@@ -33,6 +33,19 @@ if api.env.in_server and api.env.context in ['lite', 'server']:
except ImportError:
_dcerpc_bindings_installed = False
+doc_warning = """
+ WARNING:
+
+ DNA plugin in 389-ds will allocate IDs based on the ranges configured for the
+ local domain. Currently the DNA plugin *cannot* be reconfigured itself based
+ on the local ranges set via this family of commands.
+
+ Manual configuration change has to be done in the DNA plugin configuration for
+ the new local range. Specifically, The dnaNextRange attribute of 'cn=Posix
+ IDs,cn=Distributed Numeric Assignment Plugin,cn=plugins,cn=config' has to be
+ modified to match the new range.
+"""
+
__doc__ = _("""
ID ranges
@@ -141,17 +154,7 @@ this domain has the SID S-1-5-21-123-456-789-1010 then 1010 id the RID of the
user. RIDs are unique in a domain, 32bit values and are used for users and
groups.
-WARNING:
-
-DNA plugin in 389-ds will allocate IDs based on the ranges configured for the
-local domain. Currently the DNA plugin *cannot* be reconfigured itself based
-on the local ranges set via this family of commands.
-
-Manual configuration change has to be done in the DNA plugin configuration for
-the new local range. Specifically, The dnaNextRange attribute of 'cn=Posix
-IDs,cn=Distributed Numeric Assignment Plugin,cn=plugins,cn=config' has to be
-modified to match the new range.
-""")
+""" + doc_warning)
class idrange(LDAPObject):
"""
@@ -298,17 +301,7 @@ class idrange_add(LDAPCreate):
must be given to add a new range for a trusted AD domain.
- WARNING:
-
- DNA plugin in 389-ds will allocate IDs based on the ranges configured for the
- local domain. Currently the DNA plugin *cannot* be reconfigured itself based
- on the local ranges set via this family of commands.
-
- Manual configuration change has to be done in the DNA plugin configuration for
- the new local range. Specifically, The dnaNextRange attribute of 'cn=Posix
- IDs,cn=Distributed Numeric Assignment Plugin,cn=plugins,cn=config' has to be
- modified to match the new range.
- """)
+ """ + doc_warning)
msg_summary = _('Added ID range "%(value)s"')