split the result handling into a convert() and write() step

git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1613 ef36b2f9-881f-0410-afb5-c4e39611909c

1 files changed, 8 insertions, 10 deletions

diff --git a/pynslcd/ether.py b/pynslcd/ether.py
index 4d6ae03..20963c3 100644
--- a/pynslcd/ether.py
+++ b/pynslcd/ether.py
@@ -48,16 +48,14 @@ class Search(common.Search):
 
 class EtherRequest(common.Request):
 
-    def write(self, dn, attributes, parameters):
-        # get values
-        names = attributes['cn']
-        addresses = [ether_aton(x) for x in attributes['macAddress']]
-        # write results
-        for name in names:
-            for ether in addresses:
-                self.fp.write_int32(constants.NSLCD_RESULT_BEGIN)
-                self.fp.write_string(name)
-                self.fp.write(ether)
+    def write(self, name, ether):
+        self.fp.write_string(name)
+        self.fp.write(ether_aton(ether))
+
+    def convert(self, dn, attributes, parameters):
+        for name in attributes['cn']:
+            for ether in attributes['macAddress']:
+                yield (name, ether)
 
 
 class EtherByNameRequest(EtherRequest):