From 75e7c81e1f8616662aa1f65093ad2de705d0f5b4 Mon Sep 17 00:00:00 2001 From: Evan Broder Date: Mon, 10 Nov 2008 20:34:49 -0500 Subject: [PATCH] Don't suggest that the password for users should be in non-existant /etc/shadow for the console server svn path=/trunk/packages/invirt-console-server/; revision=1606 --- debian/changelog | 7 +++++++ files/etc/nss-pgsql.conf.mako | 12 ++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0dbef6c..23c976f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +invirt-console-server (0.0.12) unstable; urgency=low + + * Fix the libnss-pgsql config - don't suggest that the password should + be in /etc/shadow + + -- Evan Broder Mon, 10 Nov 2008 20:34:14 -0500 + invirt-console-server (0.0.11) unstable; urgency=low * Don't depend on invirt-mail-config diff --git a/files/etc/nss-pgsql.conf.mako b/files/etc/nss-pgsql.conf.mako index 083a26a..d7f1aff 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, 'x', name, '/consolefs/'|| name, '/usr/bin/invirt-consolesh', machine_id + 1000, machine_id + 1000 FROM machines WHERE name = $1 -getpwuid = SELECT name, 'x', name, '/consolefs/'|| name, '/usr/bin/invirt-consolesh', machine_id + 1000, machine_id + 1000 FROM machines WHERE machine_id + 1000 = $1 -allusers = SELECT name, 'x', 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 +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 groups_dyn = SELECT NULL LIMIT 0; -allgroups = SELECT name, 'x', machine_id + 1000, NULL FROM machines +allgroups = SELECT name, NULL, machine_id + 1000, NULL FROM machines -- 1.7.9.5