diff options
| author | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2020-02-09 22:46:28 +0100 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2020-02-09 23:04:41 +0100 |
| commit | 639b871fe3d2cb3e73d21363e8c13ede2bbd9f99 (patch) | |
| tree | 1af62ab919eeba1f3101569bbf28b5adbb372f67 | |
| parent | 3ea4705086b9b26a4acde7e83eb05be248ade503 (diff) | |
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 <david.oberhollenzer@sigma-star.at>
| -rw-r--r-- | ubifs-utils/mkfs.ubifs/mkfs.ubifs.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) |