[Linuxconsole-commit]CVS: ruby/linux/arch/x86_64/ia32 ia32_ioctl.c,1.5,1.6

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/arch/x86_64/ia32
In directory usw-pr-cvs1:/tmp/cvs-serv14367/linux/arch/x86_64/ia32

Modified Files:
	ia32_ioctl.c 
Log Message:
Synced to 2.5.15

Index: ia32_ioctl.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/x86_64/ia32/ia32_ioctl.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ia32_ioctl.c	26 Apr 2002 17:23:40 -0000	1.5
+++ ia32_ioctl.c	16 May 2002 18:01:38 -0000	1.6
@@ -1649,9 +1649,9 @@
 	
 	/*
 	 * To have permissions to do most of the vt ioctls, we either have
-	 * to be the owner of the tty, or super-user.
+	 * to be the owner of the tty, or have CAP_SYS_TTY_CONFIG.
 	 */
-	if (current->tty == tty || suser())
+	if (current->tty == tty || capable(CAP_SYS_TTY_CONFIG))
 		return 1;
 	return 0;                                                    
 }