CVS commit: [bouyer-quota2] src/sys/ufs/ufs

[Manuel Bouyer]

Module Name:    src
Committed By:   bouyer
Date:           Mon Jan 31 21:09:54 UTC 2011

Modified Files:
        src/sys/ufs/ufs [bouyer-quota2]: ufs_quota.c

Log Message:
On command with multiple data, make sure to reset 'defaultq' to 0.


To generate a diff of this commit:
cvs rdiff -u -r1.68.4.6 -r1.68.4.7 src/sys/ufs/ufs/ufs_quota.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/ufs/ufs/ufs_quota.c
diff -u src/sys/ufs/ufs/ufs_quota.c:1.68.4.6 src/sys/ufs/ufs/ufs_quota.c:1.68.4.7
--- src/sys/ufs/ufs/ufs_quota.c:1.68.4.6	Mon Jan 31 15:24:10 2011
+++ src/sys/ufs/ufs/ufs_quota.c	Mon Jan 31 21:09:53 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ufs_quota.c,v 1.68.4.6 2011/01/31 15:24:10 bouyer Exp $	*/
+/*	$NetBSD: ufs_quota.c,v 1.68.4.7 2011/01/31 21:09:53 bouyer Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993, 1995
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,v 1.68.4.6 2011/01/31 15:24:10 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ufs_quota.c,v 1.68.4.7 2011/01/31 21:09:53 bouyer Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_quota.h"
@@ -266,6 +266,8 @@
 				continue;
 			id = 0;
 			defaultq = 1;
+		} else {
+			defaultq = 0;
 		}
 		error = quota_get_auth(mp, l, id);
 		if (error == EPERM)
@@ -333,6 +335,8 @@
 				continue;
 			id = 0;
 			defaultq = 1;
+		} else {
+			defaultq = 0;
 		}
 		error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_FS_QUOTA,
 		    KAUTH_REQ_SYSTEM_FS_QUOTA_MANAGE, mp, KAUTH_ARG(id), NULL);