rpms/kernel/devel linux-2.6-debug-setkeys.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11052

Modified Files:
	linux-2.6-debug-setkeys.patch 
Log Message:
Hit the right ioctl.


linux-2.6-debug-setkeys.patch:
 vt_ioctl.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

Index: linux-2.6-debug-setkeys.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-debug-setkeys.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-debug-setkeys.patch	30 Nov 2005 06:04:59 -0000	1.1
+++ linux-2.6-debug-setkeys.patch	1 Dec 2005 01:34:22 -0000	1.2
@@ -1,10 +1,14 @@
---- linux-2.6.14/drivers/char/vt_ioctl.c~	2005-11-30 01:02:51.000000000 -0500
-+++ linux-2.6.14/drivers/char/vt_ioctl.c	2005-11-30 01:03:56.000000000 -0500
-@@ -232,6 +232,7 @@ do_kdgkb_ioctl(int cmd, struct kbsentry 
- 		return ((p && *p) ? -EOVERFLOW : 0);
- 	case KDSKBSENT:
- 		if (!perm) {
+--- vanilla/drivers/char/vt_ioctl.c	2005-10-27 20:02:08.000000000 -0400
++++ linux-2.6.14/drivers/char/vt_ioctl.c	2005-11-30 20:32:54.000000000 -0500
+@@ -91,8 +94,10 @@ do_kdsk_ioctl(int cmd, struct kbentry __
+ 		    val = (i ? K_HOLE : K_NOSUCHMAP);
+ 		return put_user(val, &user_kbe->kb_value);
+ 	case KDSKBENT:
+-		if (!perm)
++		if (!perm) {
 +			printk("application %s tried to set keys as not root.\n",current->comm);
- 			ret = -EPERM;
- 			goto reterr;
- 		}
+ 			return -EPERM;
++		}
+ 		if (!i && v == K_NOSUCHMAP) {
+ 			/* disallocate map */
+ 			key_map = key_maps[s];