Actually get the password fields right in invirt-console-server's

[invirt/packages/invirt-console.git] / files / etc / nss-pgsql.conf.mako

diff --git a/files/etc/nss-pgsql.conf.mako b/files/etc/nss-pgsql.conf.mako
index e1aa001..5ed9f2e 100644 (file)
--- a/files/etc/nss-pgsql.conf.mako
+++ b/files/etc/nss-pgsql.conf.mako
@@ -1,16 +1,10 @@
 <% from invirt.config import structs as cfg %>
-host        = ${cfg.db.host}
-port        = ${cfg.db.port}
-database    = ${cfg.db.dbname}
-login       = ${cfg.db.user}
+connectionstring = host=${cfg.db.host} dbname=${cfg.db.dbname} user=${cfg.db.user} port=${cfg.db.port}
 
-querypasswd = SELECT name, NULL, machine_id + 1000 as uid, machine_id + 1000 as gid, '', '/consolefs/'|| name, '/usr/bin/sipb-xen-consolesh' FROM machines
-querygroup = SELECT name, NULL, machine_id + 1000 as gid FROM machines
-querymembers = SELECT name FROM machines WHERE 1000 + machine_id = %d
-queryids = SELECT 1000 + machine_id AS gid FROM machines LIMIT 0
-
-passwd_name = name
-passwd_uid = 1000 + machine_id
-
-group_name = name
-group_gid = 1000 + machine_id
+getpwnam = SELECT name, '*', name, '/consolefs/'|| name, '/usr/bin/invirt-consolesh', machine_id + 1000, machine_id + 1000 FROM machines WHERE name = $1
+getpwuid = SELECT name, '*', name, '/consolefs/'|| name, '/usr/bin/invirt-consolesh', machine_id + 1000, machine_id + 1000 FROM machines WHERE machine_id + 1000 = $1
+allusers = SELECT name, '*', name, '/consolefs/'|| name, '/usr/bin/invirt-consolesh', machine_id + 1000, machine_id + 1000 FROM machines
+getgrnam = SELECT name, 'x', machine_id + 1000, NULL FROM machines WHERE name = $1
+getgrgid = SELECT name, 'x', machine_id + 1000, NULL FROM machines WHERE machine_id + 1000 = $1
+groups_dyn = SELECT NULL LIMIT 0;
+allgroups = SELECT name, 'x', machine_id + 1000, NULL FROM machines