From 381f7f583ca02835731aeb2ca8be31ee279504ef Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Wed, 17 Oct 2012 13:19:51 +0300 Subject: Use single warning message in idrange module and idrange-add Complements fix to https://fedorahosted.org/freeipa/ticket/3116 --- ipalib/plugins/idrange.py | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/ipalib/plugins/idrange.py b/ipalib/plugins/idrange.py index 754708117..ffd8b6be0 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"') -- cgit