diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2012-01-06 14:59:50 +0100 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2012-01-06 14:59:50 +0100 |
| commit | e5f552c0fb274c1a02fce51267c563a06c55d334 (patch) | |
| tree | 6ac770ff8eace971fd81d1eec7d02c953292afbc /pynslcd/group.py | |
| parent | fea96fdbbc3e01a60fcb0d7e5ec7907987f72345 (diff) | |
user the logging framework, handle exceptions properly and some cleanups
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1588 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'pynslcd/group.py')
| -rw-r--r-- | pynslcd/group.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pynslcd/group.py b/pynslcd/group.py index 0e4e96f..29a6fda 100644 --- a/pynslcd/group.py +++ b/pynslcd/group.py @@ -1,7 +1,7 @@ # group.py - group entry lookup routines # -# Copyright (C) 2010, 2011 Arthur de Jong +# Copyright (C) 2010, 2011, 2012 Arthur de Jong # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,11 +19,10 @@ # 02110-1301 USA import logging -import ldap.filter -import constants -import common from passwd import dn2uid, uid2dn +import common +import constants def clean(lst): @@ -60,8 +59,8 @@ class Search(common.Search): dn = uid2dn(self.conn, memberuid) if dn: return '(&%s(|(%s=%s)(%s=%s)))' % (self.filter, - attmap['memberUid'], ldap.filter.escape_filter_chars(memberuid), - attmap['member'], ldap.filter.escape_filter_chars(dn)) + attmap['memberUid'], self.escape(memberuid), + attmap['member'], self.escape(dn)) return super(Search, self).mk_filter() @@ -91,7 +90,7 @@ class GroupRequest(common.Request): # actually return the results for name in names: if not common.isvalidname(name): - print '%s: %s: denied by validnames option' % (dn, attmap['cn']) + logging.warning('%s: %s: denied by validnames option', dn, attmap['cn']) else: for gid in gids: self.fp.write_int32(constants.NSLCD_RESULT_BEGIN) |