git: 464b1ab216d5 - main - dumpon: fix set but not used variable
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 18 Apr 2024 15:39:32 UTC
The branch main has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=464b1ab216d5f78054626524addf99f5c622da96
commit 464b1ab216d5f78054626524addf99f5c622da96
Author: inkeliz <inkeliz@inkeliz.com>
AuthorDate: 2024-04-17 21:22:44 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-04-18 15:39:16 +0000
dumpon: fix set but not used variable
Signed-off-by: inkeliz <inkeliz@inkeliz.com>
Reviewed by: markj
MFC after: 1 week
Pull Request: https://github.com/freebsd/freebsd-src/pull/1178
---
sbin/dumpon/dumpon.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c
index dd772ca75049..46652d8471eb 100644
--- a/sbin/dumpon/dumpon.c
+++ b/sbin/dumpon/dumpon.c
@@ -463,20 +463,23 @@ main(int argc, char *argv[])
struct diocskerneldump_arg ndconf, *kdap;
struct addrinfo hints, *res;
const char *dev, *pubkeyfile, *server, *client, *gateway;
- int ch, error, fd, cipher;
+ int ch, error, fd;
bool gzip, list, netdump, zstd, insert, rflag;
uint8_t ins_idx;
+#ifdef HAVE_CRYPTO
+ int cipher = KERNELDUMP_ENC_NONE;
+#endif
gzip = list = netdump = zstd = insert = rflag = false;
kdap = NULL;
pubkeyfile = NULL;
server = client = gateway = NULL;
ins_idx = KDA_APPEND;
- cipher = KERNELDUMP_ENC_NONE;
while ((ch = getopt(argc, argv, "C:c:g:i:k:lrs:vZz")) != -1)
switch ((char)ch) {
case 'C':
+#ifdef HAVE_CRYPTO
if (strcasecmp(optarg, "chacha") == 0 ||
strcasecmp(optarg, "chacha20") == 0)
cipher = KERNELDUMP_ENC_CHACHA20;
@@ -487,6 +490,11 @@ main(int argc, char *argv[])
errx(EX_USAGE, "Unrecognized cipher algorithm "
"'%s'", optarg);
break;
+#else
+ errx(EX_USAGE,
+ "Built without crypto support, -C is unhandled.");
+ break;
+#endif
case 'c':
client = optarg;
break;