Fix some uncaught bugs with invirt-console-server's libnss-pgsql

config

svn path=/trunk/packages/invirt-console-server/; revision=1552

diff --git a/debian/changelog b/debian/changelog
index 5ab6648..1b0b936 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-console-server (0.0.10) unstable; urgency=low
+
+  * Fix some uncaught bugs with the libnss-pgsql config
+
+ -- Evan Broder <broder@mit.edu>  Thu, 06 Nov 2008 22:21:12 -0500
+

 invirt-console-server (0.0.9) unstable; urgency=low
 
   * Depend on invirt-mail-config
 invirt-console-server (0.0.9) unstable; urgency=low
 
   * Depend on invirt-mail-config

diff --git a/files/etc/nss-pgsql.conf.mako b/files/etc/nss-pgsql.conf.mako
index 5e942c0..083a26a 100644 (file)
--- 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}
 
 <% 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 FROM machines WHERE name = $1
-getgrgid = SELECT name, NULL, machine_id + 1000 FROM machines WHERE machine_id + 1000 = $1
+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

 groups_dyn = SELECT NULL LIMIT 0;
 groups_dyn = SELECT NULL LIMIT 0;

-allgroups = SELECT name, NULL, machine_id + 1000 FROM machines
+allgroups = SELECT name, 'x', machine_id + 1000, NULL FROM machines