From 6b90c8358dab6ae4b697231eccc3d72b12bd8958 Mon Sep 17 00:00:00 2001 From: Wenchao Hao Date: Sat, 13 Aug 2022 11:48:02 +0800 Subject: [PATCH] Backport patches to fix unparsed parameters Fix isnsadm invalid command line options: -V and -r Signed-off-by: Wenchao Hao --- ...unparse-command-line-options-V-and-r.patch | 39 +++++++++++++++++++ open-isns.spec | 6 ++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 0006-isnsadm-Fix-unparse-command-line-options-V-and-r.patch diff --git a/0006-isnsadm-Fix-unparse-command-line-options-V-and-r.patch b/0006-isnsadm-Fix-unparse-command-line-options-V-and-r.patch new file mode 100644 index 0000000..8ca30c9 --- /dev/null +++ b/0006-isnsadm-Fix-unparse-command-line-options-V-and-r.patch @@ -0,0 +1,39 @@ +From 82fbb3cef309f17a88e44fe9c379d84f9835f39b Mon Sep 17 00:00:00 2001 +From: Wenchao Hao +Date: Tue, 9 Aug 2022 21:52:18 +0800 +Subject: [PATCH] isnsadm: Fix unparse command line options "-V" and "-r" + +Following error would reported: + +root@fedora:# isnsadm -V +isnsadm: invalid option -- 'V' +Error: Unknown option + +root@fedora:# isnsadm -r +isnsadm: invalid option -- 'r' +Error: Unknown option + +This is because we did not add "V" and "r" to parameter +when calling getopt_long() + +Signed-off-by: Wenchao Hao +--- + isnsadm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/isnsadm.c b/isnsadm.c +index 94c705e..0710877 100644 +--- a/isnsadm.c ++++ b/isnsadm.c +@@ -97,7 +97,7 @@ main(int argc, char **argv) + isns_security_t *security = NULL; + int c, status; + +- while ((c = getopt_long(argc, argv, "46Cc:d:hK:k:ls:", options, NULL)) != -1) { ++ while ((c = getopt_long(argc, argv, "46Cc:d:hK:k:ls:Vr", options, NULL)) != -1) { + switch (c) { + case '4': + opt_af = AF_INET; +-- +2.35.3 + diff --git a/open-isns.spec b/open-isns.spec index 8e3ba7b..866a8c4 100644 --- a/open-isns.spec +++ b/open-isns.spec @@ -1,6 +1,6 @@ Name: open-isns Version: 0.100 -Release: 8 +Release: 9 Summary: The iSNS server and client programs License: LGPLv2+ URL: https://www.github.com/open-iscsi/open-isns @@ -11,6 +11,7 @@ Patch2: 0002-Fix-compiler-issue-when-not-in-security-mode.patch Patch3: 0003-Fix-586-compile-issue-and-remove-Werror.patch Patch4: 0004-Do-not-install-isnsd.socket-in-isnsd.service.patch Patch5: 0005-libisns-remove-sighold-and-sigrelse.patch +Patch6: 0006-isnsadm-Fix-unparse-command-line-options-V-and-r.patch BuildRequires: gcc systemd automake autoconf make @@ -100,6 +101,9 @@ install -p -m 644 isnsd.service %{buildroot}%{_unitdir}/isnsd.service %{_mandir}/man8/* %changelog +* Sat Aug 13 2022 Wenchao Hao - 0.100-9 +- Backport patches to fix unparsed parameters + * Mon Sep 27 2021 Wenchao Hao - 0.100-8 - Noop operations to make it able to sync between different branches -- Gitee