Changeset 1606 for trunk

Timestamp:

Nov 10, 2008, 8:34:49 PM (16 years ago)

Author:

broder

Message:

Don't suggest that the password for users should be in non-existant
/etc/shadow for the console server

Location:

trunk/packages/invirt-console-server

Files:

• debian/changelog (modified) (1 diff)
• files/etc/nss-pgsql.conf.mako (modified) (1 diff)

trunk/packages/invirt-console-server/debian/changelog

@@ +1 @@
+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 <broder@mit.edu>  Mon, 10 Nov 2008 20:34:14 -0500
+
 invirt-console-server (0.0.11) unstable; urgency=low
 

trunk/packages/invirt-console-server/files/etc/nss-pgsql.conf.mako

@@ -2 +2 @@
 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