admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #197 from bonzini/libiscsi-20160330

Browse Source 
Fix iscsi-ls for IPv6 link-local addresses, and bump ABI version again
This commit is contained in:
Ronnie Sahlberg
2016-03-30 19:25:48 -07:00
parent 7d2e9ec708 edc5a80857
commit 2bba2fedf9
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Makefile.am
View File

@@ -10,9 +10,9 @@ if !HAVE_LIBGCRYPT
libiscsi_la_SOURCES += md5.c libiscsi_la_SOURCES += md5.c
endif endif
SOCURRENT=6 SOCURRENT=7
SOREVISON=1 SOREVISON=1
SOAGE=2 SOAGE=0
libiscsi_la_LDFLAGS = \ libiscsi_la_LDFLAGS = \
-version-info $(SOCURRENT):$(SOREVISON):$(SOAGE) -bindir $(bindir) \ -version-info $(SOCURRENT):$(SOREVISON):$(SOAGE) -bindir $(bindir) \
-no-undefined -export-symbols ${srcdir}/libiscsi.syms -no-undefined -export-symbols ${srcdir}/libiscsi.syms

5
utils/iscsi-ls.c
View File

@@ -174,6 +174,11 @@ void list_luns(struct client_state *clnt, const char *target, const char *portal
int full_report_size; int full_report_size;
int i; int i;
if (strncasecmp(portal, "[fe80:", 6) == 0) {
fprintf(stderr, "skipping link-local address\n");
return;
}
iscsi = iscsi_create_context(initiator); iscsi = iscsi_create_context(initiator);
if (iscsi == NULL) { if (iscsi == NULL) {
printf("Failed to create context\n"); printf("Failed to create context\n");