nss-pam-ldapd branch master updated. 0.8.12-85-g61a3fce

[Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nss-pam-ldapd".

The branch, master has been updated
       via  61a3fce57df6e3fed01506765a0401be7c04af0f (commit)
      from  a9aea20f136026d6553295727350c88fe2431e0c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://arthurdejong.org/git/nss-pam-ldapd/commit/?id=61a3fce57df6e3fed01506765a0401be7c04af0f

commit 61a3fce57df6e3fed01506765a0401be7c04af0f
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Sat Feb 23 22:31:04 2013 +0100

    also search for alternative macAddress representation in pynslcd

diff --git a/pynslcd/ether.py b/pynslcd/ether.py
index a26ac3b..e6975d5 100644
--- a/pynslcd/ether.py
+++ b/pynslcd/ether.py
@@ -1,7 +1,7 @@
 
 # ether.py - lookup functions for ethernet addresses
 #
-# Copyright (C) 2010, 2011, 2012 Arthur de Jong
+# Copyright (C) 2010, 2011, 2012, 2013 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
@@ -46,6 +46,16 @@ class Search(common.Search):
     limit_attributes = ('cn', 'macAddress')
     required = ('cn', 'macAddress')
 
+    def mk_filter(self):
+        # we need a custom mk_filter because this is an | query
+        if 'macAddress' in self.parameters:
+            ether = self.parameters['macAddress']
+            alt_ether = ':'.join('%02x' % int(x, 16) for x in ether.split(':'))
+            return '(&%s(|(%s=%s)(%s=%s)))' % (self.filter,
+                      attmap['macAddress'], ether,
+                      attmap['macAddress'], alt_ether)
+        return super(Search, self).mk_filter()
+
 
 class Cache(cache.Cache):
     pass

-----------------------------------------------------------------------

Summary of changes:
 pynslcd/ether.py |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
nss-pam-ldapd
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits/