Merging upstream version 2.3.0.

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-04-21 09:31:29 +02:00
parent 678fe22a2c
commit 248a2fcec1
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
101 changed files with 2349 additions and 847 deletions

View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016-2024 OARC, Inc.
* Copyright (c) 2016-2025 OARC, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -137,6 +137,9 @@ int option_parse(options_t* options, const char* option)
} else if (!strcmp(argument, "cds")) {
options->dump_format = cds;
return 0;
} else if (!strcmp(argument, "tcpdns")) {
options->dump_format = tcpdns;
return 0;
}
} else if (have("user")) {
if (options->user) {