tune2fs: more respect for quota config option

Commit 44a2cca3 disabled tune2fs -O quota when the build
didn't have --enable-quota at configure time, but that
wasn't quite enough.

We need to exclude the "-Q" option as well from tune2fs
when --enable-quota isn't specified at configure time.

Otherwise, tune2fs -Q can set the quota feature, but no other
utility will touch the filesystem due to the unknown flag,
if buitl w/o --enable-quota.

So put everything related to "-Q" under #ifdef CONFIG_QUOTA;
usage output (was missing before) and option parsing.

Addresses-Red-Hat-Bugzilla: #1010709
Reported-by: Bert DeKnuydt <Bert.Deknuydt@esat.kuleuven.be>
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index 5feb25b275dc843f64bd310ebf2ad5431749763e..822df74a1ac83de69af5d92b19e9aed56a5d0756 100644 (file)
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -121,6 +121,9 @@ static void usage(void)
                  "\t[-r reserved_blocks_count] [-u user] [-C mount_count] "
                  "[-L volume_label]\n"
                  "\t[-M last_mounted_dir] [-O [^]feature[,...]]\n"
+#ifdef CONFIG_QUOTA
+                 "\t[-Q quota_options]\n"
+#endif
                  "\t[-E extended-option[,...]] [-T last_check_time] "
                  "[-U UUID]\n\t[ -I new_inode_size ] device\n"), program_name);
        exit(1);
@@ -857,11 +860,15 @@ static void parse_tune2fs_options(int argc, char **argv)
        char *tmp;
        struct group *gr;
        struct passwd *pw;
+       char optstring[100] = "c:e:fg:i:jlm:o:r:s:u:C:E:I:J:L:M:O:T:U:";
 
+#ifdef CONFIG_QUOTA
+       strcat(optstring, "Q:");
+#endif
        open_flag = 0;
 
        printf("tune2fs %s (%s)\n", E2FSPROGS_VERSION, E2FSPROGS_DATE);
-       while ((c = getopt(argc, argv, "c:e:fg:i:jlm:o:r:s:u:C:E:I:J:L:M:O:Q:T:U:")) != EOF)
+       while ((c = getopt(argc, argv, optstring)) != EOF)
                switch (c) {
                case 'c':
                        max_mount_count = strtol(optarg, &tmp, 0);
@@ -1015,11 +1022,13 @@ static void parse_tune2fs_options(int argc, char **argv)
                        features_cmd = optarg;
                        open_flag = EXT2_FLAG_RW;
                        break;
+#ifdef CONFIG_QUOTA
                case 'Q':
                        Q_flag = 1;
                        parse_quota_opts(optarg);
                        open_flag = EXT2_FLAG_RW;
                        break;
+#endif
                case 'r':
                        reserved_blocks = strtoul(optarg, &tmp, 0);
                        if (*tmp) {