Merge 0.10->trunk

[prosody.git] / plugins / mod_storage_internal.lua

diff --git a/plugins/mod_storage_internal.lua b/plugins/mod_storage_internal.lua
index 75f6ec4ecd17b511cd1cf92f97b1783f079c6f6d..ade4f0a656ec7b12ee15076c4823fe48be382b2c 100644 (file)
--- a/plugins/mod_storage_internal.lua
+++ b/plugins/mod_storage_internal.lua
@@ -5,8 +5,11 @@ local host = module.host;
 local driver = {};
 local driver_mt = { __index = driver };
 
-function driver:open(store)
-       return setmetatable({ store = store }, driver_mt);
+function driver:open(store, typ)
+       if typ and typ ~= "keyval" then
+               return nil, "unsupported-store";
+       end
+       return setmetatable({ store = store, type = typ }, driver_mt);
 end
 function driver:get(user)
        return datamanager.load(user, host, self.store);
@@ -16,8 +19,12 @@ function driver:set(user, data)
        return datamanager.store(user, host, self.store, data);
 end
 
-function driver:list_stores(username)
-       return datamanager.list_stores(username, host);
+function driver:stores(username)
+       return datamanager.stores(username, host);
+end
+
+function driver:users()
+       return datamanager.users(host, self.store, self.type);
 end
 
 function driver:purge(user)