__init__ needs to be in the main package

[cascardo/ipsilon.git] / ipsilon / info / nss.py

diff --git a/ipsilon/info/nss.py b/ipsilon/info/nss.py
index 50817f7..0669e95 100644 (file)
--- a/ipsilon/info/nss.py
+++ b/ipsilon/info/nss.py
@@ -4,24 +4,23 @@
 
 from ipsilon.info.common import InfoProviderBase
 from ipsilon.info.common import InfoProviderInstaller
-from ipsilon.info.common import InfoMapping
 from ipsilon.util.plugin import PluginObject
+from ipsilon.util.policy import Policy
 import grp
 import pwd
 import os
 
 
-posix_map = {
-    'gecos': 'fullname'
-}
+posix_map = [
+    ['gecos', 'fullname']
+]
 
 
 class InfoProvider(InfoProviderBase):
 
     def __init__(self, *pargs):
         super(InfoProvider, self).__init__(*pargs)
-        self.mapper = InfoMapping()
-        self.mapper.set_mapping(posix_map)
+        self.mapper = Policy(posix_map)
         self.name = 'nss'
         self.new_config(self.name)
 
@@ -58,12 +57,12 @@ class InfoProvider(InfoProviderBase):
         reply = dict()
         try:
             posix_user = self._get_posix_user(user)
-            userattrs, extras = self.mapper.map_attrs(posix_user)
+            userattrs, extras = self.mapper.map_attributes(posix_user)
             groups = self._get_posix_groups(posix_user['username'],
                                             posix_user['gidNumber'])
-            reply['userdata'] = userattrs
-            reply['groups'] = groups
-            reply['extras'] = {'posix': extras}
+            reply = userattrs
+            reply['_groups'] = groups
+            reply['_extras'] = {'posix': extras}
 
         except KeyError:
             pass
@@ -92,6 +91,6 @@ class Installer(InfoProviderInstaller):
         po.wipe_data()
         po.wipe_config_values()
 
-        # Update global config to add login plugin
+        # Update global config to add info plugin
         po.is_enabled = True
         po.save_enabled_state()