From 2781148606077e54aa6fb6aa90c5278a24b48e50 Mon Sep 17 00:00:00 2001 From: Evan Broder Date: Mon, 10 Nov 2008 22:58:25 -0500 Subject: [PATCH] Actually get the password fields right in invirt-console-server's libnss-pgsql config svn path=/trunk/packages/invirt-console-server/; revision=1610 --- debian/changelog | 6 ++++++ files/etc/nss-pgsql.conf.mako | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 23c976f..9ccb877 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +invirt-console-server (0.0.13) unstable; urgency=low + + * Actually get the password fields right for libnss-pgsql + + -- Evan Broder Mon, 10 Nov 2008 22:57:49 -0500 + invirt-console-server (0.0.12) unstable; urgency=low * Fix the libnss-pgsql config - don't suggest that the password should diff --git a/files/etc/nss-pgsql.conf.mako b/files/etc/nss-pgsql.conf.mako index d7f1aff..5ed9f2e 100644 --- a/files/etc/nss-pgsql.conf.mako +++ b/files/etc/nss-pgsql.conf.mako @@ -1,10 +1,10 @@ <% from invirt.config import structs as cfg %> connectionstring = host=${cfg.db.host} dbname=${cfg.db.dbname} user=${cfg.db.user} port=${cfg.db.port} -getpwnam = SELECT name, NULL, name, '/consolefs/'|| name, '/usr/bin/invirt-consolesh', machine_id + 1000, machine_id + 1000 FROM machines WHERE name = $1 -getpwuid = SELECT name, NULL, name, '/consolefs/'|| name, '/usr/bin/invirt-consolesh', machine_id + 1000, machine_id + 1000 FROM machines WHERE machine_id + 1000 = $1 -allusers = SELECT name, NULL, name, '/consolefs/'|| name, '/usr/bin/invirt-consolesh', machine_id + 1000, machine_id + 1000 FROM machines -getgrnam = SELECT name, NULL, machine_id + 1000, NULL FROM machines WHERE name = $1 -getgrgid = SELECT name, NULL, machine_id + 1000, NULL FROM machines WHERE machine_id + 1000 = $1 +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, NULL, machine_id + 1000, NULL FROM machines +allgroups = SELECT name, 'x', machine_id + 1000, NULL FROM machines -- 1.7.9.5