diff -uprk.orig Linux-PAM-0.80.orig/modules/pam_console/50-default.perms Linux-PAM-0.80/modules/pam_console/50-default.perms
--- Linux-PAM-0.80.orig/modules/pam_console/50-default.perms	2005-07-14 13:14:27 +0000
+++ Linux-PAM-0.80/modules/pam_console/50-default.perms	2005-08-25 20:42:41 +0000
@@ -1,11 +1,12 @@
 # device classes -- these are shell-style globs
-<floppy>=/dev/fd[0-1]* \
-	 /dev/floppy* /mnt/floppy*
+<floppy>=/dev/fd[0-7]* /dev/floppy/* /mnt/floppy*
 <sound>=/dev/dsp* /dev/audio* /dev/midi* \
-	/dev/mixer* /dev/sequencer \
-	/dev/sound/* /dev/beep \
-	/dev/snd/* 
-<cdrom>=/dev/cdrom* /dev/cdroms/* /dev/cdwriter* /mnt/cdrom*
+	/dev/mixer* /dev/sequencer* /dev/admm* \
+	/dev/adsp* /dev/aload* /dev/amidi* /dev/dmfm* \
+	/dev/dmmidi* /dev/music /dev/patmgr* \
+	/dev/sndstat /dev/snd/* /dev/sound/* /dev/beep
+<cdrom>=/dev/dvd* /dev/cdrom* /dev/cdroms/* /mnt/cdrom* /mnt/dvd*
+<burner>=/dev/scd* /dev/sr[0-7]* /dev/pcd* /dev/pg* /dev/cdwriter*
 <pilot>=/dev/pilot
 <jaz>=/mnt/jaz*
 <zip>=/mnt/pocketzip* /mnt/zip* /dev/zip*
@@ -17,43 +18,45 @@
 <flash>=/mnt/flash* /dev/flash*
 <diskonkey>=/mnt/diskonkey*
 <rem_ide>=/mnt/microdrive*
-<fb>=/dev/fb /dev/fb[0-9]* \
-     /dev/fb/*
+<fb>=/dev/fb /dev/fb[0-9]* /dev/fb/*
 <kbd>=/dev/kbd
 <joystick>=/dev/js[0-9]*
-<v4l>=/dev/video* /dev/radio* /dev/winradio* /dev/vtx* /dev/vbi* \
-      /dev/video/*
+<v4l>=/dev/video* /dev/video/* /dev/radio* /dev/winradio* /dev/vtx* /dev/vbi* /dev/vttuner
 <gpm>=/dev/gpmctl
 <dri>=/dev/nvidia* /dev/3dfx* /dev/dri/card*
 <mainboard>=/dev/apm_bios
 <pmu>=/dev/pmu
 <bluetooth>=/dev/rfcomm*
 <raw1394>=/dev/raw1394
+<toshiba>=/dev/toshiba
 
 # permission definitions
 <console>  0660 <floppy>     0660 root.floppy
-<console>  0600 <sound>      0600 root
-<console>  0600 <cdrom>      0660 root.disk
-<console>  0600 <pilot>      0660 root.uucp
-<console>  0600 <jaz>        0660 root.disk
-<console>  0600 <zip>        0660 root.disk
-<console>  0600 <ls120>      0660 root.disk
+<console>  0660 <sound>      0660 root.audio
+<console>  0640 <cdrom>      0640 root.cdrom
+<console>  0660 <burner>     0660 root.cdwriter
+<console>  0660 <pilot>      0660 root.uucp
+<console>  0660 <jaz>        0660 root.disk
+<console>  0660 <zip>        0660 root.disk
+<console>  0660 <ls120>      0660 root.disk
 <console>  0600 <scanner>    0600 root
-<console>  0600 <camera>     0600 root.disk
-<console>  0600 <memstick>   0600 root.disk
-<console>  0600 <flash>      0600 root.disk
-<console>  0600 <diskonkey>  0660 root.disk
-<console>  0600 <rem_ide>    0660 root.disk
+<console>  0660 <camera>     0660 root.disk
+<console>  0660 <memstick>   0660 root.disk
+<console>  0660 <flash>      0660 root.disk
+<console>  0660 <diskonkey>  0660 root.disk
+<console>  0660 <rem_ide>    0660 root.disk
 <console>  0600 <fb>         0600 root
 <console>  0600 <kbd>        0600 root
 <console>  0600 <joystick>   0600 root
-<console>  0600 <v4l>        0600 root
-<console>  0700 <gpm>	     0700 root
+<console>  0660 <v4l>        0660 root.radio
+<console>  0700 <gpm>        0700 root
 <console>  0600 <mainboard>  0600 root
-<console>  0600 <rio500>     0600 root
+<console>  0660 <rio500>     0660 root.disk
 <console>  0600 <pmu>        0600 root
 <console>  0600 <bluetooth>  0600 root
 <console>  0600 <raw1394>    0600 root
+<console>  0600 <toshiba>    0600 root
+<console>  0600 <dri>        0600 root
 
 <xconsole> 0600 /dev/console 0600 root.root
-<console> 0600 <dri>	     0600 root
+<xconsole> 0600 <dri>        0600 root
diff -uprk.orig Linux-PAM-0.80.orig/modules/pam_console/console.handlers Linux-PAM-0.80/modules/pam_console/console.handlers
--- Linux-PAM-0.80.orig/modules/pam_console/console.handlers	2005-03-31 16:39:58 +0000
+++ Linux-PAM-0.80/modules/pam_console/console.handlers	2005-08-25 20:45:35 +0000
@@ -10,13 +10,13 @@
 # See man console.handlers
 #
 # Example:
-# console consoledevs tty[0-9][0-9]* vc/[0-9][0-9]* :[0-9]\.[0-9] :[0-9]
+# console consoledevs (/dev/)?(tty|vc/)[0-9]+ :[0-9](\.[0-9])?
 # echo lock wait Locking console for user on tty
 # touch unlock wait /var/run/console-unlocked
 
-console consoledevs tty[0-9][0-9]* vc/[0-9][0-9]* :[0-9]\.[0-9] :[0-9]
+console consoledevs (/dev/)?(tty|vc/)[0-9]+ :[0-9](\.[0-9])?
 /sbin/pam_console_apply lock logfail wait -t tty -s
 /sbin/pam_console_apply unlock logfail wait -r -t tty -s
 # initialize dmix for alsa sound
-/usr/bin/ainit lock user start
-/usr/bin/ainit unlock user stop
+#/usr/bin/ainit lock user start
+#/usr/bin/ainit unlock user stop
diff -uprk.orig Linux-PAM-0.80.orig/modules/pam_console/console.perms Linux-PAM-0.80/modules/pam_console/console.perms
--- Linux-PAM-0.80.orig/modules/pam_console/console.perms	2005-07-14 13:13:44 +0000
+++ Linux-PAM-0.80/modules/pam_console/console.perms	2005-08-25 20:42:41 +0000
@@ -14,12 +14,12 @@
 # For more information:
 # man 5 console.perms
 #
-# This file should not be modified.
 # Rather a new file in the console.perms.d directory should be created.
 
 # file classes -- these are regular expressions
-<console>=tty[0-9][0-9]* vc/[0-9][0-9]* :[0-9]\.[0-9] :[0-9]
+<console>=(/dev/)?(tty|vc/)[0-9]+ :[0-9](\.[0-9])?
 <xconsole>=:[0-9]\.[0-9] :[0-9]
+<rsession>=(/dev/)?pts/[0-9]+
 
 # device classes -- see console.perms.d/50-default.perms
 # permission definitions -- see console.perms.d/50-default.perms