YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[enh] rename _ensure_ou_created to ensure_ldap_ou_is_created. clearer

Browse source
This commit is contained in:
Julien Malik 2016-09-12 22:23:57 +02:00
parent afa5ad4ebc
commit 91e06611ba
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/yunohost/alias.py
View file

@ -39,7 +39,7 @@ def alias_list(auth, fields=None, filter=None, limit=None, offset=None):
fields -- fields to fetch fields -- fields to fetch
""" """
_ensure_ou_created(auth) _ensure_ldap_ou_is_created(auth)
alias_attrs = { 'mail': 'alias', alias_attrs = { 'mail': 'alias',
'maildrop': 'mail-forward' } 'maildrop': 'mail-forward' }
@ -89,7 +89,7 @@ def alias_create(auth, alias, mailforward):
""" """
from yunohost.domain import domain_list from yunohost.domain import domain_list
_ensure_ou_created(auth) _ensure_ldap_ou_is_created(auth)
# Validate uniqueness of alias and mail in LDAP # Validate uniqueness of alias and mail in LDAP
auth.validate_uniqueness({ auth.validate_uniqueness({
@ -126,7 +126,7 @@ def alias_delete(auth, alias):
alias -- Alias to delete alias -- Alias to delete
""" """
_ensure_ou_created(auth) _ensure_ldap_ou_is_created(auth)
if auth.remove('mail=%s,ou=aliases' % alias): if auth.remove('mail=%s,ou=aliases' % alias):
pass pass
@ -144,7 +144,7 @@ def alias_info(auth, alias):
alias -- Alias mail to get informations alias -- Alias mail to get informations
""" """
_ensure_ou_created(auth) _ensure_ldap_ou_is_created(auth)
alias_attrs = [ alias_attrs = [
'mail', 'maildrop' 'mail', 'maildrop'
@ -176,7 +176,7 @@ def alias_info(auth, alias):
raise MoulinetteError(167, m18n.n('alias_info_failed')) raise MoulinetteError(167, m18n.n('alias_info_failed'))
def _ensure_ou_created(auth): def _ensure_ldap_ou_is_created(auth):
rdn = 'ou=aliases' rdn = 'ou=aliases'
attr_dict = { attr_dict = {
'objectClass' : ['organizationalUnit', 'top'], 'objectClass' : ['organizationalUnit', 'top'],