[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[PATCH] fix missing -F short-option for certfile [version 2]



see previous thread: https://lists.debian.org/nbd/2023/07/msg00021.html
for the motivation behind this refactor

in commit 1b8615, the `-F` short-option was accidentally refactored out of the codebase, so that only the long-option for `-certfile` would work.
This commit restores the `-F` short-option, as well as conditionally populating the `short_opts` string based on compilation-options for `NETLINK` and `GNUTLS`
---
 nbd-client.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nbd-client.c b/nbd-client.c
index dae4636..ac0419d 100644
--- a/nbd-client.c
+++ b/nbd-client.c
@@ -896,11 +896,14 @@ void disconnect(char* device) {
        close(nbd);
 }
 
+static const char *short_opts = "-B:b:c:d:gH:hlnN:PpRSst:uVx"
 #if HAVE_NETLINK
-static const char *short_opts = "-A:B:b:c:C:d:gH:hK:LlnN:PpRSst:uVx";
-#else
-static const char *short_opts = "-A:B:b:c:C:d:gH:hK:lnN:PpRSst:uVx";
+       "L"
+#endif
+#if HAVE_GNUTLS
+       "A:C:F:K:"
 #endif
+       ;
 
 int main(int argc, char *argv[]) {
        char* port=NBD_DEFAULT_PORT;

Reply to: