patch-2.1.100 linux/drivers/scsi/sr_ioctl.c

• Lines: 38
• Date: Wed May 6 10:56:05 1998
• Orig file: v2.1.99/linux/drivers/scsi/sr_ioctl.c
• Orig date: Thu Feb 12 20:56:10 1998

diff -u --recursive --new-file v2.1.99/linux/drivers/scsi/sr_ioctl.c linux/drivers/scsi/sr_ioctl.c
@@ -106,8 +106,8 @@
 	    break;
 	case ILLEGAL_REQUEST:
             if (!quiet)
-                printk("sr%d: CDROM (ioctl) reports ILLEGAL REQUEST.\n",
-                       target);
+		printk(KERN_ERR "sr%d: CDROM (ioctl) reports ILLEGAL "
+		       "REQUEST.\n", target);
             if (SCpnt->sense_buffer[12] == 0x20 &&
                 SCpnt->sense_buffer[13] == 0x00) {
                 /* sense: Invalid command operation code */
@@ -121,7 +121,7 @@
 #endif
 	    break;
 	default:
-	    printk("sr%d: CDROM (ioctl) error, command: ", target);
+	    printk(KERN_ERR "sr%d: CDROM (ioctl) error, command: ", target);
 	    print_command(sr_cmd);
 	    print_sense("sr", SCpnt);
             err = -EIO;
@@ -792,7 +792,7 @@
 	return 0;
 
     case BLKRASET:
-	if(!suser())
+	if(!capable(CAP_SYS_ADMIN))
         	return -EACCES;
 	if(!(cdi->dev))
         	return -EINVAL;
@@ -804,7 +804,7 @@
     RO_IOCTLS(cdi->dev,arg);
 
     case BLKFLSBUF:
-	if(!suser())
+	if(!capable(CAP_SYS_ADMIN))
 		return -EACCES;
 	if(!(cdi->dev))
 		return -EINVAL;