aboutsummaryrefslogtreecommitdiffstats
path: root/main/open-iscsi/musl-fixes.patch
diff options
context:
space:
mode:
authorJann - Ove Risvik <jann.ove@usaklig.com>2016-07-20 22:57:52 +0200
committerBartłomiej Piotrowski <b@bpiotrowski.pl>2016-08-01 16:43:20 +0200
commitf9f00dc58da515cbe8f5efa4687d8604fdd4cb39 (patch)
tree8b78fbe964e03e0538edc8a6ae8410816ff5c327 /main/open-iscsi/musl-fixes.patch
parent5212907a5f340bc262e9ca8d6db1dae5f011bbfc (diff)
downloadaports-f9f00dc58da515cbe8f5efa4687d8604fdd4cb39.tar.gz
aports-f9f00dc58da515cbe8f5efa4687d8604fdd4cb39.tar.bz2
aports-f9f00dc58da515cbe8f5efa4687d8604fdd4cb39.tar.xz
main/open-iscsi: musl fix, second try
fixes bug #4802. added default config file
Diffstat (limited to 'main/open-iscsi/musl-fixes.patch')
-rw-r--r--main/open-iscsi/musl-fixes.patch21
1 files changed, 15 insertions, 6 deletions
diff --git a/main/open-iscsi/musl-fixes.patch b/main/open-iscsi/musl-fixes.patch
index 910b485878..f101eda6dd 100644
--- a/main/open-iscsi/musl-fixes.patch
+++ b/main/open-iscsi/musl-fixes.patch
@@ -29,9 +29,17 @@
#include <dirent.h>
#include <limits.h>
#include <sys/stat.h>
---- ./usr/iscsiadm.c.orig
-+++ ./usr/iscsiadm.c
-@@ -2553,7 +2553,10 @@ main(int argc, char **argv)
+--- ./usr/iscsiadm.c.orig 2012-05-21 02:59:24.000000000 +0200
++++ ./usr/iscsiadm.c 2016-07-20 22:00:54.430451701 +0200
+@@ -2403,6 +2403,7 @@ main(int argc, char **argv)
+ int tpgt = PORTAL_GROUP_TAG_UNKNOWN, killiscsid=-1, do_show=0;
+ int packet_size=32, ping_count=1, ping_interval=0;
+ int do_discover = 0, sub_mode = -1;
++ int argerror = 0;
+ struct sigaction sa_old;
+ struct sigaction sa_new;
+ struct list_head ifaces;
+@@ -2553,7 +2554,11 @@ main(int argc, char **argv)
return 0;
case 'h':
usage(0);
@@ -39,17 +47,18 @@
+
+ case '?':
+ log_error("unrecognized character '%c'", optopt);
++ argerror = 1;
+ }
if (name && value) {
param = idbm_alloc_user_param(name, value);
-@@ -2568,8 +2571,7 @@ main(int argc, char **argv)
+@@ -2568,8 +2573,7 @@ main(int argc, char **argv)
}
}
- if (optopt) {
- log_error("unrecognized character '%c'", optopt);
-+ if (opterr) {
++ if (argerror) {
rc = ISCSI_ERR_INVAL;
goto free_ifaces;
- }
+