From: David Oberhollenzer Date: Sun, 9 Feb 2020 21:46:28 +0000 (+0100) Subject: mkfs.ubifs: fix broken build if fscrtyp is disabled X-Git-Tag: v2.1.2~2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=639b871fe3d2cb3e73d21363e8c13ede2bbd9f99;p=mtd-utils.git mkfs.ubifs: fix broken build if fscrtyp is disabled First, there is no option named of X509_OPTION. It was presumably changed during development to AUTH_CERT_OPTION. This commit fixes the name in the !WITH_CRYPTO branch. Similarly, '}' got moved into the WITH_CRYPTO branch, but not into else branch, resulting in tons of errors if fscrypt is disabled. This commit pulls it back out of both branches. Fixes: a739b59e ("mkfs.ubifs: Add authentication support") Signed-off-by: David Oberhollenzer --- diff --git a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c index 4247270..d4be610 100644 --- a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c +++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c @@ -793,14 +793,14 @@ static int get_options(int argc, char**argv) case AUTH_CERT_OPTION: c->auth_cert_filename = xstrdup(optarg); break; - } #else case 'C': case HASH_ALGO_OPTION: case AUTH_KEY_OPTION: - case X509_OPTION: + case AUTH_CERT_OPTION: return err_msg("mkfs.ubifs was built without crypto support."); #endif + } } if (optind != argc && !output)