Igor Sobrado writes:
> 
> Can I suggest applying this patch on affected releases?

Ops... a really bad night (too late here).  I did another mistake,
the right patch is the next one:

--- passwd	2005-09-07 21:18:03.000000000 +0200
+++ passwd.new	2005-09-07 21:18:20.000000000 +0200
@@ -1,5 +1,5 @@
 root:*:0:0:Charlie &:/root:/bin/csh
-toor:*:0:0:Bourne-again Superuser:/root:/bin/sh
+toor:*:0:0:Bourne-shell Superuser:/root:/bin/sh
 daemon:*:1:1:The devil himself:/:/sbin/nologin
 operator:*:2:5:System &:/usr/guest/operator:/bin/csh
 bin:*:3:7:Binaries Commands and Source:/:/sbin/nologin

Just to be useful and not providing only feedback on my own mistake,
NetBSD 1.6.2 has the same problem.  Perhaps this patch should be
applied to the coming NetBSD 1.6.3 release too.

Best regards,
Igor.