summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-04-13 11:48:13 (GMT)
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2012-04-13 11:48:13 (GMT)
commit9422f2cc8899c74e09f1dc047d049a74e72da283 (patch)
treeba52b5009cbcf29f864f5470da4c2db03e5d3b71
parent8c6f0209bb5cef9be92cc6ef794397e2a2e6d313 (diff)
downloadpykolab-9422f2cc8899c74e09f1dc047d049a74e72da283.tar.gz
Fix some mistakes in the previous commit
-rwxr-xr-xbin/kolab_smtp_access_policy.py4
-rw-r--r--pykolab/auth/ldap/__init__.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/kolab_smtp_access_policy.py b/bin/kolab_smtp_access_policy.py
index e2a9421..7f0bf56 100755
--- a/bin/kolab_smtp_access_policy.py
+++ b/bin/kolab_smtp_access_policy.py
@@ -792,14 +792,14 @@ class PolicyRequest(object):
log.debug(_("Could not find this user, accepting"), level=8)
return True
- if not user['dn'] == None:
+ if not user['dn'] == False:
recipient_policy = auth.get_user_attribute(
sasl_domain,
user,
'kolabAllowSMTPSender'
)
- if not group['dn'] == None:
+ if not group['dn'] == False:
recipient_policy = auth.get_group_attribute(
sasl_domain,
group,
diff --git a/pykolab/auth/ldap/__init__.py b/pykolab/auth/ldap/__init__.py
index 237cfbd..5ed2c46 100644
--- a/pykolab/auth/ldap/__init__.py
+++ b/pykolab/auth/ldap/__init__.py
@@ -836,7 +836,7 @@ class LDAP(object):
attribute = attribute.lower()
log.debug(
- _("Getting attribute %s for group %s") % (attribute,user),
+ _("Getting attribute %s for group %s") % (attribute,group),
level=8
)